Better navigation.

Normand Briere

2019-09-20 cbe4e90105d07d7d3fecabffaa01342403aa2ae3

 Composite.java
..
..
@@ -160,36 +160,37 @@
160
160
 //        //Touch();
161
161
 //    }
162
162
     
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
+//    }
193
194
 
194
195
     boolean ReadOnly()
195
196
     {
..
..
@@ -205,6 +206,7 @@
205
206
 
206
207
     boolean HasLoops()
207
208
     {
209
+                new Exception().printStackTrace();
208
210
         System.exit(0);
209
211
         if (blockloop)
210
212
         {
..
..
@@ -277,11 +279,15 @@
277
279
 
278
280
         Composite compo = new Composite();
279
281
 
280
-        super.deepCopySelf(compo);
282
+        super.deepCopyNode(compo);
283
+        
284
+        compo.count = 2;
281
285
         
282
286
         for (int i = 0; i < Children().size(); i++)
283
287
         {
284
288
             Object3D obj = (Object3D) Children().reserve(i);
289
+            if (obj == null)
290
+                continue;
285
291
             compo.addChild(obj.copyExpand());
286
292
             Children().release(i);
287
293
         }
..
..
@@ -291,9 +297,9 @@
291
297
         return compo;
292
298
     }
293
299
 
294
-    protected void deepCopySelf(Object3D other)
300
+    protected void deepCopyNode(Object3D other)
295
301
     {
296
-        super.deepCopySelf(other);
302
+        super.deepCopyNode(other);
297
303
         
298
304
         if (false)
299
305
         {
..
..
@@ -348,6 +354,7 @@
348
354
         
349
355
     void getBounds0(cVector minima, cVector maxima, boolean xform)
350
356
     {
357
+                new Exception().printStackTrace();
351
358
         System.exit(0);
352
359
         minima.x = minima.y = minima.z = 1E10;
353
360
         maxima.x = maxima.y = maxima.z = -1E10;
..
..
@@ -398,7 +405,6 @@
398
405
         {
399
406
             child = (Object3D) e.nextElement();
400
407
         }
401
-
402
408
     }
403
409
 
404
410
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -787,6 +793,8 @@
787
793
 
788
794
     void draw(ClickInfo info, int level, boolean select)
789
795
     {
796
+        new Exception().printStackTrace();
797
+        
790
798
         ClickInfo newInfo = new ClickInfo();
791
799
         newInfo.flags = info.flags;
792
800
         newInfo.bounds = info.bounds;
..
..
@@ -864,8 +872,29 @@
864
872
         tex = GetTextures();
865
873
     }
866
874
 
867
-    display.BindTextures(tex, texres);
875
+    boolean failedPigment = false;
876
+    boolean failedBump = false;
868
877
     
878
+    try
879
+    {
880
+        display.BindPigmentTexture(tex, texres);
881
+    }
882
+    catch (Exception e)
883
+    {
884
+    //    System.err.println("FAILED: " + this);
885
+        failedPigment = true;
886
+    }
887
+           
888
+    try
889
+    {
890
+        display.BindBumpTexture(tex, texres);
891
+    }
892
+    catch (Exception e)
893
+    {
894
+        //System.err.println("FAILED: " + this);
895
+        failedBump = true;
896
+    }
897
+               
869
898
         if (//true) // new NORMAND
870
899
             touched || softtouched)
871
900
         {
..
..
@@ -927,7 +956,11 @@
927
956
             }
928
957
         }
929
958
     
930
-    display.ReleaseTextures(tex);
959
+    if (!failedBump)
960
+        display.ReleaseBumpTexture(tex);
961
+    
962
+    if (!failedPigment)
963
+        display.ReleasePigmentTexture(tex);
931
964
     }
932
965
 
933
966
     void Reset0()