| 1 |
08f92d82
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 2 |
|
|
// Copyright 2016 Leszek Koltunski //
|
| 3 |
|
|
// //
|
| 4 |
|
|
// This file is part of Distorted. //
|
| 5 |
|
|
// //
|
| 6 |
|
|
// Distorted is free software: you can redistribute it and/or modify //
|
| 7 |
|
|
// it under the terms of the GNU General Public License as published by //
|
| 8 |
|
|
// the Free Software Foundation, either version 2 of the License, or //
|
| 9 |
|
|
// (at your option) any later version. //
|
| 10 |
|
|
// //
|
| 11 |
|
|
// Distorted is distributed in the hope that it will be useful, //
|
| 12 |
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
| 13 |
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
| 14 |
|
|
// GNU General Public License for more details. //
|
| 15 |
|
|
// //
|
| 16 |
|
|
// You should have received a copy of the GNU General Public License //
|
| 17 |
|
|
// along with Distorted. If not, see <http://www.gnu.org/licenses/>. //
|
| 18 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 19 |
|
|
|
| 20 |
|
|
package org.distorted.examples.vertex3d;
|
| 21 |
|
|
|
| 22 |
|
|
import android.app.Activity;
|
| 23 |
|
|
import android.opengl.GLSurfaceView;
|
| 24 |
|
|
import android.os.Bundle;
|
| 25 |
d40cfeb2
|
Leszek Koltunski
|
import android.view.Gravity;
|
| 26 |
08f92d82
|
Leszek Koltunski
|
import android.view.View;
|
| 27 |
d40cfeb2
|
Leszek Koltunski
|
import android.widget.Button;
|
| 28 |
08f92d82
|
Leszek Koltunski
|
import android.widget.LinearLayout;
|
| 29 |
d40cfeb2
|
Leszek Koltunski
|
import android.widget.NumberPicker;
|
| 30 |
08f92d82
|
Leszek Koltunski
|
import android.widget.SeekBar;
|
| 31 |
|
|
import android.widget.SeekBar.OnSeekBarChangeListener;
|
| 32 |
d40cfeb2
|
Leszek Koltunski
|
import android.widget.TableRow;
|
| 33 |
08f92d82
|
Leszek Koltunski
|
import android.widget.TextView;
|
| 34 |
|
|
|
| 35 |
|
|
import org.distorted.examples.R;
|
| 36 |
|
|
import org.distorted.library.Distorted;
|
| 37 |
|
|
import org.distorted.library.EffectNames;
|
| 38 |
|
|
|
| 39 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 40 |
|
|
|
| 41 |
d40cfeb2
|
Leszek Koltunski
|
public class Vertex3DActivity extends Activity implements OnSeekBarChangeListener, View.OnClickListener
|
| 42 |
|
|
{
|
| 43 |
|
|
private boolean firstScreen;
|
| 44 |
|
|
|
| 45 |
|
|
// fields needed for the first 'pick-a-shape' screen
|
| 46 |
|
|
//
|
| 47 |
|
|
private static int mNumCols = 3;
|
| 48 |
|
|
private static int mNumRows = 3;
|
| 49 |
|
|
|
| 50 |
|
|
private static final int COLOR_OFF = 0xffffe81f;
|
| 51 |
|
|
private static final int COLOR_ON = 0xff0000ff;
|
| 52 |
|
|
|
| 53 |
|
|
private NumberPicker mColsPicker, mRowsPicker;
|
| 54 |
|
|
private LinearLayout mLay;
|
| 55 |
|
|
private static boolean[] mShape;
|
| 56 |
|
|
|
| 57 |
|
|
// fields needed for the second 'apply vertex effects' screen
|
| 58 |
|
|
//
|
| 59 |
|
|
private SeekBar bar;
|
| 60 |
794e6c4f
|
Leszek Koltunski
|
private TextView textDeform, textDistort, textSink, textSwirl, textCenter;
|
| 61 |
d40cfeb2
|
Leszek Koltunski
|
private int deformX, deformY, deformZ;
|
| 62 |
|
|
private int distortX, distortY, distortZ;
|
| 63 |
|
|
private int sinkA;
|
| 64 |
|
|
private int swirlA;
|
| 65 |
794e6c4f
|
Leszek Koltunski
|
private int centerX, centerY;
|
| 66 |
d40cfeb2
|
Leszek Koltunski
|
|
| 67 |
|
|
private float fdeformX, fdeformY, fdeformZ;
|
| 68 |
|
|
private float fdistortX, fdistortY, fdistortZ;
|
| 69 |
|
|
private float fsinkA;
|
| 70 |
|
|
private float fswirlA;
|
| 71 |
794e6c4f
|
Leszek Koltunski
|
private float fcenterX, fcenterY;
|
| 72 |
|
|
|
| 73 |
d40cfeb2
|
Leszek Koltunski
|
private EffectNames[] effects = new EffectNames[4];
|
| 74 |
08f92d82
|
Leszek Koltunski
|
|
| 75 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 76 |
|
|
|
| 77 |
d40cfeb2
|
Leszek Koltunski
|
@Override
|
| 78 |
|
|
protected void onCreate(Bundle savedState)
|
| 79 |
|
|
{
|
| 80 |
|
|
super.onCreate(savedState);
|
| 81 |
|
|
|
| 82 |
|
|
setContentView(R.layout.cubes1layout);
|
| 83 |
|
|
|
| 84 |
|
|
mLay = (LinearLayout)findViewById(R.id.buttongrid);
|
| 85 |
|
|
|
| 86 |
|
|
mColsPicker = (NumberPicker)findViewById(R.id.colsPicker);
|
| 87 |
|
|
mRowsPicker = (NumberPicker)findViewById(R.id.rowsPicker);
|
| 88 |
|
|
|
| 89 |
|
|
mColsPicker.setMaxValue(10);
|
| 90 |
|
|
mColsPicker.setMinValue( 0);
|
| 91 |
|
|
mRowsPicker.setMaxValue(10);
|
| 92 |
|
|
mRowsPicker.setMinValue( 0);
|
| 93 |
|
|
|
| 94 |
|
|
mColsPicker.setOnValueChangedListener(new NumberPicker.OnValueChangeListener()
|
| 95 |
08f92d82
|
Leszek Koltunski
|
{
|
| 96 |
d40cfeb2
|
Leszek Koltunski
|
@Override
|
| 97 |
|
|
public void onValueChange(NumberPicker picker, int oldVal, int newVal)
|
| 98 |
|
|
{
|
| 99 |
|
|
setGrid();
|
| 100 |
|
|
}
|
| 101 |
|
|
});
|
| 102 |
|
|
|
| 103 |
|
|
mRowsPicker.setOnValueChangedListener(new NumberPicker.OnValueChangeListener()
|
| 104 |
|
|
{
|
| 105 |
|
|
@Override
|
| 106 |
|
|
public void onValueChange(NumberPicker picker, int oldVal, int newVal)
|
| 107 |
|
|
{
|
| 108 |
|
|
setGrid();
|
| 109 |
|
|
}
|
| 110 |
|
|
});
|
| 111 |
|
|
|
| 112 |
|
|
firstScreen = true;
|
| 113 |
|
|
}
|
| 114 |
|
|
|
| 115 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 116 |
|
|
// 'first screen' methods
|
| 117 |
|
|
|
| 118 |
|
|
public static int getCols()
|
| 119 |
|
|
{
|
| 120 |
|
|
return mNumCols;
|
| 121 |
|
|
}
|
| 122 |
08f92d82
|
Leszek Koltunski
|
|
| 123 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 124 |
|
|
|
| 125 |
d40cfeb2
|
Leszek Koltunski
|
public static String getShape()
|
| 126 |
|
|
{
|
| 127 |
|
|
String str = "";
|
| 128 |
|
|
|
| 129 |
|
|
for(int i=0; i<mNumRows*mNumCols; i++)
|
| 130 |
|
|
str += mShape[i] ? "1" : "0";
|
| 131 |
|
|
|
| 132 |
|
|
//android.util.Log.d("CUBES", str);
|
| 133 |
|
|
|
| 134 |
|
|
return str;
|
| 135 |
|
|
}
|
| 136 |
|
|
|
| 137 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 138 |
|
|
|
| 139 |
|
|
public void setGrid()
|
| 140 |
|
|
{
|
| 141 |
|
|
mNumCols = mColsPicker.getValue();
|
| 142 |
|
|
mNumRows = mRowsPicker.getValue();
|
| 143 |
|
|
|
| 144 |
|
|
int width = mLay.getWidth();
|
| 145 |
|
|
int height= mLay.getHeight();
|
| 146 |
|
|
int w = mNumCols>0 ? (width / mNumCols) -10 : 0;
|
| 147 |
|
|
int h = mNumRows>0 ? (height/ mNumRows) -10 : 0;
|
| 148 |
|
|
int size= w<h ? w:h;
|
| 149 |
|
|
int pad = size/20;
|
| 150 |
|
|
|
| 151 |
|
|
mLay.removeAllViews();
|
| 152 |
|
|
|
| 153 |
|
|
mShape = new boolean[mNumRows*mNumCols];
|
| 154 |
|
|
|
| 155 |
|
|
TableRow.LayoutParams p = new android.widget.TableRow.LayoutParams();
|
| 156 |
|
|
|
| 157 |
|
|
p.rightMargin = pad;
|
| 158 |
|
|
p.leftMargin = pad;
|
| 159 |
|
|
p.topMargin = pad;
|
| 160 |
|
|
p.bottomMargin = pad;
|
| 161 |
|
|
p.height = size;
|
| 162 |
|
|
p.width = size;
|
| 163 |
|
|
|
| 164 |
|
|
for (int rows=0; rows<mNumRows; rows++)
|
| 165 |
08f92d82
|
Leszek Koltunski
|
{
|
| 166 |
d40cfeb2
|
Leszek Koltunski
|
TableRow tr = new TableRow(this);
|
| 167 |
|
|
tr.setGravity(Gravity.CENTER);
|
| 168 |
|
|
|
| 169 |
|
|
for(int cols=0; cols<mNumCols; cols++)
|
| 170 |
|
|
{
|
| 171 |
|
|
Button b = new Button(this);
|
| 172 |
|
|
b.setOnClickListener(this);
|
| 173 |
|
|
b.setId(rows*mNumCols+cols);
|
| 174 |
|
|
b.setLayoutParams(p);
|
| 175 |
|
|
b.setBackgroundColor(COLOR_OFF);
|
| 176 |
|
|
tr.addView(b, p);
|
| 177 |
|
|
mShape[rows*mNumCols+cols] = false;
|
| 178 |
|
|
}
|
| 179 |
|
|
|
| 180 |
|
|
mLay.addView(tr);
|
| 181 |
|
|
}
|
| 182 |
|
|
}
|
| 183 |
|
|
|
| 184 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 185 |
|
|
|
| 186 |
|
|
public void onClick(View view)
|
| 187 |
|
|
{
|
| 188 |
|
|
Button tmp = (Button)view;
|
| 189 |
|
|
int id = tmp.getId();
|
| 190 |
|
|
mShape[id] = !mShape[id];
|
| 191 |
|
|
tmp.setBackgroundColor(mShape[id] ? COLOR_ON:COLOR_OFF);
|
| 192 |
|
|
}
|
| 193 |
|
|
|
| 194 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 195 |
|
|
|
| 196 |
|
|
public void Continue(View v)
|
| 197 |
|
|
{
|
| 198 |
|
|
firstScreen = false;
|
| 199 |
|
|
setContentView(R.layout.vertex3dlayout);
|
| 200 |
|
|
Default(null);
|
| 201 |
|
|
}
|
| 202 |
|
|
|
| 203 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 204 |
|
|
// 'second screen' methods
|
| 205 |
|
|
|
| 206 |
|
|
public void Default(View view)
|
| 207 |
|
|
{
|
| 208 |
|
|
effects[0] = EffectNames.DEFORM;
|
| 209 |
|
|
effects[1] = EffectNames.DISTORT;
|
| 210 |
|
|
effects[2] = EffectNames.SINK;
|
| 211 |
|
|
effects[3] = EffectNames.SWIRL;
|
| 212 |
08f92d82
|
Leszek Koltunski
|
|
| 213 |
d40cfeb2
|
Leszek Koltunski
|
deformX = 50;
|
| 214 |
|
|
deformY = 50;
|
| 215 |
|
|
deformZ = 50;
|
| 216 |
e2d8ea1d
|
Leszek Koltunski
|
|
| 217 |
d40cfeb2
|
Leszek Koltunski
|
distortX = 50;
|
| 218 |
|
|
distortY = 50;
|
| 219 |
|
|
distortZ = 50;
|
| 220 |
e2d8ea1d
|
Leszek Koltunski
|
|
| 221 |
d40cfeb2
|
Leszek Koltunski
|
sinkA = 50;
|
| 222 |
|
|
swirlA = 50;
|
| 223 |
e2d8ea1d
|
Leszek Koltunski
|
|
| 224 |
794e6c4f
|
Leszek Koltunski
|
centerX = 25;
|
| 225 |
|
|
centerY = 25;
|
| 226 |
|
|
|
| 227 |
|
|
textCenter = (TextView)findViewById(R.id.vertex3dcenterText);
|
| 228 |
|
|
setCenterText();
|
| 229 |
|
|
|
| 230 |
|
|
setBar(R.id.vertex3dcenterX, centerX);
|
| 231 |
|
|
setBar(R.id.vertex3dcenterY, centerY);
|
| 232 |
|
|
|
| 233 |
d40cfeb2
|
Leszek Koltunski
|
addViews();
|
| 234 |
|
|
}
|
| 235 |
08f92d82
|
Leszek Koltunski
|
|
| 236 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 237 |
|
|
|
| 238 |
d40cfeb2
|
Leszek Koltunski
|
private void addViews()
|
| 239 |
|
|
{
|
| 240 |
|
|
LinearLayout layout = (LinearLayout)findViewById(R.id.vertex3dlayout);
|
| 241 |
08f92d82
|
Leszek Koltunski
|
|
| 242 |
d40cfeb2
|
Leszek Koltunski
|
layout.removeAllViews();
|
| 243 |
08f92d82
|
Leszek Koltunski
|
|
| 244 |
d40cfeb2
|
Leszek Koltunski
|
View deform = getLayoutInflater().inflate(R.layout.vertex3ddeform , null);
|
| 245 |
|
|
View distort= getLayoutInflater().inflate(R.layout.vertex3ddistort, null);
|
| 246 |
|
|
View sink = getLayoutInflater().inflate(R.layout.vertex3dsink , null);
|
| 247 |
|
|
View swirl = getLayoutInflater().inflate(R.layout.vertex3dswirl , null);
|
| 248 |
08f92d82
|
Leszek Koltunski
|
|
| 249 |
d40cfeb2
|
Leszek Koltunski
|
for( int i=effects.length-1 ; i>=0 ; i-- )
|
| 250 |
|
|
{
|
| 251 |
|
|
switch(effects[i])
|
| 252 |
08f92d82
|
Leszek Koltunski
|
{
|
| 253 |
d40cfeb2
|
Leszek Koltunski
|
case DEFORM : layout.addView(deform , 0); break;
|
| 254 |
|
|
case DISTORT: layout.addView(distort, 0); break;
|
| 255 |
|
|
case SINK : layout.addView(sink , 0); break;
|
| 256 |
|
|
case SWIRL : layout.addView(swirl , 0); break;
|
| 257 |
08f92d82
|
Leszek Koltunski
|
}
|
| 258 |
d40cfeb2
|
Leszek Koltunski
|
}
|
| 259 |
08f92d82
|
Leszek Koltunski
|
|
| 260 |
d40cfeb2
|
Leszek Koltunski
|
textDeform = (TextView)findViewById(R.id.vertex3ddeformText);
|
| 261 |
|
|
textDistort= (TextView)findViewById(R.id.vertex3ddistortText);
|
| 262 |
|
|
textSink = (TextView)findViewById(R.id.vertex3dsinkText);
|
| 263 |
|
|
textSwirl = (TextView)findViewById(R.id.vertex3dswirlText);
|
| 264 |
08f92d82
|
Leszek Koltunski
|
|
| 265 |
d40cfeb2
|
Leszek Koltunski
|
setDeformText();
|
| 266 |
|
|
setDistortText();
|
| 267 |
|
|
setSinkText();
|
| 268 |
|
|
setSwirlText();
|
| 269 |
08f92d82
|
Leszek Koltunski
|
|
| 270 |
d40cfeb2
|
Leszek Koltunski
|
setBar(R.id.vertex3ddeformBar1, deformX);
|
| 271 |
|
|
setBar(R.id.vertex3ddeformBar2, deformY);
|
| 272 |
|
|
setBar(R.id.vertex3ddeformBar3, deformZ);
|
| 273 |
08f92d82
|
Leszek Koltunski
|
|
| 274 |
d40cfeb2
|
Leszek Koltunski
|
setBar(R.id.vertex3ddistortBar1, distortX);
|
| 275 |
|
|
setBar(R.id.vertex3ddistortBar2, distortY);
|
| 276 |
|
|
setBar(R.id.vertex3ddistortBar3, distortZ);
|
| 277 |
08f92d82
|
Leszek Koltunski
|
|
| 278 |
d40cfeb2
|
Leszek Koltunski
|
setBar(R.id.vertex3dsinkBar1, sinkA);
|
| 279 |
e2d8ea1d
|
Leszek Koltunski
|
|
| 280 |
d40cfeb2
|
Leszek Koltunski
|
setBar(R.id.vertex3dswirlBar1, swirlA);
|
| 281 |
e2d8ea1d
|
Leszek Koltunski
|
|
| 282 |
d40cfeb2
|
Leszek Koltunski
|
Vertex3DRenderer.setOrder(effects);
|
| 283 |
|
|
}
|
| 284 |
08f92d82
|
Leszek Koltunski
|
|
| 285 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 286 |
|
|
|
| 287 |
d40cfeb2
|
Leszek Koltunski
|
private void moveUp(EffectNames name)
|
| 288 |
|
|
{
|
| 289 |
|
|
int len = effects.length-1;
|
| 290 |
|
|
int index = -1;
|
| 291 |
08f92d82
|
Leszek Koltunski
|
|
| 292 |
d40cfeb2
|
Leszek Koltunski
|
for(int i=0; i<=len; i++)
|
| 293 |
|
|
{
|
| 294 |
|
|
if( effects[i]==name )
|
| 295 |
08f92d82
|
Leszek Koltunski
|
{
|
| 296 |
d40cfeb2
|
Leszek Koltunski
|
index=i;
|
| 297 |
|
|
break;
|
| 298 |
08f92d82
|
Leszek Koltunski
|
}
|
| 299 |
d40cfeb2
|
Leszek Koltunski
|
}
|
| 300 |
08f92d82
|
Leszek Koltunski
|
|
| 301 |
d40cfeb2
|
Leszek Koltunski
|
if( index==0 )
|
| 302 |
|
|
{
|
| 303 |
|
|
for(int i=0; i<len; i++)
|
| 304 |
|
|
effects[i] = effects[i+1];
|
| 305 |
08f92d82
|
Leszek Koltunski
|
|
| 306 |
d40cfeb2
|
Leszek Koltunski
|
effects[len] = name;
|
| 307 |
08f92d82
|
Leszek Koltunski
|
}
|
| 308 |
d40cfeb2
|
Leszek Koltunski
|
else if( index>0 )
|
| 309 |
|
|
{
|
| 310 |
|
|
effects[index] = effects[index-1];
|
| 311 |
|
|
effects[index-1] = name;
|
| 312 |
|
|
}
|
| 313 |
|
|
|
| 314 |
|
|
addViews();
|
| 315 |
|
|
}
|
| 316 |
08f92d82
|
Leszek Koltunski
|
|
| 317 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 318 |
|
|
|
| 319 |
d40cfeb2
|
Leszek Koltunski
|
public void ButtonDeform(View v)
|
| 320 |
|
|
{
|
| 321 |
|
|
moveUp(EffectNames.DEFORM);
|
| 322 |
|
|
}
|
| 323 |
08f92d82
|
Leszek Koltunski
|
|
| 324 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 325 |
|
|
|
| 326 |
d40cfeb2
|
Leszek Koltunski
|
public void ButtonDistort(View v)
|
| 327 |
|
|
{
|
| 328 |
|
|
moveUp(EffectNames.DISTORT);
|
| 329 |
|
|
}
|
| 330 |
08f92d82
|
Leszek Koltunski
|
|
| 331 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 332 |
|
|
|
| 333 |
d40cfeb2
|
Leszek Koltunski
|
public void ButtonSink(View v)
|
| 334 |
|
|
{
|
| 335 |
|
|
moveUp(EffectNames.SINK);
|
| 336 |
|
|
}
|
| 337 |
08f92d82
|
Leszek Koltunski
|
|
| 338 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 339 |
|
|
|
| 340 |
d40cfeb2
|
Leszek Koltunski
|
public void ButtonSwirl(View v)
|
| 341 |
|
|
{
|
| 342 |
|
|
moveUp(EffectNames.SWIRL);
|
| 343 |
|
|
}
|
| 344 |
08f92d82
|
Leszek Koltunski
|
|
| 345 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 346 |
|
|
|
| 347 |
d40cfeb2
|
Leszek Koltunski
|
private void setBar(int id, int value)
|
| 348 |
|
|
{
|
| 349 |
|
|
bar = (SeekBar)findViewById(id);
|
| 350 |
|
|
bar.setOnSeekBarChangeListener(this);
|
| 351 |
|
|
bar.setProgress(value);
|
| 352 |
|
|
}
|
| 353 |
08f92d82
|
Leszek Koltunski
|
|
| 354 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 355 |
|
|
|
| 356 |
d40cfeb2
|
Leszek Koltunski
|
private void computeDeform()
|
| 357 |
|
|
{
|
| 358 |
26b28407
|
Leszek Koltunski
|
fdeformX = (deformX-50)*Vertex3DRenderer.mScreenMin/50.0f;
|
| 359 |
|
|
fdeformY = (deformY-50)*Vertex3DRenderer.mScreenMin/50.0f;
|
| 360 |
|
|
fdeformZ = (deformZ-50)*Vertex3DRenderer.mScreenMin/50.0f;
|
| 361 |
08f92d82
|
Leszek Koltunski
|
|
| 362 |
d40cfeb2
|
Leszek Koltunski
|
Vertex3DRenderer.setDeform( fdeformX, fdeformY, fdeformZ );
|
| 363 |
|
|
}
|
| 364 |
08f92d82
|
Leszek Koltunski
|
|
| 365 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 366 |
|
|
|
| 367 |
d40cfeb2
|
Leszek Koltunski
|
private void setDeformText()
|
| 368 |
|
|
{
|
| 369 |
|
|
fdeformX = ((int)(100*fdeformX))/100.0f;
|
| 370 |
|
|
fdeformY = ((int)(100*fdeformY))/100.0f;
|
| 371 |
|
|
fdeformZ = ((int)(100*fdeformZ))/100.0f;
|
| 372 |
08f92d82
|
Leszek Koltunski
|
|
| 373 |
d40cfeb2
|
Leszek Koltunski
|
textDeform.setText("deform("+fdeformX+" , "+fdeformY+" , "+fdeformZ+")");
|
| 374 |
|
|
}
|
| 375 |
08f92d82
|
Leszek Koltunski
|
|
| 376 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 377 |
|
|
|
| 378 |
d40cfeb2
|
Leszek Koltunski
|
private void computeDistort()
|
| 379 |
|
|
{
|
| 380 |
26b28407
|
Leszek Koltunski
|
fdistortX = (distortX-50)*Vertex3DRenderer.mScreenMin/50.0f;
|
| 381 |
|
|
fdistortY = (distortY-50)*Vertex3DRenderer.mScreenMin/50.0f;
|
| 382 |
|
|
fdistortZ = (distortZ-50)*Vertex3DRenderer.mScreenMin/50.0f;
|
| 383 |
08f92d82
|
Leszek Koltunski
|
|
| 384 |
d40cfeb2
|
Leszek Koltunski
|
Vertex3DRenderer.setDistort(fdistortX, fdistortY, fdistortZ);
|
| 385 |
|
|
}
|
| 386 |
08f92d82
|
Leszek Koltunski
|
|
| 387 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 388 |
|
|
|
| 389 |
d40cfeb2
|
Leszek Koltunski
|
private void setDistortText()
|
| 390 |
|
|
{
|
| 391 |
|
|
fdistortX = ((int)(100*fdistortX))/100.0f;
|
| 392 |
|
|
fdistortY = ((int)(100*fdistortY))/100.0f;
|
| 393 |
|
|
fdistortZ = ((int)(100*fdistortZ))/100.0f;
|
| 394 |
08f92d82
|
Leszek Koltunski
|
|
| 395 |
d40cfeb2
|
Leszek Koltunski
|
textDistort.setText("distort("+fdistortX+" , "+fdistortY+" , "+fdistortZ+")");
|
| 396 |
|
|
}
|
| 397 |
08f92d82
|
Leszek Koltunski
|
|
| 398 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 399 |
|
|
|
| 400 |
d40cfeb2
|
Leszek Koltunski
|
private void computeSink()
|
| 401 |
|
|
{
|
| 402 |
e642b4aa
|
Leszek Koltunski
|
fsinkA = (sinkA>= 50 ? 0.18f*sinkA-8.0f : 0.018f*sinkA + 0.1f);
|
| 403 |
08f92d82
|
Leszek Koltunski
|
|
| 404 |
d40cfeb2
|
Leszek Koltunski
|
Vertex3DRenderer.setSink( fsinkA );
|
| 405 |
|
|
}
|
| 406 |
08f92d82
|
Leszek Koltunski
|
|
| 407 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 408 |
|
|
|
| 409 |
d40cfeb2
|
Leszek Koltunski
|
private void setSinkText()
|
| 410 |
|
|
{
|
| 411 |
|
|
fsinkA = ((int)(100*fsinkA))/100.0f;
|
| 412 |
08f92d82
|
Leszek Koltunski
|
|
| 413 |
d40cfeb2
|
Leszek Koltunski
|
textSink.setText("sink("+fsinkA+")");
|
| 414 |
|
|
}
|
| 415 |
08f92d82
|
Leszek Koltunski
|
|
| 416 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 417 |
|
|
|
| 418 |
d40cfeb2
|
Leszek Koltunski
|
private void computeSwirl()
|
| 419 |
|
|
{
|
| 420 |
|
|
fswirlA = (swirlA-50)*3.6f;
|
| 421 |
08f92d82
|
Leszek Koltunski
|
|
| 422 |
d40cfeb2
|
Leszek Koltunski
|
Vertex3DRenderer.setSwirl( fswirlA );
|
| 423 |
|
|
}
|
| 424 |
08f92d82
|
Leszek Koltunski
|
|
| 425 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 426 |
|
|
|
| 427 |
d40cfeb2
|
Leszek Koltunski
|
private void setSwirlText()
|
| 428 |
|
|
{
|
| 429 |
|
|
fswirlA = ((int)(100*fswirlA))/100.0f;
|
| 430 |
e2d8ea1d
|
Leszek Koltunski
|
|
| 431 |
d40cfeb2
|
Leszek Koltunski
|
textSwirl.setText("swirl("+fswirlA+")");
|
| 432 |
|
|
}
|
| 433 |
794e6c4f
|
Leszek Koltunski
|
|
| 434 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 435 |
|
|
|
| 436 |
|
|
private void computeCenter()
|
| 437 |
|
|
{
|
| 438 |
|
|
fcenterX = (centerX*0.02f - 0.5f)*Vertex3DRenderer.SIZE;
|
| 439 |
|
|
fcenterY = (centerY*0.02f - 0.5f)*Vertex3DRenderer.SIZE;
|
| 440 |
|
|
|
| 441 |
|
|
Vertex3DRenderer.setCenter( fcenterX, fcenterY );
|
| 442 |
|
|
}
|
| 443 |
|
|
|
| 444 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 445 |
|
|
|
| 446 |
|
|
private void setCenterText()
|
| 447 |
|
|
{
|
| 448 |
|
|
fcenterX = ((int)(100*fcenterX))/100.0f;
|
| 449 |
|
|
fcenterY = ((int)(100*fcenterY))/100.0f;
|
| 450 |
|
|
|
| 451 |
|
|
textCenter.setText("center("+fcenterX+","+fcenterY+")");
|
| 452 |
|
|
}
|
| 453 |
|
|
|
| 454 |
08f92d82
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 455 |
d40cfeb2
|
Leszek Koltunski
|
// Overrides
|
| 456 |
|
|
|
| 457 |
|
|
@Override
|
| 458 |
|
|
protected void onPause()
|
| 459 |
|
|
{
|
| 460 |
|
|
GLSurfaceView mView = (GLSurfaceView)findViewById(R.id.vertex3dSurfaceView);
|
| 461 |
|
|
if( mView!=null ) mView.onPause();
|
| 462 |
|
|
super.onPause();
|
| 463 |
|
|
}
|
| 464 |
08f92d82
|
Leszek Koltunski
|
|
| 465 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 466 |
|
|
|
| 467 |
d40cfeb2
|
Leszek Koltunski
|
@Override
|
| 468 |
|
|
protected void onResume()
|
| 469 |
|
|
{
|
| 470 |
|
|
super.onResume();
|
| 471 |
|
|
GLSurfaceView mView = (GLSurfaceView)findViewById(R.id.vertex3dSurfaceView);
|
| 472 |
|
|
if( mView!=null ) mView.onResume();
|
| 473 |
|
|
}
|
| 474 |
08f92d82
|
Leszek Koltunski
|
|
| 475 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 476 |
|
|
|
| 477 |
d40cfeb2
|
Leszek Koltunski
|
@Override
|
| 478 |
|
|
public void onWindowFocusChanged(boolean hasFocus)
|
| 479 |
|
|
{
|
| 480 |
|
|
super.onWindowFocusChanged(hasFocus);
|
| 481 |
|
|
|
| 482 |
|
|
if( firstScreen )
|
| 483 |
|
|
{
|
| 484 |
|
|
mColsPicker.setValue(mNumCols);
|
| 485 |
|
|
mRowsPicker.setValue(mNumRows);
|
| 486 |
|
|
|
| 487 |
|
|
if( hasFocus ) setGrid();
|
| 488 |
|
|
}
|
| 489 |
|
|
}
|
| 490 |
08f92d82
|
Leszek Koltunski
|
|
| 491 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 492 |
|
|
|
| 493 |
d40cfeb2
|
Leszek Koltunski
|
@Override
|
| 494 |
|
|
protected void onDestroy()
|
| 495 |
|
|
{
|
| 496 |
|
|
Distorted.onDestroy();
|
| 497 |
|
|
super.onDestroy();
|
| 498 |
|
|
}
|
| 499 |
08f92d82
|
Leszek Koltunski
|
|
| 500 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 501 |
|
|
|
| 502 |
d40cfeb2
|
Leszek Koltunski
|
public void onProgressChanged(SeekBar bar, int progress, boolean fromUser)
|
| 503 |
|
|
{
|
| 504 |
|
|
switch (bar.getId())
|
| 505 |
08f92d82
|
Leszek Koltunski
|
{
|
| 506 |
794e6c4f
|
Leszek Koltunski
|
case R.id.vertex3dcenterX : centerX = progress; computeCenter() ; setCenterText() ; break;
|
| 507 |
|
|
case R.id.vertex3dcenterY : centerY = progress; computeCenter() ; setCenterText() ; break;
|
| 508 |
d40cfeb2
|
Leszek Koltunski
|
case R.id.vertex3ddeformBar1 : deformX = progress; computeDeform() ; setDeformText() ; break;
|
| 509 |
|
|
case R.id.vertex3ddeformBar2 : deformY = progress; computeDeform() ; setDeformText() ; break;
|
| 510 |
|
|
case R.id.vertex3ddeformBar3 : deformZ = progress; computeDeform() ; setDeformText() ; break;
|
| 511 |
|
|
case R.id.vertex3ddistortBar1 : distortX= progress; computeDistort(); setDistortText() ; break;
|
| 512 |
|
|
case R.id.vertex3ddistortBar2 : distortY= progress; computeDistort(); setDistortText() ; break;
|
| 513 |
|
|
case R.id.vertex3ddistortBar3 : distortZ= progress; computeDistort(); setDistortText() ; break;
|
| 514 |
|
|
case R.id.vertex3dsinkBar1 : sinkA = progress; computeSink() ; setSinkText() ; break;
|
| 515 |
|
|
case R.id.vertex3dswirlBar1 : swirlA = progress; computeSwirl() ; setSwirlText() ; break;
|
| 516 |
08f92d82
|
Leszek Koltunski
|
}
|
| 517 |
d40cfeb2
|
Leszek Koltunski
|
}
|
| 518 |
08f92d82
|
Leszek Koltunski
|
|
| 519 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 520 |
|
|
|
| 521 |
d40cfeb2
|
Leszek Koltunski
|
public void onStartTrackingTouch(SeekBar bar) { }
|
| 522 |
08f92d82
|
Leszek Koltunski
|
|
| 523 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 524 |
|
|
|
| 525 |
d40cfeb2
|
Leszek Koltunski
|
public void onStopTrackingTouch(SeekBar bar) { }
|
| 526 |
|
|
}
|