Project

General

Profile

« Previous | Next » 

Revision 3bf19410

Added by Leszek Koltunski about 2 years ago

Mode the 'iconMode' from static variable in ObjectControl to member varaible in TwistyObject (safer)

View differences:

src/main/java/org/distorted/objectlib/helpers/FactoryCubit.java
73 73
  private static final ArrayList<FaceTransform> mOldFaceTransf = new ArrayList<>();
74 74
  private static final ArrayList<StickerCoords> mStickerCoords = new ArrayList<>();
75 75

  
76
private final float[] mqx,mqy,mqz,mqw;
77
private int mnum;
78

  
79 76
///////////////////////////////////////////////////////////////////////////////////////////////////
80 77

  
81 78
  private FactoryCubit()
82 79
    {
83
int num= 100;
84
mqx = new float[num];
85
mqy = new float[num];
86
mqz = new float[num];
87
mqw = new float[num];
80

  
88 81
    }
89 82

  
90 83
///////////////////////////////////////////////////////////////////////////////////////////////////
......
823 816
      {
824 817
      printTransform(mNewFaceTransf.get(f));
825 818
      }
826

  
827
    android.util.Log.d("D", "---- used quats ---");
828

  
829
    for(int i=0; i<mnum; i++)
830
      {
831
      android.util.Log.e("D", mqx[i]+" "+mqy[i]+" "+mqz[i]+" "+mqw[i]);
832
      }
833 819
    }
834 820

  
835 821
///////////////////////////////////////////////////////////////////////////////////////////////////
......
1072 1058
    MeshBase mesh = new MeshJoined(meshes);
1073 1059
    Static3D center = new Static3D(0,0,0);
1074 1060

  
1075
mnum = numFaces;
1076

  
1077 1061
    for(int face=0; face<numFaces; face++)
1078 1062
      {
1079 1063
      int assoc = (1<<face);
......
1088 1072
      float qz = fInfo.qz;
1089 1073
      float qw = fInfo.qw;
1090 1074

  
1091
mqx[face]=qx;
1092
mqy[face]=qy;
1093
mqz[face]=qz;
1094
mqw[face]=qw;
1095

  
1096 1075
      Static3D scale = new Static3D(sc,sc,sc);
1097 1076
      Static3D move3D= new Static3D(vx,vy,vz);
1098 1077
      Static4D quat  = new Static4D(qx,qy,qz,qw);

Also available in: Unified diff