commit da56b12f6f63a11f3c4acc0926504d4983ff2be3 Author: Leszek Koltunski Date: Sun Mar 20 23:30:35 2022 +0100 Beginnings of support for display of a collection of bandaged cubits in the CreatorView. diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java index bbb6f458..b4906e62 100644 --- a/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java +++ b/src/main/java/org/distorted/bandaged/BandagedCreatorActivity.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // +// Copyright 2022 Leszek Koltunski // // // // This file is part of Magic Cube. // // // diff --git a/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java b/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java index 66f3497c..ac5ec10f 100644 --- a/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java +++ b/src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2019 Leszek Koltunski // +// Copyright 2022 Leszek Koltunski // // // // This file is part of Magic Cube. // // // @@ -21,11 +21,10 @@ package org.distorted.bandaged; import android.opengl.GLSurfaceView; -import org.distorted.library.effect.EffectType; -import org.distorted.library.effect.VertexEffectQuaternion; -import org.distorted.library.effect.VertexEffectRotate; import org.distorted.library.main.DistortedLibrary; +import org.distorted.library.main.DistortedNode; import org.distorted.library.main.DistortedScreen; +import org.distorted.library.type.Static4D; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; @@ -37,15 +36,72 @@ public class BandagedCreatorRenderer implements GLSurfaceView.Renderer, Distorte private final BandagedCreatorView mView; private final DistortedScreen mScreen; + private final BandagedCubit[] mCubits; + + private float[][] POSITIONS = new float[][] + { + {-1.0f, +1.0f, +1.0f}, + {-1.0f, +1.0f, +0.0f}, + {-1.0f, +1.0f, -1.0f}, + {-1.0f, 0.0f, +1.0f}, + {-1.0f, 0.0f, +0.0f}, + {-1.0f, 0.0f, -1.0f}, + {-1.0f, -1.0f, +1.0f}, + {-1.0f, -1.0f, +0.0f}, + {-1.0f, -1.0f, -1.0f}, + { 0.0f, -1.0f, +1.0f}, + { 0.0f, -1.0f, +0.0f}, + { 0.0f, +1.0f, +1.0f}, + { 0.0f, +1.0f, +0.0f}, + { 0.0f, +1.0f, -1.0f}, + { 0.0f, 0.0f, +1.0f}, + { 0.0f, 0.0f, -1.0f}, + { 1.0f, +1.0f, +1.0f}, + { 1.0f, +1.0f, +0.0f}, + { 1.0f, +1.0f, -1.0f}, + { 1.0f, 0.0f, +1.0f}, + { 1.0f, 0.0f, +0.0f}, + { 1.0f, -1.0f, +1.0f}, + { 1.0f, 0.0f, -1.0f }, + { 1.0f, -1.0f, -1.0f }, + { 1.0f, -1.0f, +0.0f }, + { 0.0f, -1.0f, -1.0f }, + }; + + Static4D mQuat1, mQuat2; + int mScreenMin; + /////////////////////////////////////////////////////////////////////////////////////////////////// BandagedCreatorRenderer(BandagedCreatorView v) { final float BRIGHTNESS = 0.333f; + mQuat1 = new Static4D(0,0,0,1); + mQuat2 = new Static4D(0,0,0,1); + mView = v; mScreen = new DistortedScreen(); mScreen.glClearColor(BRIGHTNESS, BRIGHTNESS, BRIGHTNESS, 1.0f); + + mCubits = createCubits(); + } + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private BandagedCubit[] createCubits() + { + int len = POSITIONS.length; + BandagedCubit[] cubits = new BandagedCubit[len]; + + for(int c=0; c=0 && mY>= 0 ) + { + float px = mY-y; + float py = mX-x; + float pz = 0; + float plen = (float)Math.sqrt(px*px + py*py + pz*pz); + + if( plen>0 ) + { + px /= plen; + py /= plen; + pz /= plen; + + float cosA = (float)Math.cos(plen*3.14f/mRenderer.mScreenMin); + float sinA = (float)Math.sqrt(1-cosA*cosA); + + mRenderer.mQuat1.set(px*sinA, py*sinA, pz*sinA, cosA); + } + } + if( (mX-x)*(mX-x) + (mY-y)*(mY-y) > mRenderer.mScreenMin*mRenderer.mScreenMin/(DIRECTION_SENSITIVITY*DIRECTION_SENSITIVITY) ) + { + mX = x; + mY = y; + resetQuats(); + } + break; + + case MotionEvent.ACTION_UP : mX = -1; + mY = -1; + resetQuats(); + break; + } + + return true; + } + } diff --git a/src/main/java/org/distorted/bandaged/BandagedCubit.java b/src/main/java/org/distorted/bandaged/BandagedCubit.java new file mode 100644 index 00000000..63e98860 --- /dev/null +++ b/src/main/java/org/distorted/bandaged/BandagedCubit.java @@ -0,0 +1,104 @@ +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Copyright 2022 Leszek Koltunski // +// // +// This file is part of Magic Cube. // +// // +// Magic Cube is free software: you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation, either version 2 of the License, or // +// (at your option) any later version. // +// // +// Magic Cube is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with Magic Cube. If not, see . // +/////////////////////////////////////////////////////////////////////////////////////////////////// + +package org.distorted.bandaged; + +import org.distorted.library.effect.MatrixEffectMove; +import org.distorted.library.effect.MatrixEffectQuaternion; +import org.distorted.library.effect.MatrixEffectScale; +import org.distorted.library.main.DistortedEffects; +import org.distorted.library.main.DistortedNode; +import org.distorted.library.main.DistortedTexture; +import org.distorted.library.mesh.MeshBase; +import org.distorted.library.type.Static3D; +import org.distorted.library.type.Static4D; +import org.distorted.objectlib.helpers.FactoryBandaged3x3Cubit; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + +public class BandagedCubit +{ + private static final Static3D CENTER = new Static3D(0,0,0); + + private final DistortedNode mNode; + private final DistortedTexture mTexture; + private final DistortedEffects mEffects; + private final MeshBase mMesh; + private final float[] mPosition; + +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private Static3D computeMove(float[] position) + { + int numCenters = position.length/3; + float totalX=0.0f, totalY=0.0f, totalZ=0.0f; + + for(int center=0; center