Project

General

Profile

« Previous | Next » 

Revision b4a73ea5

Added by Leszek Koltunski almost 8 years ago

Essentially revert the last commit :)

View differences:

src/main/java/org/distorted/examples/fragment3d/Fragment3DRenderer.java
61 61

  
62 62
    private DynamicQuat mQuatInt1, mQuatInt2;
63 63

  
64
    private EffectNames[] order;
65

  
66
    private Dynamic2D mCenterInter;
67
    private Dynamic3D mChromaInter, mMoveInter;
68
    private Dynamic1D mChromaLevelInter, mAlphaInter, mBrightnessInter, mSaturationInter;
69

  
70
    private Static2D mCenterPoint;
71
    private Static3D mChromaPoint, mMovePoint;
72
    private Static1D mChromaLevel, mAlphaPoint, mBrightnessPoint, mSaturationPoint;
73

  
64 74
    Static4D mQuat1, mQuat2;
65 75
    int mScreenMin;
66 76

  
77
///////////////////////////////////////////////////////////////////////////////////////////////////
78

  
79
    public void setChroma(float level, float r, float g, float b)
80
      {
81
      mChromaLevel.set(level);
82
      mChromaPoint.set(r, g, b);
83
      }
84
    
85
///////////////////////////////////////////////////////////////////////////////////////////////////
86

  
87
    public void setAlpha(float level)
88
      {
89
      mAlphaPoint.set(level);
90
      }
91
     
92
///////////////////////////////////////////////////////////////////////////////////////////////////
93

  
94
    public void setBrightness(float level)
95
      {
96
      mBrightnessPoint.set(level);
97
      }
98
    
99
///////////////////////////////////////////////////////////////////////////////////////////////////
100

  
101
    public void setSaturation(float level)
102
      {
103
      mSaturationPoint.set(level);
104
      }
105

  
106
///////////////////////////////////////////////////////////////////////////////////////////////////
107

  
108
    public void setCenter(float x, float y)
109
      {
110
      x = (0.012f*x-0.1f)*mObjWidth;
111
      y = (0.012f*y-0.1f)*mObjHeight;
112

  
113
      mCenterPoint.set(x,y);
114
      mMovePoint.set(mFactorObj*x,mFactorObj*y,0);
115
      }
116

  
117
///////////////////////////////////////////////////////////////////////////////////////////////////
118

  
119
    public void setOrder(EffectNames[] effects)
120
      {
121
      order = effects;
122
      setFragmentEffects();
123
      }
124
      
125
///////////////////////////////////////////////////////////////////////////////////////////////////
126

  
127
    private void setFragmentEffects()
128
      {
129
      mObject.abortEffects(EffectTypes.FRAGMENT);
130

  
131
      for( int i=0; i<=order.length-1 ; i++ )
132
        {
133
        switch(order[i])
134
          {
135
          case CHROMA    : mObject.chroma    ( mChromaLevelInter , mChromaInter) ; break;
136
          case ALPHA     : mObject.alpha     ( mAlphaInter                     ) ; break;
137
          case BRIGHTNESS: mObject.brightness( mBrightnessInter                ) ; break;
138
          case SATURATION: mObject.saturation( mSaturationInter                ) ; break;
139
          }
140
        }
141
      }
142
    
67 143
///////////////////////////////////////////////////////////////////////////////////////////////////
68 144

  
69 145
    public Fragment3DRenderer(GLSurfaceView v)
......
71 147
      mView = v;
72 148

  
73 149
      mObject = ((Fragment3DActivity)v.getContext()).getObject();
150
      mCenter = new DistortedBitmap(SIZE, SIZE, 1);
74 151

  
75 152
      mObjWidth = mObject.getWidth();
76 153
      mObjHeight= mObject.getHeight();
77 154

  
155
      mCenterPoint    = new Static2D(0,0);
156
      mMovePoint      = new Static3D(0,0,0);
157
      mChromaPoint    = new Static3D(0,0,0);
158
      mChromaLevel    = new Static1D(0);
159
      mAlphaPoint     = new Static1D(1);
160
      mBrightnessPoint= new Static1D(1);
161
      mSaturationPoint= new Static1D(0.5f);
162

  
163
      mCenterInter     = new Dynamic2D();
164
      mMoveInter       = new Dynamic3D();
165
      mChromaInter     = new Dynamic3D();
166
      mChromaLevelInter= new Dynamic1D();
167
      mAlphaInter      = new Dynamic1D();
168
      mBrightnessInter = new Dynamic1D();
169
      mSaturationInter = new Dynamic1D();
170

  
171
      mCenterInter.add(mCenterPoint);
172
      mMoveInter.add(mMovePoint);
173
      mChromaInter.add(mChromaPoint);
174
      mChromaLevelInter.add(mChromaLevel);
175
      mAlphaInter.add(mAlphaPoint);
176
      mBrightnessInter.add(mBrightnessPoint);
177
      mSaturationInter.add(mSaturationPoint);
178

  
78 179
      mQuat1 = new Static4D(0,0,0,1);  // unity
79 180
      mQuat2 = new Static4D(0,0,0,1);  // quaternions
80 181

  
......
95 196
      long time = System.currentTimeMillis();
96 197

  
97 198
      mObject.draw(time);
98

  
99
      mCenter = mView.
100

  
101 199
      mCenter.draw(time);
102 200
      }
103 201

  
......
123 221
        mFactorCen = (0.15f*width)/centerSize;
124 222
        }
125 223

  
126

  
127
      Static3D rotateObj = new Static3D(mObjWidth/2,mObjHeight/2, 0);
128

  
129
      mObject.move( new Static3D( (width-mFactorObj*mObjWidth)/2 , (height-mFactorObj*mObjHeight)/2 , 0) );
130
      mObject.scale(mFactorObj);
131
      mObject.quaternion(mQuatInt1, rotateObj);
132
      mObject.quaternion(mQuatInt2, rotateObj);
133

  
134 224
      Fragment3DActivity act = (Fragment3DActivity)mView.getContext();
135 225
      float cX = act.getCenterX();
136 226
      float cY = act.getCenterY();
......
140 230

  
141 231
      mMovePoint.set(cX*mFactorObj,cY*mFactorObj,0);
142 232

  
233
      Static3D rotateObj = new Static3D(mObjWidth/2,mObjHeight/2, 0);
234

  
235
      mObject.move( new Static3D( (width-mFactorObj*mObjWidth)/2 , (height-mFactorObj*mObjHeight)/2 , 0) );
236
      mObject.scale(mFactorObj);
237
      mObject.quaternion(mQuatInt1, rotateObj);
238
      mObject.quaternion(mQuatInt2, rotateObj);
239

  
143 240
      Static3D rotateCen = new Static3D(width/2,height/2, 0);
144 241

  
145 242
      mCenter.quaternion(mQuatInt1, rotateCen);

Also available in: Unified diff