commit ece89b28f5afe9a8944d215a1c5e1dd0dd78ad4a Author: Leszek Koltunski Date: Sat Feb 15 01:02:39 2020 +0000 Adjustment to Static's API. diff --git a/src/main/java/org/distorted/library/main/DistortedScreen.java b/src/main/java/org/distorted/library/main/DistortedScreen.java index 9dda1aa..196cabe 100644 --- a/src/main/java/org/distorted/library/main/DistortedScreen.java +++ b/src/main/java/org/distorted/library/main/DistortedScreen.java @@ -107,7 +107,7 @@ public class DistortedScreen extends DistortedFramebuffer fpsCanvas.drawText(fpsString, 0.5f*FPS_W, 0.75f*FPS_H, mPaint); fpsTexture.setTexture(fpsBitmap); - mMoveVector.set2(mHeight-FPS_H-5); + mMoveVector.set1(mHeight-FPS_H-5); lastTime = time; } diff --git a/src/main/java/org/distorted/library/mesh/MeshCubes.java b/src/main/java/org/distorted/library/mesh/MeshCubes.java index 7d66168..9f641ed 100644 --- a/src/main/java/org/distorted/library/mesh/MeshCubes.java +++ b/src/main/java/org/distorted/library/mesh/MeshCubes.java @@ -101,35 +101,35 @@ public class MeshCubes extends MeshBase if( mTexMappingW==null ) mTexMappingW = new float[6]; if( mTexMappingH==null ) mTexMappingH = new float[6]; - mTexMappingX[FRONT] = front.get1(); - mTexMappingY[FRONT] = front.get2(); - mTexMappingW[FRONT] = front.get3() - front.get1(); - mTexMappingH[FRONT] = front.get4() - front.get2(); - - mTexMappingX[BACK] = back.get1(); - mTexMappingY[BACK] = back.get2(); - mTexMappingW[BACK] = back.get3() - back.get1(); - mTexMappingH[BACK] = back.get4() - back.get2(); - - mTexMappingX[LEFT] = left.get1(); - mTexMappingY[LEFT] = left.get2(); - mTexMappingW[LEFT] = left.get3() - left.get1(); - mTexMappingH[LEFT] = left.get4() - left.get2(); - - mTexMappingX[RIGHT] = right.get1(); - mTexMappingY[RIGHT] = right.get2(); - mTexMappingW[RIGHT] = right.get3() - right.get1(); - mTexMappingH[RIGHT] = right.get4() - right.get2(); - - mTexMappingX[TOP] = top.get1(); - mTexMappingY[TOP] = top.get2(); - mTexMappingW[TOP] = top.get3() - top.get1(); - mTexMappingH[TOP] = top.get4() - top.get2(); - - mTexMappingX[BOTTOM] = bottom.get1(); - mTexMappingY[BOTTOM] = bottom.get2(); - mTexMappingW[BOTTOM] = bottom.get3() - bottom.get1(); - mTexMappingH[BOTTOM] = bottom.get4() - bottom.get2(); + mTexMappingX[FRONT] = front.get0(); + mTexMappingY[FRONT] = front.get1(); + mTexMappingW[FRONT] = front.get2() - front.get0(); + mTexMappingH[FRONT] = front.get3() - front.get1(); + + mTexMappingX[BACK] = back.get0(); + mTexMappingY[BACK] = back.get1(); + mTexMappingW[BACK] = back.get2() - back.get0(); + mTexMappingH[BACK] = back.get3() - back.get1(); + + mTexMappingX[LEFT] = left.get0(); + mTexMappingY[LEFT] = left.get1(); + mTexMappingW[LEFT] = left.get2() - left.get0(); + mTexMappingH[LEFT] = left.get3() - left.get1(); + + mTexMappingX[RIGHT] = right.get0(); + mTexMappingY[RIGHT] = right.get1(); + mTexMappingW[RIGHT] = right.get2() - right.get0(); + mTexMappingH[RIGHT] = right.get3() - right.get1(); + + mTexMappingX[TOP] = top.get0(); + mTexMappingY[TOP] = top.get1(); + mTexMappingW[TOP] = top.get2() - top.get0(); + mTexMappingH[TOP] = top.get3() - top.get1(); + + mTexMappingX[BOTTOM] = bottom.get0(); + mTexMappingY[BOTTOM] = bottom.get1(); + mTexMappingW[BOTTOM] = bottom.get2() - bottom.get0(); + mTexMappingH[BOTTOM] = bottom.get3() - bottom.get1(); } /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/org/distorted/library/type/Static1D.java b/src/main/java/org/distorted/library/type/Static1D.java index b8345bc..0939d20 100644 --- a/src/main/java/org/distorted/library/type/Static1D.java +++ b/src/main/java/org/distorted/library/type/Static1D.java @@ -68,7 +68,7 @@ public class Static1D extends Static implements Data1D * * @param ox new value of the first float. */ - public void set1(float ox) + public void set0(float ox) { x = ox; } @@ -79,7 +79,7 @@ public class Static1D extends Static implements Data1D * * @return The single float. */ - public float get1() + public float get0() { return x; } diff --git a/src/main/java/org/distorted/library/type/Static2D.java b/src/main/java/org/distorted/library/type/Static2D.java index 70b7e22..11e72a3 100644 --- a/src/main/java/org/distorted/library/type/Static2D.java +++ b/src/main/java/org/distorted/library/type/Static2D.java @@ -73,7 +73,7 @@ public class Static2D extends Static implements Data2D * * @param ox new value of the first float. */ - public void set1(float ox) + public void set0(float ox) { x = ox; } @@ -84,7 +84,7 @@ public class Static2D extends Static implements Data2D * * @param oy new value of the second float. */ - public void set2(float oy) + public void set1(float oy) { y = oy; } @@ -95,7 +95,7 @@ public class Static2D extends Static implements Data2D * * @return The first float. */ - public float get1() + public float get0() { return x; } @@ -106,7 +106,7 @@ public class Static2D extends Static implements Data2D * * @return The second float. */ - public float get2() + public float get1() { return y; } diff --git a/src/main/java/org/distorted/library/type/Static3D.java b/src/main/java/org/distorted/library/type/Static3D.java index da3b591..acbda87 100644 --- a/src/main/java/org/distorted/library/type/Static3D.java +++ b/src/main/java/org/distorted/library/type/Static3D.java @@ -78,7 +78,7 @@ public class Static3D extends Static implements Data3D * * @param ox new value of the first float. */ - public void set1(float ox) + public void set0(float ox) { x = ox; } @@ -89,7 +89,7 @@ public class Static3D extends Static implements Data3D * * @param oy new value of the second float. */ - public void set2(float oy) + public void set1(float oy) { y = oy; } @@ -100,7 +100,7 @@ public class Static3D extends Static implements Data3D * * @param oz new value of the third float. */ - public void set3(float oz) + public void set2(float oz) { z = oz; } @@ -111,7 +111,7 @@ public class Static3D extends Static implements Data3D * * @return The first float. */ - public float get1() + public float get0() { return x; } @@ -122,7 +122,7 @@ public class Static3D extends Static implements Data3D * * @return The second float. */ - public float get2() + public float get1() { return y; } @@ -133,7 +133,7 @@ public class Static3D extends Static implements Data3D * * @return The third float. */ - public float get3() + public float get2() { return z; } diff --git a/src/main/java/org/distorted/library/type/Static4D.java b/src/main/java/org/distorted/library/type/Static4D.java index 78c5fc9..552eeb2 100644 --- a/src/main/java/org/distorted/library/type/Static4D.java +++ b/src/main/java/org/distorted/library/type/Static4D.java @@ -83,7 +83,7 @@ public class Static4D extends Static implements Data4D * * @param ox new value of the first float. */ - public void set1(float ox) + public void set0(float ox) { x = ox; } @@ -94,7 +94,7 @@ public class Static4D extends Static implements Data4D * * @param oy new value of the second float. */ - public void set2(float oy) + public void set1(float oy) { y = oy; } @@ -105,7 +105,7 @@ public class Static4D extends Static implements Data4D * * @param oz new value of the third float. */ - public void set3(float oz) + public void set2(float oz) { z = oz; } @@ -116,7 +116,7 @@ public class Static4D extends Static implements Data4D * * @param ow new value of the fourth float. */ - public void set4(float ow) + public void set3(float ow) { w = ow; } @@ -127,7 +127,7 @@ public class Static4D extends Static implements Data4D * * @return The first float. */ - public float get1() + public float get0() { return x; } @@ -138,7 +138,7 @@ public class Static4D extends Static implements Data4D * * @return The second float. */ - public float get2() + public float get1() { return y; } @@ -149,7 +149,7 @@ public class Static4D extends Static implements Data4D * * @return The third float. */ - public float get3() + public float get2() { return z; } @@ -160,7 +160,7 @@ public class Static4D extends Static implements Data4D * * @return The fourth float. */ - public float get4() + public float get3() { return w; } diff --git a/src/main/java/org/distorted/library/type/Static5D.java b/src/main/java/org/distorted/library/type/Static5D.java index 47f5a37..373a672 100644 --- a/src/main/java/org/distorted/library/type/Static5D.java +++ b/src/main/java/org/distorted/library/type/Static5D.java @@ -88,7 +88,7 @@ public class Static5D extends Static implements Data5D * * @param ox new value of the first float. */ - public void set1(float ox) + public void set0(float ox) { x = ox; } @@ -99,7 +99,7 @@ public class Static5D extends Static implements Data5D * * @param oy new value of the second float. */ - public void set2(float oy) + public void set1(float oy) { y = oy; } @@ -110,7 +110,7 @@ public class Static5D extends Static implements Data5D * * @param oz new value of the third float. */ - public void set3(float oz) + public void set2(float oz) { z = oz; } @@ -121,7 +121,7 @@ public class Static5D extends Static implements Data5D * * @param ow new value of the fourth float. */ - public void set4(float ow) + public void set3(float ow) { w = ow; } @@ -132,7 +132,7 @@ public class Static5D extends Static implements Data5D * * @param ov new value of the fifth float. */ - public void set5(float ov) + public void set4(float ov) { v = ov; } @@ -143,7 +143,7 @@ public class Static5D extends Static implements Data5D * * @return The first float. */ - public float get1() + public float get0() { return x; } @@ -154,19 +154,18 @@ public class Static5D extends Static implements Data5D * * @return The second float. */ - public float get2() + public float get1() { return y; } - /////////////////////////////////////////////////////////////////////////////////////////////////// /** * Return the value of the third float contained. * * @return The third float. */ - public float get3() + public float get2() { return z; } @@ -177,7 +176,7 @@ public class Static5D extends Static implements Data5D * * @return The fourth float. */ - public float get4() + public float get3() { return w; } @@ -188,7 +187,7 @@ public class Static5D extends Static implements Data5D * * @return The fifth float. */ - public float get5() + public float get4() { return v; }