Project

General

Profile

« Previous | Next » 

Revision c5a28eb8

Added by Leszek Koltunski almost 8 years ago

Cleanup, consistent variable names, minor details.

View differences:

src/main/java/org/distorted/examples/effects2d/Effects2DRenderer.java
31 31

  
32 32
import org.distorted.library.DistortedBitmap;
33 33
import org.distorted.library.Distorted;
34
import org.distorted.library.EffectNames;
34 35
import org.distorted.library.EffectTypes;
35 36
import org.distorted.library.message.EffectListener;
36 37
import org.distorted.library.message.EffectMessage;
......
114 115
    }
115 116

  
116 117
///////////////////////////////////////////////////////////////////////////////////////////////////
117
// the library sending messages to us
118
// the library sending messages to us. This is running on a library 'MessageSender' thread.
118 119

  
119
  public void effectMessage(final EffectMessage em, final long effectID, final int effectName, final long bitmapID, final String message)
120
  public void effectMessage(final EffectMessage em, final long effectID, final EffectNames effectName, final long objectID, final String message)
120 121
    {
121 122
    Effects2DActivity act = (Effects2DActivity)mView.getContext();
122 123

  
src/main/java/org/distorted/examples/listener/ListenerRenderer.java
30 30

  
31 31
import org.distorted.library.Distorted;
32 32
import org.distorted.library.DistortedBitmap;
33
import org.distorted.library.EffectNames;
33 34
import org.distorted.library.EffectTypes;
34 35
import org.distorted.library.type.Dynamic3D;
35 36
import org.distorted.library.type.Static2D;
......
80 81
      }
81 82
   
82 83
///////////////////////////////////////////////////////////////////////////////////////////////////
83
// the library sending messages to us
84
// the library sending messages to us. This is running on a library 'MessageSender' thread.
84 85

  
85
   public void effectMessage(final EffectMessage em, final long effectID, final int effectName, final long bitmapID, final String message)
86
   public void effectMessage(final EffectMessage em, final long effectID, final EffectNames effectName, final long objectID, final String message)
86 87
     {
87 88
     switch(em)
88 89
        {
src/main/java/org/distorted/examples/starwars/StarWarsRenderer.java
28 28

  
29 29
import org.distorted.examples.R;
30 30

  
31
import org.distorted.library.EffectNames;
31 32
import org.distorted.library.type.Dynamic1D;
32 33
import org.distorted.library.type.Dynamic3D;
33 34
import org.distorted.library.DistortedNode;
......
325 326
    }
326 327
    
327 328
///////////////////////////////////////////////////////////////////////////////////////////////////
329
// the library sending messages to us. This is running on a library 'MessageSender' thread.
328 330

  
329
  public void effectMessage(final EffectMessage em, final long effectID, final int effectName, final long bitmapID, final String message)
331
  public void effectMessage(final EffectMessage em, final long effectID, final EffectNames effectName, final long objectID, final String message)
330 332
    {
331 333
    if( em==EffectMessage.EFFECT_FINISHED )
332 334
      {
333
      if( bitmapID == gffaID )
335
      if( objectID == gffaID )
334 336
        {
335 337
        mRoot.detach(mGFFA);   
336 338
        mGFFA.removeEventListener(this);
......
355 357
        mRoot.attach(mLogo);
356 358
        mLogo.addEventListener(this);
357 359
        }
358
      else if( bitmapID==logoID )
360
      else if( objectID==logoID )
359 361
        {
360 362
        mRoot.detach(mLogo);   
361 363
        mLogo.removeEventListener(this);
......
386 388
        mBackground.attach(mCrawl);
387 389
        mCrawl.addEventListener(this);
388 390
        }
389
      else if( bitmapID==crawlID )
391
      else if( objectID==crawlID )
390 392
        {
391 393
        mRoot.detach(mBackground);
392 394
        mBackground.detach(mCrawl);

Also available in: Unified diff