Project

General

Profile

« Previous | Next » 

Revision f410c595

Added by Leszek Koltunski over 1 year ago

minor

View differences:

src/main/java/org/distorted/bandaged/BandagedPlayRenderer.java
9 9

  
10 10
package org.distorted.bandaged;
11 11

  
12
import android.app.ActivityManager;
13
import android.content.Context;
14
import android.content.pm.ConfigurationInfo;
15 12
import android.content.res.Resources;
16 13
import android.opengl.GLSurfaceView;
17 14

  
......
22 19
import org.distorted.library.main.DistortedScreen;
23 20
import org.distorted.library.mesh.MeshBase;
24 21
import org.distorted.objectlib.effects.BaseEffect;
25
import org.distorted.objectlib.scrambling.ScrambleStateBandagedCuboid;
22
import org.distorted.objectlib.main.ObjectControl;
26 23

  
27 24
import java.io.InputStream;
28 25

  
......
80 77
   @Override
81 78
   public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
82 79
      {
83
      int maxS = ScrambleStateBandagedCuboid.MAX_SUPPORTED_SIZE;
84
      int numComponents = maxS*maxS*maxS - (maxS-2)*(maxS-2)*(maxS-2);
80
      DistortedLibrary.setMax(EffectType.VERTEX, ObjectControl.MAX_QUATS+1);
81
      MeshBase.setMaxEffComponents(ObjectControl.MAX_MOVING_PARTS);
85 82

  
86
      DistortedLibrary.setMax(EffectType.VERTEX,25); // 24 quaternions + rotation
87
      MeshBase.setMaxEffComponents(numComponents);
88 83
      VertexEffectRotate.enable();
89 84
      VertexEffectQuaternion.enable();
90 85
      BaseEffect.Type.enableEffects();
src/main/java/org/distorted/main/RubikRenderer.java
24 24
import org.distorted.library.mesh.MeshBase;
25 25
import org.distorted.external.RubikNetwork;
26 26
import org.distorted.objectlib.main.ObjectControl;
27
import org.distorted.overlays.OverlayGeneric;
28 27

  
29 28
import javax.microedition.khronos.egl.EGLConfig;
30 29
import javax.microedition.khronos.opengles.GL10;
......
147 146
      VertexEffectRotate.enable();
148 147
      VertexEffectQuaternion.enable();
149 148
      BaseEffect.Type.enableEffects();
150
      OverlayGeneric.enableEffects();
149
      //OverlayGeneric.enableEffects();
151 150

  
152 151
      DistortedLibrary.onSurfaceCreated(this,1);
153 152
      DistortedLibrary.setCull(true);

Also available in: Unified diff