organize math stuff

SunakazeKun · Apr 27, 2022 · 893a609 · 893a609
1 parent 57e8cec
commit 893a609
Show file tree

Hide file tree

Showing 29 changed files with 36 additions and 36 deletions.
diff --git a/data/objectdb.json b/data/objectdb.json
diff --git a/src/whitehole/editor/GalaxyEditorForm.java b/src/whitehole/editor/GalaxyEditorForm.java
@@ -40,11 +40,11 @@
 import whitehole.smg.StageArchive;
 import whitehole.smg.object.*;
 import whitehole.util.CheckBoxList;
-import whitehole.util.Matrix4;
+import whitehole.math.Matrix4;
 import whitehole.util.PropertyGrid;
-import whitehole.util.RotationMatrix;
-import whitehole.util.Vec2f;
-import whitehole.util.Vec3f;
+import whitehole.math.RotationMatrix;
+import whitehole.math.Vec2f;
+import whitehole.math.Vec3f;
 
 public class GalaxyEditorForm extends javax.swing.JFrame {
     private static final float SCALE_DOWN = 10000f;

diff --git a/src/whitehole/util/Matrix4.java → src/whitehole/math/Matrix4.java b/src/whitehole/util/Matrix4.java → src/whitehole/math/Matrix4.java
@@ -13,7 +13,7 @@
     with Whitehole. If not, see http://www.gnu.org/licenses/.
 */
 
-package whitehole.util;
+package whitehole.math;
 
 public class Matrix4 {
     public Matrix4() {

diff --git a/src/whitehole/util/RotationMatrix.java → src/whitehole/math/RotationMatrix.java b/src/whitehole/util/RotationMatrix.java → src/whitehole/math/RotationMatrix.java
@@ -1,4 +1,4 @@
-package whitehole.util;
+package whitehole.math;
 
 public class RotationMatrix 
 {

diff --git a/src/whitehole/util/Vec2f.java → src/whitehole/math/Vec2f.java b/src/whitehole/util/Vec2f.java → src/whitehole/math/Vec2f.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package whitehole.util;
+package whitehole.math;
 
 public class Vec2f implements Cloneable {
     public float x, y;

diff --git a/src/whitehole/util/Vec3f.java → src/whitehole/math/Vec3f.java b/src/whitehole/util/Vec3f.java → src/whitehole/math/Vec3f.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package whitehole.util;
+package whitehole.math;
 
 public class Vec3f implements Cloneable {
     public float x, y, z;

diff --git a/src/whitehole/rendering/BmdRenderer.java b/src/whitehole/rendering/BmdRenderer.java
@@ -28,10 +28,10 @@
 import whitehole.smg.ImageUtils.FilterMode;
 import whitehole.smg.ImageUtils.WrapMode;
 import whitehole.util.Color4;
-import whitehole.util.Matrix4;
+import whitehole.math.Matrix4;
 import whitehole.util.SuperFastHash;
-import whitehole.util.Vec2f;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec2f;
+import whitehole.math.Vec3f;
 
 public class BmdRenderer extends GLRenderer {
     private void uploadTexture(GL2 gl, int id) {

diff --git a/src/whitehole/rendering/BtiRenderer.java b/src/whitehole/rendering/BtiRenderer.java
@@ -24,7 +24,7 @@
 import whitehole.smg.Bti;
 import whitehole.smg.ImageUtils.FilterMode;
 import whitehole.smg.ImageUtils.WrapMode;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class BtiRenderer extends GLRenderer {
     private RarcFile archive = null;

diff --git a/src/whitehole/rendering/GLRenderer.java b/src/whitehole/rendering/GLRenderer.java
@@ -17,7 +17,7 @@
 package whitehole.rendering;
 
 import com.jogamp.opengl.*;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public abstract class GLRenderer {
     /**

diff --git a/src/whitehole/rendering/MultiRenderer.java b/src/whitehole/rendering/MultiRenderer.java
@@ -18,7 +18,7 @@
 
 import com.jogamp.opengl.GL2;
 import java.util.List;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class MultiRenderer extends GLRenderer {
     public static class MultiRendererInfo {

diff --git a/src/whitehole/rendering/RendererFactory.java b/src/whitehole/rendering/RendererFactory.java
@@ -33,7 +33,7 @@
 import whitehole.smg.object.SoundObj;
 import whitehole.smg.object.StageObj;
 import whitehole.util.Color4;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public final class RendererFactory {
     private static final String[] SHAPE_MODEL_COMPATIBILITY = {

diff --git a/src/whitehole/rendering/outdated/BlackHoleRenderer.java b/src/whitehole/rendering/outdated/BlackHoleRenderer.java
@@ -22,7 +22,7 @@
 import whitehole.rendering.GLRenderer;
 import whitehole.rendering.GLRenderer.RenderInfo;
 import whitehole.util.Color4;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class BlackHoleRenderer extends GLRenderer {
     public BlackHoleRenderer(RenderInfo info, int arg0, Vec3f areascale, Shape shape, boolean area) {

diff --git a/src/whitehole/rendering/outdated/PoleRenderer.java b/src/whitehole/rendering/outdated/PoleRenderer.java
@@ -18,7 +18,7 @@
 import com.jogamp.opengl.*;
 import java.io.IOException;
 import whitehole.rendering.BmdRenderer;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class PoleRenderer extends BmdRenderer {
     public PoleRenderer(RenderInfo info, Vec3f scale, String type) throws IOException {

diff --git a/src/whitehole/smg/Bmd.java b/src/whitehole/smg/Bmd.java
@@ -19,9 +19,9 @@
 import java.util.*;
 import whitehole.io.FileBase;
 import whitehole.util.Color4;
-import whitehole.util.Matrix4;
-import whitehole.util.Vec2f;
-import whitehole.util.Vec3f;
+import whitehole.math.Matrix4;
+import whitehole.math.Vec2f;
+import whitehole.math.Vec3f;
 
 public class Bmd 
 {

diff --git a/src/whitehole/smg/object/AbstractObj.java b/src/whitehole/smg/object/AbstractObj.java
@@ -27,7 +27,7 @@
 import whitehole.smg.StageArchive;
 import whitehole.smg.StageHelper;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public abstract class AbstractObj {
     public String name, layerKey, oldName;

diff --git a/src/whitehole/smg/object/AreaObj.java b/src/whitehole/smg/object/AreaObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class AreaObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/CameraObj.java b/src/whitehole/smg/object/CameraObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class CameraObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/ChildObj.java b/src/whitehole/smg/object/ChildObj.java
@@ -19,7 +19,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class ChildObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/CutsceneObj.java b/src/whitehole/smg/object/CutsceneObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class CutsceneObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/DebugObj.java b/src/whitehole/smg/object/DebugObj.java
@@ -19,7 +19,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class DebugObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/GravityObj.java b/src/whitehole/smg/object/GravityObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class GravityObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/LevelObj.java b/src/whitehole/smg/object/LevelObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class LevelObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/MapPartObj.java b/src/whitehole/smg/object/MapPartObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class MapPartObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/PathObj.java b/src/whitehole/smg/object/PathObj.java
@@ -28,7 +28,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.Color4;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class PathObj {
     private static final Color4 DUMMY_COLOR = new Color4(0f, 0f, 0f, 0f);

diff --git a/src/whitehole/smg/object/PathPointObj.java b/src/whitehole/smg/object/PathPointObj.java
@@ -22,7 +22,7 @@
 import whitehole.rendering.GLRenderer;
 import whitehole.smg.Bcsv;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class PathPointObj extends AbstractObj {
     public PathObj path;

diff --git a/src/whitehole/smg/object/PositionObj.java b/src/whitehole/smg/object/PositionObj.java
@@ -20,7 +20,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class PositionObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/SoundObj.java b/src/whitehole/smg/object/SoundObj.java
@@ -19,7 +19,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class SoundObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/StageObj.java b/src/whitehole/smg/object/StageObj.java
@@ -19,7 +19,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class StageObj extends AbstractObj {
     @Override

diff --git a/src/whitehole/smg/object/StartObj.java b/src/whitehole/smg/object/StartObj.java
@@ -19,7 +19,7 @@
 import whitehole.smg.Bcsv;
 import whitehole.smg.StageArchive;
 import whitehole.util.PropertyGrid;
-import whitehole.util.Vec3f;
+import whitehole.math.Vec3f;
 
 public class StartObj extends AbstractObj {
     @Override