/ - Diff - Distorted Android

« Previous | Next »

Revision d2aee6cc

Added by Leszek Koltunski almost 8 years ago

ID d2aee6ccbb59ac92cd4b04e8eb04d9e7bd486aba
Parent 76f2d645
Child f8634085

1. Make it possible to enable/disable DEPTH test when rendering to a Screen
2. Using this, remove the 'Root' Node from StarWars.

src/main/java/org/distorted/examples/fbo/FBORenderer.java
72	72	if( mRoot!=null )
73	73	{
74	74	DistortedFramebuffer fbo = mRoot.getFramebuffer();
75		fbo.enableDepthAttachment(depth);
	75	fbo.enableDepth(depth);
76	76	}
77	77	}
78	78

       private final float CRAWL_ANGLE = -30.0f;
       private GLSurfaceView mView;
       private DistortedTexture mScreenTexture, mGFFATexture, mLogoTexture, mCrawlTexture, mCrawlBackgroundTexture, mStarTexture;
       private DistortedEffects mScreenEffects, mGFFAEffects, mLogoEffects, mCrawlEffects, mCrawlBackgroundEffects;
       private DistortedTexture mGFFATexture, mLogoTexture, mCrawlTexture, mCrawlBackgroundTexture, mStarTexture;
       private DistortedEffects mGFFAEffects, mLogoEffects, mCrawlEffects, mCrawlBackgroundEffects;
       private DistortedEffects[] mStarEffects;
       private DistortedNode mRoot, mBackground;
       private DistortedNode mBackground;
       private DistortedScreen mScreen;
       private MeshFlat mQuad;
-...
         mQuad = new MeshFlat(1,1);
         mScreenEffects          = new DistortedEffects();
         mGFFAEffects            = new DistortedEffects();
         mLogoEffects            = new DistortedEffects();
         mCrawlEffects           = new DistortedEffects();
-...
         mScreen = new DistortedScreen();
         mScreen.setProjection(60.0f, 0.0f, 0.0f);
         mScreen.enableDepth(false);
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
           mWidth = width;
           mHeight= height;
           mScreenEffects.abortAllEffects();
           mGFFAEffects.abortAllEffects();
           mLogoEffects.abortAllEffects();
           mCrawlEffects.abortAllEffects();
-...
           for(int i=0; i<NUM_STARS; i++) mStarEffects[i].abortAllEffects();
           setupScreen(width,height);
           mScreen.detachAll();
           mScreen.attach(mRoot);
           setupScreen(width,height);
           mScreen.resize(width, height);
+          }
+        }
-...
       private void setupScreen(int w, int h)
+        {
         mScreenTexture = new DistortedTexture(w,h);
         mRoot = new DistortedNode(mScreenTexture, mScreenEffects,mQuad);
         mCrawlBackgroundTexture = new DistortedTexture(w,(int)(Math.sqrt(3.0)*h));
         int randomA, randomX, randomY, randomTime;
-...
           mStarEffects[i].alpha(di);
           mRoot.attach(mStarTexture, mStarEffects[i], mQuad);
           mScreen.attach(mStarTexture, mStarEffects[i], mQuad);
+          }
         float scale = (0.5f*w/mGFFATexture.getWidth());
-...
         mGFFAEffects.scale( new Static3D(scale,scale,scale) );
         mGFFAEffects.alpha(di);
         mRoot.attach(mGFFATexture, mGFFAEffects, mQuad);
         mScreen.attach(mGFFATexture, mGFFAEffects, mQuad);
         mGFFAEffects.registerForMessages(this);
+        }
-...
+          {
           if( objectID == gffaID )
+            {
             mRoot.detach(mGFFAEffects);
             mScreen.detach(mGFFAEffects);
             mGFFAEffects.abortAllEffects();
             mGFFATexture.markForDeletion();
             int screenW=mScreenTexture.getWidth();
             int screenH=mScreenTexture.getHeight();
             int screenW=mScreen.getWidth();
             int screenH=mScreen.getHeight();
             int logoW = mLogoTexture.getWidth();
             int logoH = mLogoTexture.getHeight();
-...
             mLogoEffects.scale(di);
             mLogoEffects.move( new Static3D(-logoW/2,-logoH/2,0) );
             mRoot.attach(mLogoTexture, mLogoEffects,mQuad);
             mScreen.attach(mLogoTexture, mLogoEffects,mQuad);
             mLogoEffects.registerForMessages(this);
+            }
           else if( objectID==logoID )
+            {
             mRoot.detach(mLogoEffects);
             mScreen.detach(mLogoEffects);
             mLogoEffects.abortAllEffects();
             mLogoTexture.markForDeletion();
             int crawlW = mCrawlTexture.getWidth();
             int crawlH = mCrawlTexture.getHeight();
             int screenW= mScreenTexture.getWidth();
             int screenH= mScreenTexture.getHeight();
             int screenW= mScreen.getWidth();
             int screenH= mScreen.getHeight();
             int backH  = mCrawlBackgroundTexture.getHeight();
             float scale= (float)screenW/crawlW;
-...
             mCrawlEffects.scale( new Static3D(scale,scale,scale) );
             mCrawlEffects.move( new Static3D(-crawlW/2,0,0) );
             mBackground = mRoot.attach(mCrawlBackgroundTexture, mCrawlBackgroundEffects,mQuad);
             mBackground = mScreen.attach(mCrawlBackgroundTexture, mCrawlBackgroundEffects,mQuad);
             mBackground.attach(mCrawlTexture, mCrawlEffects,mQuad);
             mCrawlEffects.registerForMessages(this);
+            }
           else if( objectID==crawlID )
+            {
             mRoot.detach(mBackground);
             mScreen.detach(mBackground);
             mBackground.detach(mCrawlEffects);
             mCrawlEffects.abortAllEffects();
             mCrawlTexture.markForDeletion();

Also available in: Unified diff

Project

General

Profile

Distorted Android

Revision d2aee6cc

Added by Leszek Koltunski almost 8 years ago