Project

General

Profile

« Previous | Next » 

Revision 1d4592a2

Added by Leszek Koltunski over 2 years ago

Bandaged 3x3: Improve joining cubits

View differences:

src/main/java/org/distorted/bandaged/BandagedCreatorRenderer.java
105 105
   private long mStartTime;
106 106
   private float mScaleValue;
107 107
   private float mX, mY, mZ, mW;
108
   private boolean mResetQuats, mSetQuatT, mResettingObject;
108
   private boolean mResetQuats, mSetQuatT, mResettingObject, mConnectingCubits;
109
   private int mIndex1, mIndex2;
109 110
   private int mSaveIcon;
110 111
   private DistortedFramebuffer mFramebuffer;
111 112
   private String mPath;
......
119 120

  
120 121
     mView = v;
121 122

  
122
     mResetQuats     = false;
123
     mSetQuatT       = false;
124
     mResettingObject= false;
123
     mResetQuats       = false;
124
     mSetQuatT         = false;
125
     mResettingObject  = false;
126
     mConnectingCubits = false;
125 127

  
126 128
     mSaveIcon = -1;
127 129

  
......
154 156

  
155 157
   private BandagedCubit[] createCubits()
156 158
     {
157
     boolean roundCorners = DistortedLibrary.fastCompilationTF();
159
     boolean roundCorners = false;//DistortedLibrary.fastCompilationTF();
158 160
     int len = POSITIONS.length;
159 161
     BandagedCubit[] cubits = new BandagedCubit[len];
160 162

  
......
242 244
       saveIcon();
243 245
       mSaveIcon = -1;
244 246
       }
247

  
248
     if( mConnectingCubits )
249
       {
250
       mConnectingCubits = false;
251
       tryConnectingCubits(mIndex1,mIndex2);
252
       }
245 253
     }
246 254

  
247 255
///////////////////////////////////////////////////////////////////////////////////////////////////
......
312 320

  
313 321
///////////////////////////////////////////////////////////////////////////////////////////////////
314 322

  
315
   public void tryConnectingCubits(int index1, int index2)
323
   void setConnecting(int index1, int index2)
324
     {
325
     mIndex1 = index1;
326
     mIndex2 = index2;
327
     mConnectingCubits = true;
328
     }
329

  
330
///////////////////////////////////////////////////////////////////////////////////////////////////
331

  
332
   private void tryConnectingCubits(int index1, int index2)
316 333
     {
317 334
     if( index1!=index2 )
318 335
       {
src/main/java/org/distorted/bandaged/BandagedCreatorView.java
210 210
                                         {
211 211
                                         mRenderer.untouchCubit(mTouchedIndex1);
212 212
                                         mRenderer.untouchCubit(mTouchedIndex2);
213
                                         mRenderer.tryConnectingCubits(mTouchedIndex1,mTouchedIndex2);
213
                                         mRenderer.setConnecting(mTouchedIndex1,mTouchedIndex2);
214 214
                                         mTouchedIndex1 = -1;
215 215
                                         mTouchedIndex2 = -1;
216 216
                                         }

Also available in: Unified diff