Project

General

Profile

« Previous | Next » 

Revision fcb09e1f

Added by Leszek Koltunski over 4 years ago

- fix Around the World (one effect failed to add)
- add DeferredJob icon

View differences:

src/main/java/org/distorted/examples/TableOfContents.java
122 122
    RUBIK             (R.drawable.icon_example_rubik           , R.string.example_rubik           , R.string.example_rubik_subtitle           ,            RubikActivity.class),
123 123
    MESHJOIN          (R.drawable.icon_example_meshjoin        , R.string.example_meshjoin           , R.string.example_meshjoin_subtitle           ,            MeshJoinActivity.class),
124 124
    PREDEFORM         (R.drawable.icon_example_predeform       , R.string.example_predeform           , R.string.example_predeform_subtitle           ,            PredeformActivity.class),
125
    DEFERREDJOB       (R.drawable.icon_example_wip             , R.string.example_deferredjob           , R.string.example_deferredjob_subtitle           ,            DeferredJobActivity.class),
125
    DEFERREDJOB       (R.drawable.icon_example_deferredjob     , R.string.example_deferredjob           , R.string.example_deferredjob_subtitle           ,            DeferredJobActivity.class),
126 126
    ;
127 127

  
128 128
    final int icon, title, subtitle;
src/main/java/org/distorted/examples/aroundtheworld/AroundTheWorldRenderer.java
135 135
      mScreen.detachAll();
136 136
      mScreen.attach(mTexture, mEffects, mMesh);
137 137

  
138
      DistortedLibrary.setMax(EffectType.VERTEX  ,12);
138
      DistortedLibrary.setMax(EffectType.VERTEX  ,13);
139 139
      DistortedLibrary.setMax(EffectType.FRAGMENT, 9);
140 140

  
141 141
      VertexEffectScale.enable();
src/main/java/org/distorted/examples/deferredjob/DeferredJobRenderer.java
219 219
      tmp[1] = tmp[0].copy(true);
220 220
      tmp[1].setTextureMap(rTextureMaps);
221 221

  
222
      tmp[0].mergeComponents();
223
      tmp[1].mergeComponents();
222
      tmp[0].mergeEffComponents();
223
      tmp[1].mergeEffComponents();
224 224

  
225 225
      tmp[0].setEffectAssociation(0,0,0); // set the equAssoc of the 0th (the only) component to 0
226 226
      tmp[1].setEffectAssociation(0,0,1); // set the equAssoc of the 0th (the only) component to 1

Also available in: Unified diff