/ - Diff - Magic Cube - Distorted Android

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public long start(DistortedScreen screen, RubikCube cube, EffectListener listener)
       public long start(int duration, DistortedScreen screen, RubikCube cube, EffectListener listener)
+        {
         mScreen   = screen;
         mCube     = cube;
         mListener = listener;
         mCubeEffectFinished = createEffects(2000);
         mCubeEffectFinished = createEffects(duration);
         if( mCubeEffects!=null )
+          {

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public long start(DistortedScreen screen, RubikCube cube, EffectListener listener)
       public long start(int duration, DistortedScreen screen, RubikCube cube, EffectListener listener)
+        {
         mScreen   = screen;
         mCube     = cube;
         mListener = listener;
         mCubeEffectFinished = createEffects(2000);
         mCubeEffectFinished = createEffects(duration);
         if( mCubeEffects!=null )
+          {

src/main/java/org/distorted/magic/RubikActivity.java
115	115	public void Scramble(View v)
116	116	{
117	117	RubikSurfaceView view = findViewById(R.id.rubikSurfaceView);
118		view.scrambleCube();
	118	view.getRenderer().scrambleCube();
119	119	}
120	120
121	121	///////////////////////////////////////////////////////////////////////////////////////////////////
...	...
139	139	}
140	140
141	141	RubikSurfaceView view = findViewById(R.id.rubikSurfaceView);
142		boolean success = view.setNewCubeSize(size);
	142	boolean success = view.getRenderer().createCube(size);
143	143
144	144	if( success )
145	145	{

         private boolean mFinishRotation, mRemoveRotation, mFinishDragCurrent, mFinishDragAccumulated;
         private boolean mCanRotate, mCanDrag;
         private RubikCube mOldCube, mNewCube;
         private int mScreenWidth, mScreenHeight;
         private MeshQuad mMesh;
         private AppearEffect.Type mAppearType;
         private DisappearEffect.Type mDisappearType;
         private int mAppearDuration, mDisappearDuration;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           mCanRotate = true;
           mCanDrag   = true;
           mAppearType    = AppearEffect.Type.SCALE;
           mDisappearType = DisappearEffect.Type.SCALE;
           mAppearDuration    = 1000;
           mDisappearDuration = 1000;
           mMesh= new MeshQuad();
           mNextCubeSize =RubikActivity.getSize();
+          }
-...
     // various things are done here delayed, 'after the next render' as not to be done mid-render and
     // cause artifacts.
         @Override
         public void onDrawFrame(GL10 glUnused)
+          {
           mScreen.render( System.currentTimeMillis() );
-...
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // EffectListener. The library sends a message to us when it's time to call 'removeRotation'
        @Override
        public void onSurfaceChanged(GL10 glUnused, int width, int height)
+          {
           if( mNewCube!=null ) mNewCube.createTexture();
           float cameraDistance = CAMERA_DISTANCE*(width>height ? width:height);
           float fovInDegrees   = computeFOV(cameraDistance,height);
           mScreen.setProjection( fovInDegrees, 0.1f);
           mView.setScreenSize(width,height);
           mView.setCameraDist(cameraDistance);
           mScreen.resize(width, height);
           recomputeScaleFactor(width,height);
           mScreenHeight = height;
           mScreenWidth  = width;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        @Override
        public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
+          {
           VertexEffectSink.enable();
           AppearEffect.enableEffects();
           DisappearEffect.enableEffects();
           try
+            {
             DistortedLibrary.onCreate(mView.getContext());
+            }
           catch(Exception ex)
+            {
             android.util.Log.e("Rubik", ex.getMessage() );
+            }
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        public void effectMessage(final EffectMessage em, final long effectID, final long objectID)
+         {
-...
+         {
          try
+           {
            DisappearEffect effect = DisappearEffect.create(DisappearEffect.Type.ROUND);
            mDisappearEffectID = effect.start(mScreen,mOldCube,this);
            DisappearEffect effect = DisappearEffect.create(mDisappearType);
            mDisappearEffectID = effect.start(mDisappearDuration,mScreen,mOldCube,this);
+           }
          catch(Exception ex)
+           {
-...
+         {
          try
+           {
            AppearEffect effect = AppearEffect.create(AppearEffect.Type.ROUND);
            mAppearEffectID = effect.start(mScreen,mNewCube,this);
            AppearEffect effect = AppearEffect.create(mAppearType);
            mAppearEffectID = effect.start(mAppearDuration,mScreen,mNewCube,this);
+           }
          catch(Exception ex)
+           {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        public void onSurfaceChanged(GL10 glUnused, int width, int height)
+          {
           if( mNewCube!=null ) mNewCube.createTexture();
        private float computeFOV(float cameraDistance, int screenHeight)
+         {
          double halfFOVInRadians = Math.atan( screenHeight/(2*cameraDistance) );
          return (float)(2*halfFOVInRadians*(180/Math.PI));
+         }
           float cameraDistance = CAMERA_DISTANCE*(width>height ? width:height);
           float fovInDegrees   = computeFOV(cameraDistance,height);
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // no this will not race with onDrawFrame
           mScreen.setProjection( fovInDegrees, 0.1f);
           mView.setScreenSize(width,height);
           mView.setCameraDist(cameraDistance);
           mScreen.resize(width, height);
        void finishRotation()
+         {
          mFinishRotation = true;
+         }
           recomputeScaleFactor(width,height);
     ///////////////////////////////////////////////////////////////////////////////////////////////////
           mScreenHeight = height;
           mScreenWidth  = width;
+          }
        void setAppearDuration(int duration)
+         {
          mAppearDuration = duration;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
+          {
           VertexEffectSink.enable();
           AppearEffect.enableEffects();
           DisappearEffect.enableEffects();
           try
+            {
             DistortedLibrary.onCreate(mView.getContext());
+            }
           catch(Exception ex)
+            {
             android.util.Log.e("Rubik", ex.getMessage() );
+            }
+          }
        void setDisappearDuration(int duration)
+         {
          mDisappearDuration = duration;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
        private float computeFOV(float cameraDistance, int screenHeight)
        void setAppearType(AppearEffect.Type type)
+         {
          double halfFOVInRadians = Math.atan( screenHeight/(2*cameraDistance) );
          return (float)(2*halfFOVInRadians*(180/Math.PI));
          mAppearType = type;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     // no this will not race with onDrawFrame
        void finishRotation()
        void setDisappearType(DisappearEffect.Type type)
+         {
          mFinishRotation = true;
          mDisappearType = type;
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

     ///////////////////////////////////////////////////////////////////////////////////////////////////
         boolean setNewCubeSize(int newCubeSize)
         RubikRenderer getRenderer()
+          {
           return mRenderer.createCube(newCubeSize);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         void scrambleCube()
+          {
           mRenderer.scrambleCube();
           return mRenderer;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

Project

General

Profile

Magic Cube

Revision aa8b36aa

Added by Leszek Koltunski over 6 years ago