Smooth keys + box editor.

Normand Briere

2019-08-28 47745d8ade7238a188f7ab78eaf5e8a269d96fdd

 Composite.java
..
..
@@ -401,7 +401,6 @@
401
401
         {
402
402
             child = (Object3D) e.nextElement();
403
403
         }
404
-
405
404
     }
406
405
 
407
406
     void createEditWindow(GroupEditor callee, boolean newWindow) //, boolean root)
..
..
@@ -790,6 +789,8 @@
790
789
 
791
790
     void draw(ClickInfo info, int level, boolean select)
792
791
     {
792
+        new Exception().printStackTrace();
793
+        
793
794
         ClickInfo newInfo = new ClickInfo();
794
795
         newInfo.flags = info.flags;
795
796
         newInfo.bounds = info.bounds;
..
..
@@ -867,15 +868,29 @@
867
868
         tex = GetTextures();
868
869
     }
869
870
 
871
+    boolean failedPigment = false;
872
+    boolean failedBump = false;
873
+    
870
874
     try
871
875
     {
872
-        display.BindTextures(tex, texres);
876
+        display.BindPigmentTexture(tex, texres);
873
877
     }
874
878
     catch (Exception e)
875
879
     {
876
-        System.err.println("FAILED: " + this);
880
+    //    System.err.println("FAILED: " + this);
881
+        failedPigment = true;
877
882
     }
878
-    
883
+           
884
+    try
885
+    {
886
+        display.BindBumpTexture(tex, texres);
887
+    }
888
+    catch (Exception e)
889
+    {
890
+        //System.err.println("FAILED: " + this);
891
+        failedBump = true;
892
+    }
893
+               
879
894
         if (//true) // new NORMAND
880
895
             touched || softtouched)
881
896
         {
..
..
@@ -937,7 +952,11 @@
937
952
             }
938
953
         }
939
954
     
940
-    display.ReleaseTextures(tex);
955
+    if (!failedBump)
956
+        display.ReleaseBumpTexture(tex);
957
+    
958
+    if (!failedPigment)
959
+        display.ReleasePigmentTexture(tex);
941
960
     }
942
961
 
943
962
     void Reset0()