Updated BDF version

This commit is contained in:
josua 2020-10-01 15:48:06 +10:00
parent 636f3353ac
commit 39c6312f61
7 changed files with 7 additions and 28 deletions

View File

@ -1,11 +1,10 @@
package gl_engine.matrix; package gl_engine.matrix;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
import gl_engine.vec.Vec3d; import gl_engine.vec.Vec3d;
public class Matrix4 implements IBdfClassManager public class Matrix4
{ {
public static final int SIZE = 4; public static final int SIZE = 4;
@ -158,7 +157,6 @@ public class Matrix4 implements IBdfClassManager
return elements[id]; return elements[id];
} }
@Override
public void BdfClassLoad(BdfObject bdf) public void BdfClassLoad(BdfObject bdf)
{ {
elements = bdf.getFloatArray(); elements = bdf.getFloatArray();
@ -168,7 +166,6 @@ public class Matrix4 implements IBdfClassManager
} }
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setFloatArray(elements); bdf.setFloatArray(elements);
} }

View File

@ -1,10 +1,9 @@
package gl_engine.vec; package gl_engine.vec;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
public class Vec2d implements IBdfClassManager public class Vec2d
{ {
public double x; public double x;
public double y; public double y;
@ -84,7 +83,6 @@ public class Vec2d implements IBdfClassManager
return new Vec2i(MathHelpers.floor(x), MathHelpers.floor(y)); return new Vec2i(MathHelpers.floor(x), MathHelpers.floor(y));
} }
@Override
public void BdfClassLoad(BdfObject bdf) { public void BdfClassLoad(BdfObject bdf) {
double data[] = bdf.getDoubleArray(); double data[] = bdf.getDoubleArray();
if(data.length != 2) return; if(data.length != 2) return;
@ -92,7 +90,6 @@ public class Vec2d implements IBdfClassManager
y = data[1]; y = data[1];
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setDoubleArray(new double[] {x, y}); bdf.setDoubleArray(new double[] {x, y});
}; };

View File

@ -1,11 +1,10 @@
package gl_engine.vec; package gl_engine.vec;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
import gl_engine.range.Range2i; import gl_engine.range.Range2i;
public class Vec2i implements IBdfClassManager public class Vec2i
{ {
public int x; public int x;
public int y; public int y;
@ -97,7 +96,6 @@ public class Vec2i implements IBdfClassManager
return new Vec2d(x, y); return new Vec2d(x, y);
} }
@Override
public void BdfClassLoad(BdfObject bdf) { public void BdfClassLoad(BdfObject bdf) {
int data[] = bdf.getIntegerArray(); int data[] = bdf.getIntegerArray();
if(data.length != 2) return; if(data.length != 2) return;
@ -105,7 +103,6 @@ public class Vec2i implements IBdfClassManager
y = data[1]; y = data[1];
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setIntegerArray(new int[] {x, y}); bdf.setIntegerArray(new int[] {x, y});
}; };

View File

@ -1,10 +1,9 @@
package gl_engine.vec; package gl_engine.vec;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
public class Vec3d implements IBdfClassManager public class Vec3d
{ {
public double x; public double x;
public double y; public double y;
@ -94,7 +93,6 @@ public class Vec3d implements IBdfClassManager
return new Vec3i(MathHelpers.floor(x), MathHelpers.floor(y), MathHelpers.floor(z)); return new Vec3i(MathHelpers.floor(x), MathHelpers.floor(y), MathHelpers.floor(z));
} }
@Override
public void BdfClassLoad(BdfObject bdf) { public void BdfClassLoad(BdfObject bdf) {
double data[] = bdf.getDoubleArray(); double data[] = bdf.getDoubleArray();
if(data.length != 3) return; if(data.length != 3) return;
@ -103,7 +101,6 @@ public class Vec3d implements IBdfClassManager
z = data[2]; z = data[2];
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setDoubleArray(new double[] {x, y, z}); bdf.setDoubleArray(new double[] {x, y, z});
}; };

View File

@ -1,11 +1,10 @@
package gl_engine.vec; package gl_engine.vec;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
import gl_engine.range.Range3i; import gl_engine.range.Range3i;
public class Vec3i implements IBdfClassManager public class Vec3i
{ {
public int x; public int x;
public int y; public int y;
@ -113,7 +112,6 @@ public class Vec3i implements IBdfClassManager
return new Vec3d(x, y, z); return new Vec3d(x, y, z);
} }
@Override
public void BdfClassLoad(BdfObject bdf) { public void BdfClassLoad(BdfObject bdf) {
int data[] = bdf.getIntegerArray(); int data[] = bdf.getIntegerArray();
if(data.length != 3) return; if(data.length != 3) return;
@ -122,7 +120,6 @@ public class Vec3i implements IBdfClassManager
z = data[2]; z = data[2];
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setIntegerArray(new int[] {x, y, z}); bdf.setIntegerArray(new int[] {x, y, z});
}; };

View File

@ -1,10 +1,9 @@
package gl_engine.vec; package gl_engine.vec;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
public class Vec4d implements IBdfClassManager public class Vec4d
{ {
public double x; public double x;
public double y; public double y;
@ -116,7 +115,6 @@ public class Vec4d implements IBdfClassManager
return new Vec4i(MathHelpers.floor(x), MathHelpers.floor(y), MathHelpers.floor(z), MathHelpers.floor(m)); return new Vec4i(MathHelpers.floor(x), MathHelpers.floor(y), MathHelpers.floor(z), MathHelpers.floor(m));
} }
@Override
public void BdfClassLoad(BdfObject bdf) { public void BdfClassLoad(BdfObject bdf) {
double data[] = bdf.getDoubleArray(); double data[] = bdf.getDoubleArray();
if(data.length != 4) return; if(data.length != 4) return;
@ -126,7 +124,6 @@ public class Vec4d implements IBdfClassManager
m = data[3]; m = data[3];
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setDoubleArray(new double[] {x, y, z, m}); bdf.setDoubleArray(new double[] {x, y, z, m});
}; };

View File

@ -1,11 +1,10 @@
package gl_engine.vec; package gl_engine.vec;
import bdf.classes.IBdfClassManager;
import bdf.types.BdfObject; import bdf.types.BdfObject;
import gl_engine.MathHelpers; import gl_engine.MathHelpers;
import gl_engine.range.Range4i; import gl_engine.range.Range4i;
public class Vec4i implements IBdfClassManager public class Vec4i
{ {
public int x; public int x;
public int y; public int y;
@ -141,7 +140,6 @@ public class Vec4i implements IBdfClassManager
return new Vec4d(x, y, z, m); return new Vec4d(x, y, z, m);
} }
@Override
public void BdfClassLoad(BdfObject bdf) { public void BdfClassLoad(BdfObject bdf) {
int data[] = bdf.getIntegerArray(); int data[] = bdf.getIntegerArray();
if(data.length != 4) return; if(data.length != 4) return;
@ -151,7 +149,6 @@ public class Vec4i implements IBdfClassManager
m = data[3]; m = data[3];
} }
@Override
public void BdfClassSave(BdfObject bdf) { public void BdfClassSave(BdfObject bdf) {
bdf.setIntegerArray(new int[] {x, y, z, m}); bdf.setIntegerArray(new int[] {x, y, z, m});
}; };