Project

General

Profile

« Previous | Next » 

Revision b376bfd7

Added by Leszek Koltunski almost 4 years ago

Fix for a crasher.

View differences:

src/main/java/org/distorted/objects/RubikObject.java
165 165
    mEffects.apply(mScaleEffect);
166 166

  
167 167
    // Now postprocessed effects (the glow when you solve an object) require component centers. In
168
    // order for the center to be in front of the object, we need to set the center to be behind it.
168
    // order for the effect to be in front of the object, we need to set the center to be behind it.
169 169
    getMesh().setComponentCenter(0,0,0,-0.1f);
170 170

  
171 171
    attach( new DistortedNode(mTexture,mEffects,mMesh) );
src/main/java/org/distorted/states/RubikStatePlay.java
118 118
    LinearLayout layoutTop = act.findViewById(R.id.upperBar);
119 119
    layoutTop.removeAllViews();
120 120

  
121
    setupObjectWindow(act,width);
121 122
    setupObjectButton(act,width);
122 123
    layoutTop.addView(mObjButton);
123 124
    setupLevelSpinner(act,width);
......
125 126
    setupPlayButton(act,width);
126 127
    layoutTop.addView(mPlayButton);
127 128

  
128
    setupObjectWindow(act,width);
129

  
130 129
    // BOT ////////////////////////////
131

  
132 130
    LinearLayout layoutLeft = act.findViewById(R.id.mainBarLeft);
133 131
    layoutLeft.removeAllViews();
134 132

  
......
140 138
    LinearLayout layoutRight = act.findViewById(R.id.mainBarRight);
141 139
    layoutRight.removeAllViews();
142 140

  
141
    setupMenuWindow(act,width);
143 142
    setupMenuButton(act,width);
144 143
    layoutRight.addView(mMenuButton);
145

  
146
    setupMenuWindow(act,width);
147 144
    }
148 145

  
149 146
///////////////////////////////////////////////////////////////////////////////////////////////////

Also available in: Unified diff