Normand Briere
2019-06-17 13e9febe94aaeebad9c97f6d3e2aa4d73b2495c8
Composite.java
....@@ -160,36 +160,37 @@
160160 // //Touch();
161161 // }
162162
163
- public void clear()
164
- {
165
- if (blockloop)
166
- {
167
- //blockloop = false;
168
- return;
169
- }
170
-
171
- blockloop = true;
172
- //Applet3D.tracein("Clear", this);
173
- for (int i = 0; i < Children().size(); i++)
174
- {
175
- Object3D obj = (Object3D) Children().get(i); // reserve(i);
176
-
177
- //if (!obj.ReadOnly()) // Object3D Serial...
178
- if (!(obj instanceof Composite) || !((Composite) obj).ReadOnly())
179
- {
180
- obj.clear();
181
- //Children().release(i);
182
- Children().remove(i);
183
- --i;
184
- } else
185
- {
186
- //Children().release(i);
187
- }
188
- }
189
- //Applet3D.traceout("Clear", this);
190
-
191
- blockloop = false;
192
- }
163
+ // JUNE 2019??? That cannot work...
164
+// public void clear()
165
+// {
166
+// if (blockloop)
167
+// {
168
+// //blockloop = false;
169
+// return;
170
+// }
171
+//
172
+// blockloop = true;
173
+// //Applet3D.tracein("Clear", this);
174
+// for (int i = 0; i < Children().size(); i++)
175
+// {
176
+// Object3D obj = (Object3D) Children().get(i); // reserve(i);
177
+//
178
+// //if (!obj.ReadOnly()) // Object3D Serial...
179
+// if (!(obj instanceof Composite) || !((Composite) obj).ReadOnly())
180
+// {
181
+// obj.clear();
182
+// //Children().release(i);
183
+// Children().remove(i);
184
+// --i;
185
+// } else
186
+// {
187
+// //Children().release(i);
188
+// }
189
+// }
190
+// //Applet3D.traceout("Clear", this);
191
+//
192
+// blockloop = false;
193
+// }
193194
194195 boolean ReadOnly()
195196 {
....@@ -205,6 +206,7 @@
205206
206207 boolean HasLoops()
207208 {
209
+ new Exception().printStackTrace();
208210 System.exit(0);
209211 if (blockloop)
210212 {
....@@ -348,6 +350,7 @@
348350
349351 void getBounds0(cVector minima, cVector maxima, boolean xform)
350352 {
353
+ new Exception().printStackTrace();
351354 System.exit(0);
352355 minima.x = minima.y = minima.z = 1E10;
353356 maxima.x = maxima.y = maxima.z = -1E10;
....@@ -837,7 +840,7 @@
837840 }
838841
839842 if ((//display.drawMode == CameraPane.SHADOW ||
840
- display.DrawMode() == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) &&
843
+ display.DrawMode() == CameraPane.SELECTION || display.IsDebugSelection()) &&
841844 //HasTransparency())
842845 // SERIAL PATCH
843846 // if (viewCode == -1)
....@@ -855,7 +858,7 @@
855858
856859 cTexture tex = null;
857860
858
- boolean selectmode = display.DrawMode() == display.SELECTION || CameraPane.DEBUG_SELECTION;
861
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
859862
860863 if (//display.drawMode != display.SHADOW &&
861864 !selectmode // display.drawMode != display.SELECTION
....@@ -864,7 +867,14 @@
864867 tex = GetTextures();
865868 }
866869
867
- display.BindTextures(tex, texres);
870
+ try
871
+ {
872
+ display.BindTextures(tex, texres);
873
+ }
874
+ catch (Exception e)
875
+ {
876
+ System.err.println("FAILED: " + this);
877
+ }
868878
869879 if (//true) // new NORMAND
870880 touched || softtouched)
....@@ -994,7 +1004,7 @@
9941004 // }
9951005 // }
9961006
997
- void drawSelfOld(CameraPane display, Object3D /*Composite*/ root, boolean selected)
1007
+ void drawSelfOld(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
9981008 {
9991009 // if (count <= 0) // || display.IsFreezed())
10001010 // {