/ - Diff - Distorted Android

src/main/java/org/distorted/examples/bean/BeanRenderer.java
108	108
109	109	public void onSurfaceChanged(GL10 glUnused, int width, int height)
110	110	{
111		float min= width>height ? height : width;
	111	if( width<height ) mScale.set( width, width*mBmpRatio, 1 );
	112	else mScale.set( height/mBmpRatio, height, 1 );
112	113
113		mScale.set( min, min*mBmpRatio, 1 );
114	114	mScreen.resize(width, height);
115	115	}
116	116

src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java
124	124
125	125	mScreen.resize(width, height);
126	126	}
	127
127	128	///////////////////////////////////////////////////////////////////////////////////////////////////
128	129
129	130	public void onDrawFrame(GL10 glUnused)

src/main/java/org/distorted/examples/girl/GirlRenderer.java
166	166
167	167	public void onSurfaceChanged(GL10 glUnused, int width, int height)
168	168	{
169		float min= width>height ? height : width;
	169	if( width<height ) mScale.set( width, width*mBmpRatio, width );
	170	else mScale.set( height/mBmpRatio, height, height );
170	171
171		mScale.set( min, min*mBmpRatio, min );
172	172	mScreen.resize(width, height);
173	173	}
174	174

src/main/java/org/distorted/examples/listener/ListenerRenderer.java
139	139
140	140	public void onSurfaceChanged(GL10 glUnused, int width, int height)
141	141	{
142		float min= width>height ? height : width;
	142	if( width<height ) mScale.set( width, width*mBmpRatio, width );
	143	else mScale.set( height/mBmpRatio, height, height );
143	144
144		mScale.set( min, min*mBmpRatio, min );
145	145	mScreen.resize(width, height);
146	146	}
147	147

src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
114	114
115	115	public void onSurfaceChanged(GL10 glUnused, int width, int height)
116	116	{
117		float min= width>height ? height : width;
	117	if( width<height ) mScale.set( width, width*mBmpRatio, 1 );
	118	else mScale.set( height/mBmpRatio, height, 1 );
118	119
119		mScale.set( min, min*mBmpRatio, 1 );
120	120	mScreen.resize(width, height);
121	121	}
122	122

     import org.distorted.library.effect.FragmentEffectAlpha;
     import org.distorted.library.effect.FragmentEffectChroma;
     import org.distorted.library.effect.MatrixEffectScale;
     import org.distorted.library.effect.VertexEffectDeform;
     import org.distorted.library.effect.VertexEffectSink;
     import org.distorted.library.effect.VertexEffectSwirl;
-...
     import org.distorted.library.main.DistortedTexture;
     import org.distorted.library.main.DistortedEffects;
     import org.distorted.library.mesh.MeshRectangles;
     import org.distorted.library.type.Static3D;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
        private DistortedScreen mScreen;
        private MeshRectangles mMesh;
        private boolean mRefresh;
        private Static3D mScale;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
          mView   = v;
          mEffects= new DistortedEffects();
          mScreen = new DistortedScreen();
          mTexture= new DistortedTexture();
          mRefresh= true;
          mScale = new Static3D(1,1,1);
          mEffects.apply( new MatrixEffectScale(mScale));
+         }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
          texW = width;
          texH = height;
          if( mTexture!=null ) mTexture.markForDeletion();
          mTexture = new DistortedTexture();
          mScale.set(width,height,width);
          mBitmap  = Bitmap.createBitmap(texW,texH, Bitmap.Config.ARGB_8888);
          mCanvas  = new Canvas(mBitmap);
          if( mMesh!=null ) mMesh.markForDeletion();
          mMesh = new MeshRectangles(80,80*texH/texW);
          mMesh.setStretch(texW,texH,0);
          mScreen.detachAll();
          mScreen.attach(mTexture,mEffects,mMesh);

         private static final Object lock = new Object();
         private Dynamic3D mCenter;
         private Static4D mRegionVertex;
         private Static3D mRegionFragment;
         private Paint mPaint;
         private int moving;
         private int mScrWidth, mScrHeight;
-...
           mPaint.setStyle(Style.FILL);
           moving = -1;
           mCenter         = new Dynamic3D(LOOP_TIME,0.0f);
           mRegionFragment = new Static3D(0,0,0);
           mRegionVertex   = new Static4D(0,0,0,0);
           mDeform         = new Static3D(0,0,0);
           mCenter = new Dynamic3D(LOOP_TIME,0.0f);
           mDeform = new Static3D(0,0,0.15f);
           if(!isInEditMode())
+            {
-...
             setEGLContextClientVersion( (configurationInfo.reqGlEsVersion>>16) >= 3 ? 3:2 );
             setRenderer(mRenderer);
             mEffectDeform  = new VertexEffectDeform  ( mDeform          , mCenter, mRegionVertex);
             mEffectSink    = new VertexEffectSink    (new Static1D(10)  , mCenter, mRegionVertex);
             mEffectSwirl   = new VertexEffectSwirl   (new Static1D(30)  , mCenter, mRegionVertex);
             mEffectAlpha   = new FragmentEffectAlpha (new Static1D(0.5f), mCenter, mRegionFragment, true);
             mEffectChroma  = new FragmentEffectChroma(new Static1D(0.5f), new Static3D(1,0,0), mCenter, mRegionFragment, true);
             Static3D regionFrag = new Static3D(0.15f,0.15f,0.15f);
             Static4D regionVert = new Static4D(0,0,0,0.15f);
             mEffectDeform  = new VertexEffectDeform  ( mDeform          , mCenter, regionVert);
             mEffectSink    = new VertexEffectSink    (new Static1D(10)  , mCenter, regionVert);
             mEffectSwirl   = new VertexEffectSwirl   (new Static1D(30)  , mCenter, regionVert);
             mEffectAlpha   = new FragmentEffectAlpha (new Static1D(0.5f), mCenter, regionFrag, true);
             mEffectChroma  = new FragmentEffectChroma(new Static1D(0.5f), new Static3D(1,0,0), mCenter, regionFrag, true);
+            }
+          }
-...
           mSize1 = max/200;
           mSize2 = max/80;
           int rad= max/6;
           mRegionVertex.set(0,0,0,rad);
           mRegionFragment.set(rad,rad,rad);
           mDeform.set2(max/7);
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
             if( len>=2 )
+              {
               float step = (float)LOOP_TIME/(NUM_POINTS+1);
               final float step = (float)LOOP_TIME/(NUM_POINTS+1);
               for(int i=0; i<NUM_POINTS; i++)
+                {
                 mPaint.setColor( 0xffffffff );
                 mCenter.get( drawCoord, 0, (long)(i*step) );
                 c.drawCircle(drawCoord[0] + mScrWidth*0.5f, mScrHeight*0.5f - drawCoord[1], mSize1, mPaint );
                 c.drawCircle( (drawCoord[0]+0.5f)*mScrWidth, mScrHeight*(0.5f-drawCoord[1]), mSize1, mPaint );
+                }
+              }
-...
             for(int curr=0; curr<len; curr++)
+              {
               cu = mCenter.getPoint(curr);
               c.drawCircle(cu.get0() + mScrWidth*0.5f, mScrHeight*0.5f - cu.get1(), mSize2, mPaint);
               c.drawCircle( (cu.get0()+0.5f)*mScrWidth, mScrHeight*(0.5f-cu.get1()), mSize2, mPaint);
+              }
             if( time-mTime > LOOP_TIME ) mTime = time;
-...
+          {
           if( mCurrEffect!=EFFECT_POINTS ) return true;
           int xDown = (int)event.getX() - mScrWidth/2;
           int yDown = mScrHeight/2 - (int)event.getY();
           float xDown = event.getX()/mScrWidth - 0.5f;
           float yDown = 0.5f - event.getY()/mScrHeight;
           switch(event.getAction())
+            {

             bmpCanvas.drawRect(                 0, height*i/NUMLINES-1, width             , height*i/NUMLINES+1, paint);
+            }
           mScale.set(width,height,width);  // TODO - width in the third scale??
           mScale.set(width,height,width);
           mTexture.setTexture(bmp);

src/main/java/org/distorted/examples/sink/SinkRenderer.java
88	88
89	89	public void onSurfaceChanged(GL10 glUnused, int width, int height)
90	90	{
91		float min= width>height ? height : width;
	91	if( width<height ) mScale.set( width, width*mBmpRatio, 1 );
	92	else mScale.set( height/mBmpRatio, height, 1 );
92	93
93		mScale.set( min, min*mBmpRatio, 1 );
94	94	mScreen.resize(width, height);
95	95	}
96	96

Project

General

Profile

Distorted Android

Revision c7a31368

Added by Leszek Koltunski almost 5 years ago