Revision 65f622c1
Added by Leszek Koltunski over 5 years ago
src/main/java/org/distorted/examples/effects3d/Effects3DTab.java | ||
---|---|---|
69 | 69 |
|
70 | 70 |
switch(position) |
71 | 71 |
{ |
72 |
case 0: mTab = R.layout.effects3dtab1; |
|
72 |
case 0: mTab = R.layout.effects3dtab0; |
|
73 |
mLayout = R.id.effects3dlayout0; |
|
74 |
mSpinner = R.id.effects3dspinner0; |
|
75 |
mType = EffectType.MATRIX; |
|
76 |
break; |
|
77 |
case 1: mTab = R.layout.effects3dtab1; |
|
73 | 78 |
mLayout = R.id.effects3dlayout1; |
74 | 79 |
mSpinner = R.id.effects3dspinner1; |
75 | 80 |
mType = EffectType.VERTEX; |
76 | 81 |
break; |
77 |
case 1: mTab = R.layout.effects3dtab2;
|
|
82 |
case 2: mTab = R.layout.effects3dtab2;
|
|
78 | 83 |
mLayout = R.id.effects3dlayout2; |
79 | 84 |
mSpinner = R.id.effects3dspinner2; |
80 | 85 |
mType = EffectType.FRAGMENT; |
81 | 86 |
break; |
82 |
case 2: mTab = R.layout.effects3dtab3;
|
|
87 |
case 3: mTab = R.layout.effects3dtab3;
|
|
83 | 88 |
mLayout = R.id.effects3dlayout3; |
84 | 89 |
mSpinner = R.id.effects3dspinner3; |
85 | 90 |
mType = EffectType.POSTPROCESS; |
... | ... | |
87 | 92 |
} |
88 | 93 |
|
89 | 94 |
Effects3DActivity2 act = (Effects3DActivity2)getActivity(); |
90 |
act.setTab(position, this); |
|
91 | 95 |
|
92 |
mEffects = act.getEffects(); |
|
96 |
if( act!=null ) |
|
97 |
{ |
|
98 |
act.setTab(position, this); |
|
99 |
mEffects = act.getEffects(); |
|
100 |
} |
|
93 | 101 |
|
94 | 102 |
createEffectNames(mType); |
95 | 103 |
mEffectStrings = new String[mEffectNames.length]; |
... | ... | |
99 | 107 |
mEffectStrings[i] = mEffectNames[i].name(); |
100 | 108 |
} |
101 | 109 |
|
102 |
View rootView = inflater.inflate( mTab, container, false); |
|
103 |
return rootView; |
|
110 |
return inflater.inflate( mTab, container, false); |
|
104 | 111 |
} |
105 | 112 |
|
106 | 113 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
... | ... | |
221 | 228 |
|
222 | 229 |
resetData(); |
223 | 230 |
act.resetData(); |
231 |
|
|
232 |
if( mType==EffectType.MATRIX ) |
|
233 |
{ |
|
234 |
act.resetMatrixEffects(); |
|
235 |
} |
|
224 | 236 |
} |
225 | 237 |
|
226 | 238 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Progress with Effects3D app - merge Matrix effects