commit e8e549722104306db9557fbfcb3eec57699a5af2 Author: Leszek Koltunski Date: Sat Feb 29 14:00:24 2020 +0000 Fixes for the merge. diff --git a/src/main/java/org/distorted/examples/deform/DeformRenderer.java b/src/main/java/org/distorted/examples/deform/DeformRenderer.java index 4e0bfb3..dfbec3c 100644 --- a/src/main/java/org/distorted/examples/deform/DeformRenderer.java +++ b/src/main/java/org/distorted/examples/deform/DeformRenderer.java @@ -246,14 +246,17 @@ class DeformRenderer implements GLSurfaceView.Renderer, EffectListener case DISTORT: vDistort[0].set(0,0,0); mEffects.apply(mMovingDistort); mLastEffect = mMovingDistort.getID(); + mTouchPoint.set(xt,yt,0); break; case DEFORM : vDeform[0].set(0,0,0); mEffects.apply(mMovingDeform); mLastEffect = mMovingDeform.getID(); + mTouchPoint.set(xt,yt,0); break; case SHEAR : vShear[0].set(0,0,0); mEffects.apply(mMovingShear); mLastEffect = mMovingShear.getID(); + mTouchPoint.set(xt-textureWidth/2,yt-textureHeight/2,0); break; } } diff --git a/src/main/java/org/distorted/examples/generic/Effects3DActivity.java b/src/main/java/org/distorted/examples/generic/Effects3DActivity.java deleted file mode 100644 index 22fa4db..0000000 --- a/src/main/java/org/distorted/examples/generic/Effects3DActivity.java +++ /dev/null @@ -1,328 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2016 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.examples.generic; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.Gravity; -import android.view.View; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.NumberPicker; -import android.widget.Spinner; -import android.widget.TableRow; - -import org.distorted.examples.R; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class Effects3DActivity extends Activity - implements View.OnClickListener, AdapterView.OnItemSelectedListener - { - private static final int COLOR_OFF = 0xffffe81f; - private static final int COLOR_ON = 0xff0000ff; - private static final int COLOR_INAC= 0xff999999; - - private int mNumCols = 1; - private int mNumRows = 1; - private int mNumSlic = 1; - private boolean mGridInitialized; - private NumberPicker mColsPicker, mRowsPicker, mSlicPicker; - private boolean[] mShape; - private int mObjectType; - private int mBitmapID; - private LinearLayout mLay; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - protected void onCreate(Bundle savedState) - { - super.onCreate(savedState); - - setContentView(R.layout.objectpickerlayout); - - mLay = findViewById(R.id.objectpicker_buttongrid); - - mColsPicker = findViewById(R.id.objectpicker_cols); - mRowsPicker = findViewById(R.id.objectpicker_rows); - mSlicPicker = findViewById(R.id.objectpicker_slices); - - mColsPicker.setMaxValue(40); - mColsPicker.setMinValue( 1); - mRowsPicker.setMaxValue(40); - mRowsPicker.setMinValue( 1); - mSlicPicker.setMaxValue(40); - mSlicPicker.setMinValue( 0); - - mColsPicker.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - setGrid(); - } - }); - - mRowsPicker.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - setGrid(); - } - }); - - mSlicPicker.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() - { - @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) - { - mNumSlic = mSlicPicker.getValue(); - } - }); - - mObjectType = 0; - mGridInitialized = false; - - Spinner typeSpinner = findViewById(R.id.objectpicker_spinnerType); - typeSpinner.setOnItemSelectedListener(this); - - String[] objectType = new String[] {"Mesh: Cubes", "Mesh: Flat", "Mesh: Sphere", "Mesh: Quad"}; - - ArrayAdapter adapterType = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectType); - adapterType.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - typeSpinner.setAdapter(adapterType); - - Spinner bitmapSpinner = findViewById(R.id.objectpicker_spinnerBitmap); - bitmapSpinner.setOnItemSelectedListener(this); - - String[] objectBitmap = new String[] { "Texture: Grid", "Texture: Girl", "Texture: Dog", "Texture: Cat", - "Texture: Squares", "Texture: Bean", "Texture: Lisa", "Texture: World" }; - - ArrayAdapter adapterBitmap = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, objectBitmap); - adapterBitmap.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - bitmapSpinner.setAdapter(adapterBitmap); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - private void setGrid() - { - mGridInitialized = true; - - mNumCols = mColsPicker.getValue(); - mNumRows = mRowsPicker.getValue(); - - int width = mLay.getWidth(); - int height= mLay.getHeight(); - int w = mNumCols>0 ? (int)( 0.9f*width / mNumCols) : 0; - int h = mNumRows>0 ? (int)( 0.9f*height/ mNumRows) : 0; - int size= w parent, View view, int pos, long id) - { - switch(parent.getId()) - { - case R.id.objectpicker_spinnerType : if( mObjectType!=pos ) - { - mObjectType = pos; - uncheckAll(); - - switch(mObjectType) - { - case 0: mColsPicker.setEnabled(true); - mRowsPicker.setEnabled(true); - mSlicPicker.setEnabled(true); - break; - case 1: mColsPicker.setEnabled(true); - mRowsPicker.setEnabled(true); - mSlicPicker.setEnabled(false); - break; - case 2: mColsPicker.setEnabled(false); - mRowsPicker.setEnabled(true); - mSlicPicker.setEnabled(false); - break; - case 3: mColsPicker.setEnabled(false); - mRowsPicker.setEnabled(false); - mSlicPicker.setEnabled(false); - break; - } - } - break; - case R.id.objectpicker_spinnerBitmap: switch(pos) - { - case 0: mBitmapID = -1 ; break; - case 1: mBitmapID = R.raw.face ; break; - case 2: mBitmapID = R.raw.dog ; break; - case 3: mBitmapID = R.raw.cat ; break; - case 4: mBitmapID = R.raw.grid ; break; - case 5: mBitmapID = R.raw.bean ; break; - case 6: mBitmapID = R.raw.monalisa; break; - case 7: mBitmapID = R.raw.world ; break; - } - break; - } - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - public void onNothingSelected(AdapterView parent) - { - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Overrides -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public void onWindowFocusChanged(boolean hasFocus) - { - super.onWindowFocusChanged(hasFocus); - - mColsPicker.setValue(mNumCols); - mRowsPicker.setValue(mNumRows); - mSlicPicker.setValue(mNumSlic); - - if( !mGridInitialized ) setGrid(); - } - } diff --git a/src/main/java/org/distorted/examples/generic/Effects3DTabViewPager.java b/src/main/java/org/distorted/examples/generic/Effects3DTabViewPager.java deleted file mode 100644 index ce4579f..0000000 --- a/src/main/java/org/distorted/examples/generic/Effects3DTabViewPager.java +++ /dev/null @@ -1,86 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright 2018 Leszek Koltunski // -// // -// This file is part of Distorted. // -// // -// Distorted is free software: you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation, either version 2 of the License, or // -// (at your option) any later version. // -// // -// Distorted is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with Distorted. If not, see . // -/////////////////////////////////////////////////////////////////////////////////////////////////// - -package org.distorted.examples.generic; - -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.os.Bundle; - -import org.distorted.examples.R; - -import java.lang.ref.WeakReference; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - -public class Effects3DTabViewPager extends FragmentPagerAdapter - { - private WeakReference mAct; - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - Effects3DTabViewPager(Effects3DActivity2 act, FragmentManager fm) - { - super(fm); - mAct = new WeakReference<>(act); - } - -/////////////////////////////////////////////////////////////////////////////////////////////////// - - @Override - public Fragment getItem(int position) - { - if( position>=0 && positionheight ? height/h:width/w); + float factor = 0.5f*(width>height ? height:width); mScale.set(factor,factor,factor); mScreen.resize(width, height); diff --git a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java index bfba10c..e502a12 100644 --- a/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java +++ b/src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java @@ -214,6 +214,8 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener if( mCrawlBackgroundTexture!=null ) mCrawlBackgroundTexture.markForDeletion(); mCrawlBackgroundTexture = new DistortedTexture(); + mCrawlBackgroundQuad.setStretch(scrW,(int)(scrH*Math.sin(angleA)/Math.sin(angleB)),0); + int randomA, randomX, randomY, randomTime; float randomS, randomAlpha1, randomAlpha2; @@ -230,11 +232,11 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener randomAlpha1 = 0.2f + 0.8f*mRnd.nextFloat(); randomAlpha2 = 0.8f + 0.2f*mRnd.nextFloat(); randomTime = 500+mRnd.nextInt(2000); - - mStarEffects[i].apply( new MatrixEffectMove(new Static3D(randomX,randomY,0)) ); - mStarEffects[i].apply( new MatrixEffectScale(randomS) ); + mStarEffects[i].apply( new MatrixEffectRotate(new Static1D(randomA), axis, center) ); - + mStarEffects[i].apply( new MatrixEffectScale(randomS) ); + mStarEffects[i].apply( new MatrixEffectMove(new Static3D(randomX,randomY,0)) ); + Dynamic1D di = new Dynamic1D(randomTime,0.0f); di.setNoise(alphaNoise); di.add(new Static1D(randomAlpha1)); @@ -245,16 +247,20 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mScreen.attach(mStarTexture, mStarEffects[i], mStarQuad); } - float scale = (0.5f*scrW/mGFFATexture.getWidth()); + float scale = (0.5f*scrW/mGFFAQuad.getStretchX()); Dynamic1D di = new Dynamic1D(6000,0.5f); di.add(new Static1D(1.0f)); di.add(new Static1D(1.0f)); di.add(new Static1D(0.0f)); - - mGFFAEffects.apply( new MatrixEffectMove(new Static3D(-scrW/3 + mGFFATexture.getWidth()/2 ,scrH/6,0)) ); + + FragmentEffectAlpha alpha = new FragmentEffectAlpha(di); + alpha.notifyWhenFinished(this); + alphaEffectID = alpha.getID(); + mGFFAEffects.apply( new MatrixEffectScale(scale) ); - mGFFAEffects.apply( new FragmentEffectAlpha(di) ); + mGFFAEffects.apply( new MatrixEffectMove(new Static3D(-scrW/3 + mGFFAQuad.getStretchX()/2 ,scrH/6,0)) ); + mGFFAEffects.apply( alpha ); mScreen.attach(mGFFATexture, mGFFAEffects, mGFFAQuad); } @@ -381,7 +387,7 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mScreen.detach(mGFFAEffects); mGFFATexture.markForDeletion(); - int screenW=mScreen.getWidth(); + int screenW = mScreen.getWidth(); float logoW = mLogoQuad.getStretchX(); int initSize= (int)(3.0f*screenW/logoW); int finaSize= (int)(0.1f*screenW/logoW); @@ -389,7 +395,6 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener Dynamic3D di = new Dynamic3D(10000,0.5f); di.add(new Static3D(initSize,initSize,1)); di.add(new Static3D(finaSize,finaSize,1)); - MatrixEffectScale scale = new MatrixEffectScale(di); scale.notifyWhenFinished(this); scaleEffectID = scale.getID(); @@ -401,16 +406,16 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mScreen.detach(mLogoEffects); mLogoTexture.markForDeletion(); - int crawlW = mCrawlTexture.getWidth(); - int crawlH = mCrawlTexture.getHeight(); - int screenW= mScreen.getWidth(); - int screenH= mScreen.getHeight(); - int backW = mCrawlBackgroundTexture.getWidth(); - int backH = mCrawlBackgroundTexture.getHeight(); - float scale= (float)backW/crawlW; + float crawlW = mCrawlQuad.getStretchX(); + float crawlH = mCrawlQuad.getStretchY(); + float screenW= mScreen.getWidth(); + float screenH= mScreen.getHeight(); + float backW = mCrawlBackgroundQuad.getStretchX(); + float backH = mCrawlBackgroundQuad.getStretchY(); + float scale = backW/crawlW; - mCrawlBackgroundEffects.apply( new MatrixEffectMove(new Static3D( 0, (backH-screenH)/2, 0)) ); mCrawlBackgroundEffects.apply( new MatrixEffectRotate(new Static1D(CRAWL_ANGLE), new Static3D(1,0,0), new Static3D(0,-backH/2,0)) ); + mCrawlBackgroundEffects.apply( new MatrixEffectMove(new Static3D( 0, (backH-screenH)/2, 0)) ); final int transpDist = 5; Static3D center = new Static3D( screenW/2 , transpDist*backH , 0 ); @@ -427,12 +432,12 @@ class StarWarsRenderer implements GLSurfaceView.Renderer, EffectListener mCrawlEffects.apply( new MatrixEffectScale(new Static3D(scale,scale,scale)) ); mCrawlEffects.apply( move ); - mBackground = mScreen.attach(mCrawlBackgroundTexture, mCrawlBackgroundEffects,mCrawlBackgroundQuad); - mBackground.attach(mCrawlTexture, mCrawlEffects,mCrawlQuad); + mBackground = mScreen.attach(mCrawlBackgroundTexture, mCrawlBackgroundEffects, mCrawlBackgroundQuad); + mBackground.attach(mCrawlTexture, mCrawlEffects, mCrawlQuad); mBackground.glDisable(GLES31.GL_DEPTH_TEST); mBackground.glDepthMask(false); } - else if( effectID==moveEffectID ) + else if( effectID == moveEffectID ) { mScreen.detach(mBackground); mBackground.detach(mCrawlEffects);