Project

General

Profile

« Previous | Next » 

Revision 57d7fdba

Added by Leszek Koltunski over 5 years ago

Rename MeshObject to MeshBase.

View differences:

src/main/java/org/distorted/examples/cubes/CubesActivity.java
22 22 
import org.distorted.library.main.Distorted;
23 23 
import org.distorted.examples.R;
24 24 
import org.distorted.library.main.DistortedTexture;
25 
import org.distorted.library.mesh.MeshObject;
25 
import org.distorted.library.mesh.MeshBase;
26 26 
import org.distorted.library.mesh.MeshCubes;
27 27 

  		




  28
  28
  
    
import android.app.Activity;


  		




  ......




  54
  54
  
    
    private LinearLayout mLay;


  		




  55
  55
  
    
    private boolean[] mShape;


  		




  56
  56
  
    
    private DistortedTexture mTexture;


  		




  57
  
  
    
    private MeshObject mMesh;


  		




  
  57
  
    
    private MeshBase mMesh;


  		




  58
  58
  
    

  		




  59
  59
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  60
  60
  
    
    


  		




  ......




  290
  290
  
    

  		




  291
  291
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  292
  292
  
    

  		




  293
  
  
    
    public MeshObject getMesh()


  		




  
  293
  
    
    public MeshBase getMesh()


  		




  294
  294
  
    
      {


  		




  295
  295
  
    
      return mMesh;


  		




  296
  296
  
    
      }


  		












  

    
      src/main/java/org/distorted/examples/cubes/CubesRenderer.java
    
  





  34
  34
  
    
import org.distorted.library.main.DistortedEffects;


  		




  35
  35
  
    
import org.distorted.library.main.DistortedScreen;


  		




  36
  36
  
    
import org.distorted.library.main.DistortedTexture;


  		




  37
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  
  37
  
    
import org.distorted.library.mesh.MeshBase;


  		




  38
  38
  
    
import org.distorted.library.type.DynamicQuat;


  		




  39
  39
  
    
import org.distorted.library.type.Static1D;


  		




  40
  40
  
    
import org.distorted.library.type.Static4D;


  		




  ......




  52
  52
  
    
    private GLSurfaceView mView;


  		




  53
  53
  
    
    private DistortedTexture mTexture;


  		




  54
  54
  
    
    private DistortedEffects mEffects;


  		




  55
  
  
    
    private MeshObject mMesh;


  		




  
  55
  
    
    private MeshBase mMesh;


  		




  56
  56
  
    
    private DistortedScreen mScreen;


  		




  57
  57
  
    
    private int mObjWidth, mObjHeight, mObjDepth;


  		




  58
  58
  
    
    private Static3D mMove, mScale, mCenter;


  		












  

    
      src/main/java/org/distorted/examples/deform/DeformRenderer.java
    
  





  31
  31
  
    
import org.distorted.library.main.DistortedEffects;


  		




  32
  32
  
    
import org.distorted.library.main.DistortedScreen;


  		




  33
  33
  
    
import org.distorted.library.main.DistortedTexture;


  		




  34
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  
  34
  
    
import org.distorted.library.mesh.MeshBase;


  		




  35
  35
  
    
import org.distorted.library.mesh.MeshFlat;


  		




  36
  36
  
    

  		




  37
  37
  
    
import org.distorted.library.type.Dynamic3D;


  		




  ......




  54
  54
  
    
   private GLSurfaceView mView;


  		




  55
  55
  
    
   private DistortedTexture stretchTexture;


  		




  56
  56
  
    
   private DistortedEffects stretchEffects;


  		




  57
  
  
    
   private MeshObject stretchMesh;


  		




  
  57
  
    
   private MeshBase stretchMesh;


  		




  58
  58
  
    
   private DistortedScreen mScreen;


  		




  59
  59
  
    
   private Static3D mTouchPoint;


  		




  60
  60
  
    

  		












  

    
      src/main/java/org/distorted/examples/effects3d/Effects3DActivity2.java
    
  





  38
  38
  
    
import org.distorted.library.main.DistortedTexture;


  		




  39
  39
  
    
import org.distorted.library.mesh.MeshCubes;


  		




  40
  40
  
    
import org.distorted.library.mesh.MeshFlat;


  		




  41
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  
  41
  
    
import org.distorted.library.mesh.MeshBase;


  		




  42
  42
  
    

  		




  43
  43
  
    
import java.io.IOException;


  		




  44
  44
  
    
import java.io.InputStream;


  		




  ......




  57
  57
  
    
  private String mString;


  		




  58
  58
  
    

  		




  59
  59
  
    
  private DistortedTexture mTexture;


  		




  60
  
  
    
  private MeshObject mMesh;


  		




  
  60
  
    
  private MeshBase mMesh;


  		




  61
  61
  
    
  private Bitmap mBitmap;


  		




  62
  62
  
    

  		




  63
  63
  
    
  private float mCenterX, mCenterY, mCenterZ;


  		




  ......




  131
  131
  
    

  		




  132
  132
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  133
  133
  
    

  		




  134
  
  
    
  public MeshObject getMesh()


  		




  
  134
  
    
  public MeshBase getMesh()


  		




  135
  135
  
    
    {


  		




  136
  136
  
    
    return mMesh;


  		




  137
  137
  
    
    }


  		












  

    
      src/main/java/org/distorted/examples/effects3d/Effects3DRenderer.java
    
  





  32
  32
  
    
import org.distorted.library.main.DistortedNode;


  		




  33
  33
  
    
import org.distorted.library.main.DistortedScreen;


  		




  34
  34
  
    
import org.distorted.library.main.DistortedTexture;


  		




  
  35
  
    
import org.distorted.library.mesh.MeshBase;


  		




  35
  36
  
    
import org.distorted.library.mesh.MeshFlat;


  		




  36
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  37
  37
  
    
import org.distorted.library.type.Static3D;


  		




  38
  38
  
    
import org.distorted.library.type.Static4D;


  		




  39
  39
  
    

  		




  ......




  92
  92
  
    
      DistortedEffects centerEffects     = new DistortedEffects();


  		




  93
  93
  
    
      DistortedEffects regionEffects     = new DistortedEffects();


  		




  94
  94
  
    

  		




  95
  
  
    
      MeshObject mesh    = act.getMesh();


  		




  
  95
  
    
      MeshBase mesh    = act.getMesh();


  		




  96
  96
  
    
      MeshFlat quad      = new MeshFlat(1,1);


  		




  97
  97
  
    

  		




  98
  98
  
    
      mObjWidth = mObjectTexture.getWidth();


  		




  ......




  148
  148
  
    
      Effects3DActivity2 act = (Effects3DActivity2)mView.getContext();


  		




  149
  149
  
    

  		




  150
  150
  
    
      DistortedEffects objectEffects= act.getEffects();


  		




  151
  
  
    
      MeshObject mesh  = act.getMesh();


  		




  
  151
  
    
      MeshBase mesh  = act.getMesh();


  		




  152
  152
  
    

  		




  153
  153
  
    
      int objDepth = mObjectTexture.getDepth(mesh);


  		




  154
  154
  
    

  		












  

    
      src/main/java/org/distorted/examples/movingglow/MovingGlowRenderer.java
    
  





  34
  34
  
    
import org.distorted.library.main.DistortedNode;


  		




  35
  35
  
    
import org.distorted.library.main.DistortedScreen;


  		




  36
  36
  
    
import org.distorted.library.main.DistortedTexture;


  		




  
  37
  
    
import org.distorted.library.mesh.MeshBase;


  		




  37
  38
  
    
import org.distorted.library.mesh.MeshFlat;


  		




  38
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  39
  39
  
    
import org.distorted.library.message.EffectListener;


  		




  40
  40
  
    
import org.distorted.library.message.EffectMessage;


  		




  41
  41
  
    
import org.distorted.library.type.Dynamic1D;


  		




  ......




  79
  79
  
    

  		




  80
  80
  
    
      mLeaf = new DistortedTexture(LEAF_SIZE,LEAF_SIZE);


  		




  81
  81
  
    
      DistortedTexture surface = new DistortedTexture(mRootW,mRootH);


  		




  82
  
  
    
      MeshObject mesh = new MeshFlat(1,1);


  		




  
  82
  
    
      MeshBase mesh = new MeshFlat(1,1);


  		




  83
  83
  
    

  		




  84
  84
  
    
      DistortedNode root = new DistortedNode(surface, new DistortedEffects(), mesh);


  		




  85
  85
  
    
     


  		












  

    
      src/main/java/org/distorted/examples/quaternion/QuaternionRenderer.java
    
  





  34
  34
  
    
import org.distorted.library.main.DistortedEffects;


  		




  35
  35
  
    
import org.distorted.library.main.DistortedScreen;


  		




  36
  36
  
    
import org.distorted.library.main.DistortedTexture;


  		




  37
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  
  37
  
    
import org.distorted.library.mesh.MeshBase;


  		




  38
  38
  
    
import org.distorted.library.mesh.MeshCubes;


  		




  39
  39
  
    
import org.distorted.library.type.Dynamic;


  		




  40
  40
  
    
import org.distorted.library.type.DynamicQuat;


  		




  ......




  54
  54
  
    

  		




  55
  55
  
    
  private GLSurfaceView mView;


  		




  56
  56
  
    
  private DistortedTexture mTexture;


  		




  57
  
  
    
  private MeshObject mMesh;


  		




  
  57
  
    
  private MeshBase mMesh;


  		




  58
  58
  
    
  private DistortedScreen mScreen;


  		




  59
  59
  
    
  private Static3D mMove, mScale, mCenter;


  		




  60
  60
  
    

  		












  

    
      src/main/java/org/distorted/examples/stencil/StencilRenderer.java
    
  





  37
  37
  
    
import org.distorted.library.main.DistortedTexture;


  		




  38
  38
  
    
import org.distorted.library.mesh.MeshCubes;


  		




  39
  39
  
    
import org.distorted.library.mesh.MeshFlat;


  		




  40
  
  
    
import org.distorted.library.mesh.MeshObject;


  		




  
  40
  
    
import org.distorted.library.mesh.MeshBase;


  		




  41
  41
  
    
import org.distorted.library.type.Dynamic1D;


  		




  42
  42
  
    
import org.distorted.library.type.Static1D;


  		




  43
  43
  
    
import org.distorted.library.type.Static3D;


  		




  ......




  56
  56
  
    
    private DistortedScreen mScreen;


  		




  57
  57
  
    
    private DistortedTexture mCubeTex, mFloorTex, mFBOTex;


  		




  58
  58
  
    
    private DistortedNode mCube1Node, mCube2Node, mFloorNode, mFBONode;


  		




  59
  
  
    
    private MeshObject mCubeMesh, mQuad;


  		




  
  59
  
    
    private MeshBase mCubeMesh, mQuad;


  		




  60
  60
  
    
    private Static3D mCubeMove, mCubeScale, mFloorScale, mFloorMove, mFBOScale;


  		




  61
  61
  
    

  		




  62
  62
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		












Also available in:  Unified diff