Project

General

Profile

« Previous | Next » 

Revision d218d64e

Added by Leszek Koltunski almost 8 years ago

Major: change of API.

Split DFramebuffer into Framebuffer and Screen; introduce the 'DistortedInputSurface' and 'DistortedOutputSurface' interfaces.

View differences:

src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedEffects;
30 30
import org.distorted.library.DistortedFramebuffer;
31
import org.distorted.library.DistortedScreen;
31 32
import org.distorted.library.MeshFlat;
32 33
import org.distorted.library.DistortedTexture;
33 34
import org.distorted.library.EffectTypes;
......
47 48
   private DistortedEffects mEffects;
48 49
   private DistortedTexture mTexture;
49 50
   private MeshFlat mMesh;
50
   private DistortedFramebuffer mScreen;
51
   private DistortedScreen mScreen;
51 52
   private AroundTheWorldEffectsManager mManager;
52 53
   private int mObjWidth, mObjHeight;
53 54

  
......
62 63
      mManager = new AroundTheWorldEffectsManager();
63 64
      mEffects = new DistortedEffects();
64 65
      mManager.apply(mEffects);
65
      mScreen = new DistortedFramebuffer(0);
66
      mScreen = new DistortedScreen();
66 67
      }
67 68

  
68 69
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/bean/BeanRenderer.java
29 29

  
30 30
import org.distorted.library.DistortedEffects;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.EffectTypes;
33 34
import org.distorted.library.Distorted;
34 35
import org.distorted.library.DistortedTexture;
......
49 50
   private GLSurfaceView mView;
50 51
   private DistortedTexture mTexture;
51 52
   private DistortedEffects mEffects;
52
   private DistortedFramebuffer mScreen;
53
   private DistortedScreen mScreen;
53 54
   private MeshFlat mMesh;
54 55
   private int bmpHeight, bmpWidth;
55 56
    
......
89 90
      mEffects.distort(dLeft , pLeft , rLeft );
90 91
      mEffects.distort(dRight, pRight, rRight);
91 92

  
92
      mScreen = new DistortedFramebuffer(0);
93
      mScreen = new DistortedScreen();
93 94
      }
94 95

  
95 96
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/blur/BlurRenderer.java
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedEffects;
30 30
import org.distorted.library.DistortedFramebuffer;
31
import org.distorted.library.DistortedScreen;
31 32
import org.distorted.library.DistortedTexture;
32 33
import org.distorted.library.EffectTypes;
33 34
import org.distorted.library.MeshFlat;
......
48 49
    private GLSurfaceView mView;
49 50
    private DistortedTexture mTexture;
50 51
    private DistortedEffects mEffects;
51
    private DistortedFramebuffer mScreen;
52
    private DistortedScreen mScreen;
52 53
    private MeshFlat mMesh;
53 54
    private Static1D mRadiusSta;
54 55
    private int bmpHeight, bmpWidth;
......
60 61
      mView    = v;
61 62
      mMesh    = new MeshFlat(1,1);
62 63
      mEffects = new DistortedEffects();
63
      mScreen  = new DistortedFramebuffer(0);
64
      mScreen  = new DistortedScreen();
64 65

  
65 66
      mRadiusSta = new Static1D(5);
66 67
      Dynamic1D radiusDyn = new Dynamic1D();
src/main/java/org/distorted/examples/catanddog/CatAndDogRenderer.java
29 29
import org.distorted.library.Distorted;
30 30
import org.distorted.library.DistortedEffects;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.DistortedTexture;
33 34
import org.distorted.library.MeshFlat;
34 35
import org.distorted.library.EffectTypes;
......
51 52
    private DistortedEffects mEffects;
52 53
    private DistortedTexture mTexture;
53 54
    private MeshFlat mMesh;
54
    private DistortedFramebuffer mScreen;
55
    private DistortedScreen mScreen;
55 56
    private int bmpHeight, bmpWidth;
56 57

  
57 58
///////////////////////////////////////////////////////////////////////////////////////////////////
......
78 79

  
79 80
      mEffects.alpha( alphaDyn, alphaRegion, false );
80 81

  
81
      mScreen = new DistortedFramebuffer(0);
82
      mScreen = new DistortedScreen();
82 83
      }
83 84

  
84 85
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/check/CheckRenderer.java
30 30
import org.distorted.library.Distorted;
31 31
import org.distorted.library.DistortedEffects;
32 32
import org.distorted.library.DistortedFramebuffer;
33
import org.distorted.library.DistortedScreen;
33 34
import org.distorted.library.DistortedTexture;
34 35
import org.distorted.library.MeshFlat;
35 36
import org.distorted.library.EffectTypes;
......
59 60
    private DistortedTexture mTexture;
60 61
    private DistortedEffects mEffects;
61 62
    private MeshFlat mMesh;
62
    private DistortedFramebuffer mScreen;
63
    private DistortedScreen mScreen;
63 64
    private int bmpHeight, bmpWidth;
64 65

  
65 66
///////////////////////////////////////////////////////////////////////////////////////////////////
......
74 75
      DistortedEffects.setMaxVertex(act.getMaxV());
75 76
      DistortedEffects.setMaxFragment(act.getMaxF());
76 77

  
77
      mScreen = new DistortedFramebuffer(0);
78
      mScreen = new DistortedScreen();
78 79
      }
79 80

  
80 81
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/cubes/CubesRenderer.java
29 29

  
30 30
import org.distorted.library.DistortedEffects;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.DistortedTexture;
33 34
import org.distorted.library.MeshObject;
34 35
import org.distorted.library.EffectTypes;
......
50 51
    private DistortedTexture mTexture;
51 52
    private DistortedEffects mEffects;
52 53
    private MeshObject mMesh;
53
    private DistortedFramebuffer mScreen;
54
    private DistortedScreen mScreen;
54 55
    private DynamicQuat mQuatInt1, mQuatInt2;
55 56
    private int mObjWidth, mObjHeight;
56 57

  
......
81 82
      mQuatInt1.add(mQuat1);
82 83
      mQuatInt2.add(mQuat2);
83 84

  
84
      mScreen = new DistortedFramebuffer(0);
85
      mScreen = new DistortedScreen();
85 86
      }
86 87

  
87 88
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/deform/DeformRenderer.java
25 25
import org.distorted.library.Distorted;
26 26
import org.distorted.library.DistortedEffects;
27 27
import org.distorted.library.DistortedFramebuffer;
28
import org.distorted.library.DistortedScreen;
28 29
import org.distorted.library.DistortedTexture;
29 30
import org.distorted.library.MeshObject;
30 31
import org.distorted.library.MeshFlat;
......
54 55
   private DistortedTexture fpsTexture, stretchTexture;
55 56
   private DistortedEffects fpsEffects, stretchEffects;
56 57
   private MeshObject fpsMesh, stretchMesh;
57
   private DistortedFramebuffer mScreen;
58
   private DistortedScreen mScreen;
58 59
   private Static3D touchPoint;
59 60

  
60 61
   private Dynamic3D mReleasedDistortDynamic;
......
151 152

  
152 153
      mMovingShearDynamic.add(vShear[0]);
153 154

  
154
      mScreen = new DistortedFramebuffer(0);
155
      mScreen = new DistortedScreen();
155 156
      }
156 157

  
157 158
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/differentbitmaps/DifferentBitmapsRenderer.java
29 29

  
30 30
import org.distorted.library.Distorted;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.DistortedTexture;
33 34
import org.distorted.library.DistortedEffects;
34 35
import org.distorted.library.MeshFlat;
......
53 54
   private DistortedTexture[] mTexture;
54 55
   private DistortedEffects[] mEffects;
55 56
   private MeshFlat mMesh;
56
   private DistortedFramebuffer mScreen;
57
   private DistortedScreen mScreen;
57 58
   private int bmpHeight, bmpWidth;
58 59
    
59 60
///////////////////////////////////////////////////////////////////////////////////////////////////
......
77 78
      mEffects[0].sink( new Static1D(8), mPoint, new Static4D(0,0,80,80));  // enlarge the nose
78 79
      mEffects[0].distort(dDistort,mPoint);                                 // keep moving the whole bitmap left and right.
79 80

  
80
      mScreen = new DistortedFramebuffer(0);
81
      mScreen = new DistortedScreen();
81 82
      }
82 83

  
83 84
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/differenteffects/DifferentEffectsRenderer.java
30 30
import org.distorted.library.Distorted;
31 31
import org.distorted.library.DistortedEffects;
32 32
import org.distorted.library.DistortedFramebuffer;
33
import org.distorted.library.DistortedScreen;
33 34
import org.distorted.library.MeshFlat;
34 35
import org.distorted.library.DistortedTexture;
35 36
import org.distorted.library.EffectTypes;
......
54 55
   private DistortedEffects[] mEffects;
55 56
   private DistortedTexture mTexture;
56 57
   private MeshFlat mMesh;
57
   private DistortedFramebuffer mScreen;
58
   private DistortedScreen mScreen;
58 59
   private int bmpHeight, bmpWidth;
59 60
    
60 61
///////////////////////////////////////////////////////////////////////////////////////////////////
......
94 95

  
95 96
      mEffects[2].chroma(chromaDyn, new Static3D(0,1,0) );
96 97

  
97
      mScreen = new DistortedFramebuffer(0);
98
      mScreen = new DistortedScreen();
98 99
      }
99 100

  
100 101
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/dynamic/DynamicRenderer.java
31 31

  
32 32
import org.distorted.library.DistortedEffects;
33 33
import org.distorted.library.DistortedFramebuffer;
34
import org.distorted.library.DistortedScreen;
34 35
import org.distorted.library.MeshFlat;
35 36
import org.distorted.library.DistortedTexture;
36 37
import org.distorted.library.Distorted;
......
42 43
   private DynamicSurfaceView mView;
43 44
   private DistortedTexture mTexture;
44 45
   private DistortedEffects mEffects;
45
   private DistortedFramebuffer mScreen;
46
   private DistortedScreen mScreen;
46 47
   private MeshFlat mMesh;
47 48
   private Canvas mCanvas;
48 49
   private Bitmap mBitmap;
......
63 64
     mView   = v;
64 65
     mMesh = new MeshFlat(1,1);
65 66
     mEffects = new DistortedEffects();
66
     mScreen = new DistortedFramebuffer(0);
67
     mScreen = new DistortedScreen();
67 68
     }
68 69

  
69 70
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/effectqueue/EffectQueueRenderer.java
31 31

  
32 32
import org.distorted.library.DistortedEffects;
33 33
import org.distorted.library.DistortedFramebuffer;
34
import org.distorted.library.DistortedScreen;
34 35
import org.distorted.library.MeshFlat;
35 36
import org.distorted.library.DistortedTexture;
36 37
import org.distorted.library.Distorted;
......
55 56
  private DistortedTexture mTexture;
56 57
  private MeshFlat mMesh;
57 58
  private DistortedEffects mEffects;
58
  private DistortedFramebuffer mScreen;
59
  private DistortedScreen mScreen;
59 60

  
60 61
///////////////////////////////////////////////////////////////////////////////////////////////////
61 62

  
......
77 78

  
78 79
    mEffects.registerForMessages(this);
79 80

  
80
    mScreen = new DistortedFramebuffer(0);
81
    mScreen = new DistortedScreen();
81 82
    }
82 83

  
83 84
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedEffects;
30 30
import org.distorted.library.DistortedFramebuffer;
31
import org.distorted.library.DistortedScreen;
31 32
import org.distorted.library.DistortedTexture;
32 33
import org.distorted.library.MeshFlat;
33 34
import org.distorted.library.MeshObject;
......
50 51
    private GLSurfaceView mView;
51 52
    private DistortedTexture mObjectTexture, mBackgroundTexture, mCenterTexture, mRegionTexture;
52 53
    private DistortedEffects mObjectEffects, mBackgroundEffects, mCenterEffects, mRegionEffects;
53
    private DistortedFramebuffer mScreen;
54
    private DistortedScreen mScreen;
54 55
    private MeshFlat mQuad;
55 56
    private MeshObject mObjectMesh;
56 57
    private int mObjWidth, mObjHeight, mObjDepth;
......
110 111
      mRegionScalePoint = new Static3D(0,0,0);
111 112
      mRegionScaleInter.add(mRegionScalePoint);
112 113

  
113
      mScreen = new DistortedFramebuffer(0);
114
      mScreen = new DistortedScreen();
114 115
      }
115 116

  
116 117
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/fbo/FBORenderer.java
29 29

  
30 30
import org.distorted.library.DistortedEffects;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.DistortedTree;
33 34
import org.distorted.library.Distorted;
34 35
import org.distorted.library.MeshCubes;
......
51 52
{
52 53
   private GLSurfaceView mView;
53 54
   private DistortedEffects mEffects;
54
   private DistortedFramebuffer mScreen;
55
   private DistortedScreen mScreen;
55 56
   private DistortedTree mRoot;
56 57
   private int lisaHeight, lisaWidth;
57 58

  
......
61 62
      {
62 63
      mView   = v;
63 64
      mEffects= new DistortedEffects();
64
      mScreen = new DistortedFramebuffer(0);
65
      mScreen = new DistortedScreen();
65 66
      }
66 67

  
67 68
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/flag/FlagRenderer.java
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedEffects;
30 30
import org.distorted.library.DistortedFramebuffer;
31
import org.distorted.library.DistortedScreen;
31 32
import org.distorted.library.MeshCubes;
32 33
import org.distorted.library.DistortedTexture;
33 34
import org.distorted.library.EffectTypes;
......
51 52
    private GLSurfaceView mView;
52 53
    private DistortedEffects mEffects;
53 54
    private DistortedTexture mTexture;
54
    private DistortedFramebuffer mScreen;
55
    private DistortedScreen mScreen;
55 56
    private MeshCubes mMesh;
56 57
    private DynamicQuat mQuatInt1, mQuatInt2;
57 58
    private Dynamic5D mWaveDyn;
......
96 97

  
97 98
      mEffects.wave(mWaveDyn, waveCenter, waveRegion);
98 99

  
99
      mScreen = new DistortedFramebuffer(0);
100
      mScreen = new DistortedScreen();
100 101
      }
101 102

  
102 103
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/girl/GirlRenderer.java
29 29

  
30 30
import org.distorted.library.Distorted;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.MeshFlat;
33 34
import org.distorted.library.DistortedTexture;
34 35
import org.distorted.library.DistortedEffects;
......
51 52
    private GLSurfaceView mView;
52 53
    private DistortedTexture mTexture;
53 54
    private DistortedEffects mEffects;
54
    private DistortedFramebuffer mScreen;
55
    private DistortedScreen mScreen;
55 56
    private MeshFlat mMesh;
56 57
    private Static3D v0,v1,v2,v3;
57 58
    private Static1D dBegin, dMiddle, dEnd, s0;
......
121 122

  
122 123
      mEffects.swirl(diHips, pHips, HipsRegion );
123 124

  
124
      mScreen = new DistortedFramebuffer(0);
125
      mScreen = new DistortedScreen();
125 126
      }
126 127

  
127 128
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/listener/ListenerRenderer.java
30 30

  
31 31
import org.distorted.library.Distorted;
32 32
import org.distorted.library.DistortedFramebuffer;
33
import org.distorted.library.DistortedScreen;
33 34
import org.distorted.library.MeshFlat;
34 35
import org.distorted.library.DistortedTexture;
35 36
import org.distorted.library.DistortedEffects;
......
55 56
   private GLSurfaceView mView;
56 57
   private DistortedTexture mTexture;
57 58
   private DistortedEffects mEffects;
58
   private DistortedFramebuffer mScreen;
59
   private DistortedScreen mScreen;
59 60
   private MeshFlat mMesh;
60 61
   private int bmpHeight, bmpWidth;
61 62
   private Random mRnd;
......
68 69
      mView = v;
69 70
      mEffects = new DistortedEffects();
70 71
      mEffects.registerForMessages(this);
71
      mScreen = new DistortedFramebuffer(0);
72
      mScreen = new DistortedScreen();
72 73
      mRnd = new Random(0);
73 74
      }
74 75

  
src/main/java/org/distorted/examples/matrix3d/Matrix3DRenderer.java
25 25
import org.distorted.library.Distorted;
26 26
import org.distorted.library.DistortedEffects;
27 27
import org.distorted.library.DistortedFramebuffer;
28
import org.distorted.library.DistortedScreen;
28 29
import org.distorted.library.MeshObject;
29 30
import org.distorted.library.DistortedTexture;
30 31

  
......
38 39
    private GLSurfaceView mView;
39 40
    private DistortedTexture mTexture;
40 41
    private DistortedEffects mEffects;
41
    private DistortedFramebuffer mScreen;
42
    private DistortedScreen mScreen;
42 43
    private MeshObject mMesh;
43 44

  
44 45
    private int mWidth, mHeight;
......
54 55
      mEffects= act.getEffects();
55 56
      mTexture= act.getTexture();
56 57
      mMesh = act.getMesh();
57
      mScreen = new DistortedFramebuffer(0);
58
      mScreen = new DistortedScreen();
58 59
      }
59 60

  
60 61
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/mirror/MirrorRenderer.java
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedEffects;
30 30
import org.distorted.library.DistortedFramebuffer;
31
import org.distorted.library.DistortedScreen;
31 32
import org.distorted.library.DistortedTexture;
32 33
import org.distorted.library.MeshFlat;
33 34
import org.distorted.library.type.Dynamic3D;
......
55 56
   private DistortedEffects mEffectsMirror, mEffectsHead, mEffectsNull;
56 57
   private DistortedEffects mEffectsOffscreen1, mEffectsOffscreen2;
57 58
   private DistortedTexture mTextureMirror, mTextureHead;
58
   private DistortedFramebuffer mScreen, mOffScreen1, mOffScreen2;
59
   private DistortedFramebuffer mOffScreen1, mOffScreen2;
60
   private DistortedScreen mScreen;
59 61
   private MeshFlat mQuad;
60 62
   private Static3D mHeadPosition;
61 63
   private Dynamic3D mHeadDyn;
......
70 72
      { 
71 73
      mView    = view;
72 74
      mQuad    = new MeshFlat(1,1);
73
      mScreen  = new DistortedFramebuffer(0);
75
      mScreen  = new DistortedScreen();
74 76

  
75 77
      mEffectsMirror    = new DistortedEffects();
76 78
      mEffectsHead      = new DistortedEffects();
src/main/java/org/distorted/examples/monalisa/MonaLisaRenderer.java
29 29
import org.distorted.library.Distorted;
30 30
import org.distorted.library.DistortedEffects;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.DistortedTexture;
33 34
import org.distorted.library.MeshFlat;
34 35
import org.distorted.library.EffectTypes;
......
48 49
    private GLSurfaceView mView;
49 50
    private DistortedTexture mTexture;
50 51
    private DistortedEffects mEffects;
51
    private DistortedFramebuffer mScreen;
52
    private DistortedScreen mScreen;
52 53
    private MeshFlat mMesh;
53 54
    private int bmpHeight, bmpWidth;
54 55

  
......
74 75
      mEffects.distort( dLeft, pLeft , rLeft );
75 76
      mEffects.distort(dRight, pRight, rRight);
76 77

  
77
      mScreen = new DistortedFramebuffer(0);
78
      mScreen = new DistortedScreen();
78 79
      }
79 80

  
80 81
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/movingeffects/MovingEffectsRenderer.java
30 30
import android.opengl.GLSurfaceView;
31 31

  
32 32
import org.distorted.library.DistortedFramebuffer;
33
import org.distorted.library.DistortedScreen;
33 34
import org.distorted.library.DistortedTexture;
34 35
import org.distorted.library.DistortedEffects;
35 36
import org.distorted.library.MeshFlat;
......
48 49
   private MeshFlat mMesh;
49 50
   private DistortedEffects mEffects;
50 51
   private DistortedTexture mTexture;
51
   private DistortedFramebuffer mScreen;
52
   private DistortedScreen mScreen;
52 53
   private boolean mRefresh;
53 54

  
54 55
///////////////////////////////////////////////////////////////////////////////////////////////////
......
62 63

  
63 64
     mView   = v;
64 65
     mEffects= new DistortedEffects();
65
     mScreen = new DistortedFramebuffer(0);
66
     mScreen = new DistortedScreen();
66 67
     mRefresh= true;
67 68
     }
68 69

  
src/main/java/org/distorted/examples/multiblur/MultiblurRenderer.java
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedEffects;
30 30
import org.distorted.library.DistortedFramebuffer;
31
import org.distorted.library.DistortedScreen;
31 32
import org.distorted.library.DistortedTexture;
32 33
import org.distorted.library.EffectTypes;
33 34
import org.distorted.library.MeshCubes;
......
67 68
    private DistortedEffects[] mEffects;
68 69
    private Static3D[] mMoveVector;
69 70
    private MeshObject mMesh;
70
    private DistortedFramebuffer mScreen;
71
    private DistortedScreen mScreen;
71 72
    private DynamicQuat mQuatInt1, mQuatInt2;
72 73

  
73 74
    Static4D mQuat1, mQuat2;
......
101 102
      mQuatInt1.add(mQuat1);
102 103
      mQuatInt2.add(mQuat2);
103 104

  
104
      mScreen = new DistortedFramebuffer(0);
105
      mScreen = new DistortedScreen();
105 106
      }
106 107

  
107 108
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/olimpic/OlimpicRenderer.java
29 29

  
30 30
import org.distorted.library.DistortedEffects;
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.DistortedTree;
33 34
import org.distorted.library.EffectTypes;
34 35
import org.distorted.library.MeshFlat;
......
54 55
   private GLSurfaceView mView;
55 56
   private DistortedTree mRoot;
56 57
   private DistortedTexture mLeaf;
57
   private DistortedFramebuffer mScreen;
58
   private DistortedScreen mScreen;
58 59
   private int mScreenW, mScreenH;
59 60

  
60 61
///////////////////////////////////////////////////////////////////////////////////////////////////
......
112 113
        effects.chroma( new Static1D(0.5f), new Static3D(colors[3*i],colors[3*i+1], colors[3*i+2]) );
113 114
        }
114 115

  
115
      mScreen = new DistortedFramebuffer(0);
116
      mScreen = new DistortedScreen();
116 117
      }
117 118

  
118 119
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/plainmonalisa/RenderThread.java
33 33
import org.distorted.library.Distorted;
34 34
import org.distorted.library.DistortedEffects;
35 35
import org.distorted.library.DistortedFramebuffer;
36
import org.distorted.library.DistortedScreen;
36 37
import org.distorted.library.MeshFlat;
37 38
import org.distorted.library.DistortedTexture;
38 39
import org.distorted.library.EffectTypes;
......
64 65

  
65 66
  private DistortedTexture mTexture;
66 67
  private DistortedEffects mEffects;
67
  private DistortedFramebuffer mScreen;
68
  private DistortedScreen mScreen;
68 69
  private MeshFlat mMesh;
69 70
  private int bmpHeight, bmpWidth;
70 71
  private SurfaceView mView;
......
95 96
    mEffects.distort( dLeft, pLeft , rLeft );
96 97
    mEffects.distort(dRight, pRight, rRight);
97 98

  
98
    mScreen = new DistortedFramebuffer(0);
99
    mScreen = new DistortedScreen();
99 100
    }
100 101

  
101 102
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/projection/ProjectionRenderer.java
25 25
import org.distorted.library.Distorted;
26 26
import org.distorted.library.DistortedEffects;
27 27
import org.distorted.library.DistortedFramebuffer;
28
import org.distorted.library.DistortedScreen;
28 29
import org.distorted.library.MeshFlat;
29 30
import org.distorted.library.DistortedTexture;
30 31
import org.distorted.library.type.Static3D;
......
44 45
   private GLSurfaceView mView;
45 46
   private DistortedTexture mTexture;
46 47
   private DistortedEffects mEffects;
47
   private DistortedFramebuffer mScreen;
48
   private DistortedScreen mScreen;
48 49
   private MeshFlat mMesh;
49 50

  
50 51
   private float mF, mX, mY;
......
56 57
      { 
57 58
      mView   = view;
58 59
      mEffects= new DistortedEffects();
59
      mScreen = new DistortedFramebuffer(0);
60
      mScreen = new DistortedScreen();
60 61
      }
61 62

  
62 63
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java
30 30

  
31 31
import org.distorted.library.DistortedEffects;
32 32
import org.distorted.library.DistortedFramebuffer;
33
import org.distorted.library.DistortedScreen;
33 34
import org.distorted.library.EffectTypes;
34 35
import org.distorted.library.type.Dynamic;
35 36
import org.distorted.library.type.DynamicQuat;
......
53 54
  private GLSurfaceView mView;
54 55
  private DistortedTexture mTexture;
55 56
  private DistortedEffects mEffects;
56
  private DistortedFramebuffer mScreen;
57
  private DistortedScreen mScreen;
57 58
  private MeshCubes mMesh;
58 59
  private DynamicQuat mRot;
59 60
    
......
86 87
    mRot.setDuration(8000);
87 88
    mRot.setMode(Dynamic.MODE_LOOP);
88 89

  
89
    mScreen = new DistortedFramebuffer(0);
90
    mScreen = new DistortedScreen();
90 91
    }
91 92

  
92 93
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/save/SaveRenderer.java
32 32

  
33 33
import org.distorted.library.Distorted;
34 34
import org.distorted.library.DistortedEffects;
35
import org.distorted.library.DistortedScreen;
35 36
import org.distorted.library.DistortedTexture;
36 37
import org.distorted.library.MeshFlat;
37 38
import org.distorted.library.DistortedFramebuffer;
......
56 57
  private DistortedTexture mTexture;
57 58
  private DistortedEffects mEffects;
58 59
  private MeshFlat mMesh;
59
  private DistortedFramebuffer mScreen, mOffscreen;
60
  private DistortedFramebuffer mOffscreen;
61
  private DistortedScreen mScreen;
60 62
  private Static1D s0;
61 63
  private Dynamic3D mScaleDyn;
62 64
  private Static3D mScaleFactor;
......
95 97
    mEffects.sink( diSink, pLeft , sinkRegion);
96 98
    mEffects.sink( diSink, pRight, sinkRegion);
97 99

  
98
    mScreen = new DistortedFramebuffer(0);
100
    mScreen = new DistortedScreen();
99 101
    }
100 102

  
101 103
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/sink/SinkRenderer.java
30 30
import org.distorted.library.Distorted;
31 31
import org.distorted.library.DistortedEffects;
32 32
import org.distorted.library.DistortedFramebuffer;
33
import org.distorted.library.DistortedScreen;
33 34
import org.distorted.library.MeshFlat;
34 35
import org.distorted.library.DistortedTexture;
35 36
import org.distorted.library.EffectTypes;
......
49 50
  private GLSurfaceView mView;
50 51
  private DistortedTexture mTexture;
51 52
  private DistortedEffects mEffects;
52
  private DistortedFramebuffer mScreen;
53
  private DistortedScreen mScreen;
53 54
  private MeshFlat mMesh;
54 55
  private int bmpHeight, bmpWidth;
55 56
    
......
66 67
    mEffects = new DistortedEffects();
67 68
    mEffects.sink( sink, new Static3D(297, 320, 0), null);
68 69

  
69
    mScreen = new DistortedFramebuffer(0);
70
    mScreen = new DistortedScreen();
70 71
    }
71 72

  
72 73
///////////////////////////////////////////////////////////////////////////////////////////////////
src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java
29 29
import org.distorted.examples.R;
30 30

  
31 31
import org.distorted.library.DistortedFramebuffer;
32
import org.distorted.library.DistortedScreen;
32 33
import org.distorted.library.MeshFlat;
33 34
import org.distorted.library.EffectNames;
34 35
import org.distorted.library.type.Dynamic1D;
......
107 108
  private DistortedEffects mScreenEffects, mGFFAEffects, mLogoEffects, mCrawlEffects, mCrawlBackgroundEffects;
108 109
  private DistortedEffects[] mStarEffects;
109 110
  private DistortedTree mRoot, mBackground;
110
  private DistortedFramebuffer mScreen;
111
  private DistortedScreen mScreen;
111 112
  private MeshFlat mQuad;
112 113

  
113 114
  private long gffaID, logoID, crawlID;
......
133 134

  
134 135
    for(int i=1; i<NUM_STARS; i++) mStarEffects[i] = new DistortedEffects(mStarEffects[0],Distorted.CLONE_VERTEX);
135 136

  
136
    mScreen = new DistortedFramebuffer(0);
137
    mScreen = new DistortedScreen();
137 138
    mScreen.setProjection(60.0f, 0.0f, 0.0f);
138 139
    }
139 140

  
src/main/java/org/distorted/examples/wind/WindRenderer.java
27 27
import org.distorted.examples.R;
28 28
import org.distorted.library.Distorted;
29 29
import org.distorted.library.DistortedFramebuffer;
30
import org.distorted.library.DistortedScreen;
30 31
import org.distorted.library.MeshCubes;
31 32
import org.distorted.library.DistortedEffects;
32 33
import org.distorted.library.DistortedTexture;
......
46 47
   private GLSurfaceView mView;
47 48
   private DistortedEffects mEffects;
48 49
   private DistortedTexture mTexture;
49
   private DistortedFramebuffer mScreen;
50
   private DistortedScreen mScreen;
50 51
   private MeshCubes mMesh;
51 52
   private WindEffectsManager mManager;
52 53
   private int mObjWidth, mObjHeight;
......
62 63
      mEffects = new DistortedEffects();
63 64
      mTexture = new DistortedTexture(50,30);
64 65
      mManager = new WindEffectsManager(mTexture);
65
      mScreen  = new DistortedFramebuffer(0);
66
      mScreen  = new DistortedScreen();
66 67

  
67 68
      mObjWidth = mTexture.getWidth();
68 69
      mObjHeight= mTexture.getHeight();

Also available in: Unified diff