Fix physics UI

Normand Briere

2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729

 Grafreed.java
..
..
@@ -23,6 +23,8 @@
23
23
     static float epsvertex2 = 0.001f;
24
24
     static boolean linkUV = false; // not uniform at load time
25
25
 
26
+    static boolean smoothmode = false;
27
+    
26
28
     static Wav wav = new Wav("/Users/nbriere/0ut/wavs/monoformat"); // output");
27
29
     static boolean hassound = false;
28
30
     static boolean savesound = false;
..
..
@@ -41,7 +43,11 @@
41
43
     static void Assert(boolean b)
42
44
     {
43
45
         if (!b)
46
+        {
47
+            b = !!b;
44
48
             new Exception().printStackTrace(); // assert(b);
49
+            
50
+        }
45
51
     }
46
52
     
47
53
     public void init()
..
..
@@ -52,7 +58,7 @@
52
58
         universe.material = new cMaterial();
53
59
         //god.addChild(universe);
54
60
         universe.name = "Applet";
55
-        grafreeD = this;
61
+        grafreed = this;
56
62
     }
57
63
 
58
64
     /**/
..
..
@@ -843,19 +849,59 @@
843
849
         
844
850
         //Monitor mon=MonitorFactory.start("myFirstMonitor");
845
851
         standAlone = true;
846
-        grafreeD = new Grafreed();
847
-        grafreeD.universe = new Composite();
848
-        grafreeD.universe.name = "Grafreed";
849
-        grafreeD.universe.material = new cMaterial();
852
+        grafreed = new Grafreed();
853
+        grafreed.materials = ReadGFD(grafreed.getClass().getClassLoader().getResourceAsStream("gfd/materials.gfd"));
854
+        
855
+        grafreed.universe = new cGroup();
856
+        grafreed.universe.name = "Grafreed";
857
+        grafreed.universe.material = new cMaterial();
850
858
         //   theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
851
859
 
852
-        grafreeD.universe.root = true;
853
-        grafreeD.universe.openEditWindow(null, true); //, true);
860
+        grafreed.universe.root = true;
861
+        grafreed.universe.openEditWindow(null, true); //, true);
854
862
         //mon.stop();
855
863
         //System.out.println(mon);
856
864
         //timeflow.app.TimeflowAppLauncher.GetTimeFlow();
857
865
     }
858
866
 
867
+    static Object3D materials;
868
+    
869
+    static Object3D ReadGFD(java.io.InputStream istream)
870
+    {
871
+        Object3D readobj = null;
872
+        
873
+        try
874
+        {
875
+            // Try compressed version first.
876
+            java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
877
+            java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
878
+
879
+            readobj = (Object3D) p.readObject();
880
+            istream.close();
881
+
882
+            readobj.ResetDisplayList();
883
+        } catch (Exception e)
884
+        {
885
+            if (!e.toString().contains("GZIP"))
886
+                e.printStackTrace();
887
+            
888
+            try
889
+            {
890
+                java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
891
+
892
+                readobj = (Object3D) p.readObject();
893
+                istream.close();
894
+
895
+                readobj.ResetDisplayList();
896
+            } catch (Exception e2)
897
+            {
898
+                e2.printStackTrace();
899
+            }
900
+        }
901
+        
902
+        return readobj;
903
+    }
904
+    
859
905
     // Timer callback
860
906
     public void actionPerformed(ActionEvent e)
861
907
     {
..
..
@@ -870,7 +916,7 @@
870
916
     static int depth = 0;
871
917
     static java.util.Stack stack = new java.util.Stack();
872
918
     static boolean traceoff = false; // true;
873
-    static float[] colorV = new float[5];
919
+    static float[] colorV = new float[4]; // 5];
874
920
 
875
921
     static void traceon()
876
922
     {
..
..
@@ -1079,7 +1125,7 @@
1079
1125
         } while (avail > 0 && numRead >= 0);
1080
1126
         return new String(data, 0, pos, "US-ASCII");
1081
1127
     }
1082
-    public static Grafreed grafreeD;
1128
+    public static Grafreed grafreed;
1083
1129
     public static boolean standAlone = true;
1084
1130
     public Composite universe;
1085
1131
     public static Object3D clipboard = new Object3D();