Min shader.

Normand Briere

2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314

 GroupEditor.java
..
..
@@ -417,13 +417,13 @@
417
417
 		
418
418
                 assert(false);
419
419
                 
420
-        if (copy.versionlist == null)
421
-        {
422
-            copy.versionlist = new Object3D[100];
423
-            copy.versionindex = -1;
424
-            
425
-            //Save(true);
426
-        }
420
+//        if (copy.versionlist == null)
421
+//        {
422
+//            copy.versionlist = new Object3D[100];
423
+//            copy.versionindex = -1;
424
+//            
425
+//            //Save(true);
426
+//        }
427
427
         
428
428
 		if(ui)
429
429
                     SetupUI(objEditor);
..
..
@@ -446,13 +446,13 @@
446
446
                 
447
447
                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
448
448
                 
449
-        if (copy.versionlist == null)
450
-        {
451
-            copy.versionlist = new Object3D[100];
452
-            copy.versionindex = -1;
453
-            
454
-            //Save(true);
455
-        }
449
+//        if (copy.versionlist == null)
450
+//        {
451
+//            copy.versionlist = new Object3D[100];
452
+//            copy.versionindex = -1;
453
+//            
454
+//            //Save(true);
455
+//        }
456
456
 	}
457
457
 
458
458
     void CloneSelection(boolean supports)
..
..
@@ -835,6 +835,8 @@
835
835
         }
836
836
 
837
837
                 oe.menuBar.add(menu = new Menu("Attributes"));
838
+		clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
839
+		clearVersionsItem.addActionListener(this);
838
840
 		clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
839
841
 		clearMaterialsItem.addActionListener(this);
840
842
                 resetAllItem = menu.add(new MenuItem("Reset All"));
..
..
@@ -936,6 +938,8 @@
936
938
         cGridBag currenttab;
937
939
         //boolean added; // patch for jar
938
940
                 
941
+        int totalcount = 0;
942
+        
939
943
         int tabcount = 0;
940
944
         int colcount = 0;
941
945
         int rowcount = 0;
..
..
@@ -964,7 +968,7 @@
964
968
             texturecount = 0;
965
969
         }
966
970
         
967
-        if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
971
+        if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") || path[2].toLowerCase().endsWith(".png")))
968
972
         {
969
973
             //if (!added)
970
974
             {
..
..
@@ -973,7 +977,8 @@
973
977
                 currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
974
978
             }
975
979
             
976
-            AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
980
+            AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
981
+            totalcount++;
977
982
             
978
983
             if (++colcount >= columns)
979
984
             {
..
..
@@ -999,6 +1004,8 @@
999
1004
             container.add(resourcecontainer);
1000
1005
             
1001
1006
             Grafreed.ParseResources("textures", this);
1007
+            
1008
+            // 935. System.out.println("Total = " + totalcount);
1002
1009
         }
1003
1010
         
1004
1011
 	void SetupUI2(ObjEditor oe)
..
..
@@ -1259,7 +1266,10 @@
1259
1266
                 
1260
1267
                 CreateTexturePanel(textures);
1261
1268
                 
1262
-                resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1269
+                int tabCount = resourcecontainer.getTabCount();
1270
+                
1271
+                if (tabCount > 0)
1272
+                    resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
1263
1273
                 
1264
1274
                 oe.toolboxPanel.add(textures);
1265
1275
                 
..
..
@@ -2119,24 +2129,24 @@
2119
2129
             switch(axis)
2120
2130
             {
2121
2131
                 case 0 :
2122
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2123
-                    vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2124
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2125
-                    vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
2132
+                    vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
2133
+                    vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
2134
+                    vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
2135
+                    vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2126
2136
                     norm = cVector.X;
2127
2137
                     break;
2128
2138
                 case 1 :
2129
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2130
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2131
-                    vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2132
-                    vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
2139
+                    vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
2140
+                    vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
2141
+                    vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
2142
+                    vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2133
2143
                     norm = cVector.Y;
2134
2144
                     break;
2135
2145
                 case 2 :
2136
-                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2137
-                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2138
-                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2139
-                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
2146
+                    vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
2147
+                    vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
2148
+                    vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
2149
+                    vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2140
2150
                     norm = cVector.Z;
2141
2151
                     break;
2142
2152
             }
..
..
@@ -3458,6 +3468,10 @@
3458
3468
                 {
3459
3469
 			ClearMaterials();
3460
3470
 		} else
3471
+		if (source == clearVersionsItem)
3472
+                {
3473
+			ClearVersions();
3474
+		} else
3461
3475
 		if (source == liveleavesItem)
3462
3476
                 {
3463
3477
 			LiveLeaves(true);
..
..
@@ -4134,12 +4148,14 @@
4134
4148
             // and check if any of these nodes are reachable below the root.
4135
4149
             Grafreed.grafreed.universe.TagObjects(copy, true);
4136
4150
             
4137
-            if (!copy.HasTags())
4151
+            if (copy.versionlist == null && !copy.HasTags())
4138
4152
             {
4139
4153
                 copy.versionlist = new Object3D[100];
4140
4154
                 
4141
-                Save(true);
4155
+                //Save(true);
4142
4156
             }
4157
+            else
4158
+                copy.versionindex = -2;
4143
4159
             
4144
4160
             Grafreed.grafreed.universe.TagObjects(copy, false);
4145
4161
         }
..
..
@@ -5102,6 +5118,12 @@
5102
5118
 	void ClearMaterials()
5103
5119
 	{
5104
5120
 		group.selection.ClearMaterials();
5121
+		refreshContents();
5122
+	}
5123
+	
5124
+	void ClearVersions()
5125
+	{
5126
+		group.selection.ClearVersions();
5105
5127
 		refreshContents();
5106
5128
 	}
5107
5129
 	
..
..
@@ -6346,6 +6368,7 @@
6346
6368
 	private MenuItem clipMeshItem;
6347
6369
 	private MenuItem smoothMeshItem;
6348
6370
 	private MenuItem clearMaterialsItem;
6371
+	private MenuItem clearVersionsItem;
6349
6372
         
6350
6373
 	private MenuItem liveleavesItem;
6351
6374
 	private MenuItem unliveleavesItem;