Fix version manager.

Normand Briere

2019-08-12 8f1afe25ea8fc8801aab66331c32a50859a758c2

Fix version manager.

 Biparam.java
..
..
@@ -103,6 +103,11 @@
103
103
         return 1;
104
104
     }
105
105
     
106
+    double vFlip(double v)
107
+    {
108
+        return v;
109
+    }
110
+    
106
111
     void recalculate()
107
112
     {
108
113
 		//System.out.println("BREP TRIMMED? 3 " + bRep.trimmed);
..
..
@@ -121,7 +126,7 @@
121
126
                 if (touched)
122
127
                 {
123
128
                     vert.s = u * uStretch();
124
-                    vert.t = v;
129
+                    vert.t = vFlip(v);
125
130
                 }
126
131
                 else
127
132
                 {
 Box.java
..
..
@@ -1,5 +1,6 @@
1
1
 public class Box extends Object3D implements java.io.Serializable
2
2
 {
3
+    static final long serialVersionUID = 0;
3
4
 
4
5
     Box()
5
6
     {
 CameraPane.java
..
..
@@ -8778,10 +8778,12 @@
8778
8778
 
8779
8779
         gl.glGetIntegerv(GL.GL_MAX_TEXTURE_STACK_DEPTH, temp, 0);
8780
8780
         MAXSTACK = temp[0];
8781
-        System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8781
+        if (Globals.DEBUG)
8782
+            System.out.println("GL_MAX_TEXTURE_STACK_DEPTH = " + MAXSTACK);
8782
8783
         gl.glGetIntegerv(GL.GL_MAX_MODELVIEW_STACK_DEPTH, temp, 0);
8783
8784
         MAXSTACK = temp[0];
8784
-        System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8785
+        if (Globals.DEBUG)
8786
+            System.out.println("GL_MAX_MODELVIEW_STACK_DEPTH = " + MAXSTACK);
8785
8787
 
8786
8788
         // Use debug pipeline
8787
8789
         //drawable.setGL(new DebugGL(gl)); //
..
..
@@ -8789,7 +8791,8 @@
8789
8791
         gl = drawable.getGL(); //
8790
8792
 
8791
8793
         GL gl3 = getGL();
8792
-        System.out.println("INIT GL IS: " + gl.getClass().getName());
8794
+        if (Globals.DEBUG)
8795
+            System.out.println("INIT GL IS: " + gl.getClass().getName());
8793
8796
 
8794
8797
 
8795
8798
         //float pos[] = { 100, 100, 100, 0 };
 Cone.java
..
..
@@ -198,6 +198,11 @@
198
198
         return 6; // Actually 6.28 (I think)
199
199
     }
200
200
     
201
+    double vFlip(double v)
202
+    {
203
+        return 1-v;
204
+    }
205
+    
201
206
     Vertex biparamFunction(double u, double v)
202
207
     {
203
208
         cVector tPos;
 Globals.java
..
..
@@ -1,8 +1,8 @@
1
1
 
2
2
 public class Globals
3
3
 {
4
-        public static boolean DEBUG = false;
5
4
         public static boolean ADVANCED = false;
5
+        public static boolean DEBUG = false;
6
6
         
7
7
     static iCameraPane theRenderer;
8
8
     
 Grid.java
..
..
@@ -67,6 +67,11 @@
67
67
         return 1;
68
68
     }
69
69
     
70
+    double vFlip(double v)
71
+    {
72
+        return v;
73
+    }
74
+    
70
75
     Vertex biparamFunction(double u, double v)
71
76
     {
72
77
         Vertex temp = new Vertex((2*v-1)*radius*4, 0 /*-radius,*/, (2*u-1)*radius*4);
 GroupEditor.java
..
..
@@ -410,6 +410,8 @@
410
410
         {
411
411
             copy.versionlist = new Object3D[100];
412
412
             copy.versionindex = -1;
413
+            
414
+            Save(true);
413
415
         }
414
416
         
415
417
 		if(ui)
..
..
@@ -641,11 +643,9 @@
641
643
 		oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
642
644
 		//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
643
645
 		//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
644
-		editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
645
646
 		oe.cameraMenu.add("-");
646
647
 		openWindowItem =  oe.cameraMenu.add(new MenuItem("Edit copy..."));
647
648
 		openWindowItem.addActionListener(this);
648
-		editLeafItem.addActionListener(this);
649
649
 		lookAtItem.addActionListener(this);
650
650
 		//lookFromItem.addActinoListener(this);
651
651
 		//switchViewItem.addActionListener(this);
..
..
@@ -893,6 +893,9 @@
893
893
 		shareGeometriesItem.addActionListener(this);
894
894
 		mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
895
895
 		mergeGeometriesItem.addActionListener(this);
896
+		menu.add("-");
897
+		editLeafItem = menu.add(new MenuItem("Edit leaf..."));
898
+		editLeafItem.addActionListener(this);
896
899
         if (Globals.ADVANCED)
897
900
         {
898
901
             // Pretty much the same as duplicate and clone.
..
..
@@ -1026,22 +1029,22 @@
1026
1029
                 
1027
1030
                 if (Globals.ADVANCED)
1028
1031
                 {
1029
-                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030
-                    maxButton.setToolTipText("Maximize window");
1031
-                    maxButton.addActionListener(this);
1032
+//                    oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1033
+//                    maxButton.setToolTipText("Maximize window");
1034
+//                    maxButton.addActionListener(this);
1032
1035
                 }
1033
1036
                 
1034
-                cButton gcButton;
1035
-                
1036
-		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037
-                gcButton.setToolTipText("Garbage collect");
1038
-        gcButton.addActionListener(new ActionListener()
1039
-        {
1040
-                public void actionPerformed(ActionEvent e)
1041
-                {
1042
-                    System.gc();
1043
-                }
1044
-        });
1037
+//                cButton gcButton;
1038
+//                
1039
+//		oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040
+//                gcButton.setToolTipText("Garbage collect");
1041
+//                gcButton.addActionListener(new ActionListener()
1042
+//                {
1043
+//                        public void actionPerformed(ActionEvent e)
1044
+//                        {
1045
+//                            System.gc();
1046
+//                        }
1047
+//                });
1045
1048
                 
1046
1049
 		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047
1050
                 collapseButton.setToolTipText("Collapse toolbar");
..
..
@@ -1162,7 +1165,7 @@
1162
1165
                 
1163
1166
                 // INSERT
1164
1167
                 row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1165
-                gridButton.setToolTipText("Create grid");
1168
+                gridButton.setToolTipText("Create ground");
1166
1169
                                 gridButton.addActionListener(this);
1167
1170
 
1168
1171
                 row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1454,6 +1457,14 @@
1454
1457
 	
1455
1458
         void EditObject(Object3D obj)
1456
1459
         {
1460
+            assert(obj instanceof Composite);
1461
+            
1462
+            if (obj.versionlist == null)
1463
+            {
1464
+                obj.versionlist = new Object3D[100];
1465
+                obj.versionindex = -1;
1466
+            }
1467
+            
1457
1468
             cRadio radioButton = new cRadio(obj.name);
1458
1469
             
1459
1470
             // June 2019. Patch to avoid bug with transparency.
..
..
@@ -3892,6 +3903,7 @@
3892
3903
                 } else
3893
3904
 		if (source == rootButton)
3894
3905
 		{
3906
+                    Replace();
3895
3907
                     Object3D obj;
3896
3908
                     for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3897
3909
                     {
..
..
@@ -4028,8 +4040,6 @@
4028
4040
                     
4029
4041
                     copy = group;
4030
4042
                     
4031
-                    SetUndoStates();
4032
-
4033
4043
                     //Globals.theRenderer.object = group;
4034
4044
                     if(!useclient)
4035
4045
                     {
..
..
@@ -4057,6 +4067,8 @@
4057
4067
                      */
4058
4068
                     radio.layout.doClick();
4059
4069
                     
4070
+                    SetUndoStates();
4071
+
4060
4072
                     ClearUnpinned();
4061
4073
                     
4062
4074
                     //Grafreed.Assert(group != null);
..
..
@@ -5291,6 +5303,19 @@
5291
5303
             flashSelectionButton.setEnabled(enabled);
5292
5304
             
5293
5305
             clearPanelButton.setEnabled(!listUI.isEmpty());
5306
+            
5307
+            boolean allComposites = true;
5308
+            
5309
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310
+            {
5311
+                    if (!(e.nextElement() instanceof Composite))
5312
+                    {
5313
+                        allComposites = false;
5314
+                        break;
5315
+                    }
5316
+            }
5317
+            
5318
+            rootButton.setEnabled(allComposites);
5294
5319
         }
5295
5320
 
5296
5321
         void refreshContents(boolean cp)
 ObjEditor.java
..
..
@@ -297,11 +297,13 @@
297
297
         client = inClient;
298
298
         copy = client;
299
299
 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
300
+//        if (copy.versionlist == null)
301
+//        {
302
+//            copy.versionlist = new Object3D[100];
303
+//            copy.versionindex = -1;
304
+//            
305
+//            callee.Save(true);
306
+//        }
305
307
         
306
308
         // "this" is not called: SetupUI2(objEditor);
307
309
     }
..
..
@@ -320,6 +322,8 @@
320
322
         {
321
323
             copy.versionlist = new Object3D[100];
322
324
             copy.versionindex = -1;
325
+            
326
+//            Save(true);
323
327
         }
324
328
         
325
329
         SetupUI2(callee.GetEditor());
..
..
@@ -354,11 +358,13 @@
354
358
         copy = localCopy;
355
359
         copy.editWindow = this;
356
360
 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
361
+//        if (copy.versionlist == null)
362
+//        {
363
+//            copy.versionlist = new Object3D[100];
360
364
 //            copy.versionindex = -1;
361
-        }
365
+//            
366
+//            Save(true);
367
+//        }
362
368
         
363
369
         SetupMenu();
364
370
 
..
..
@@ -445,7 +451,7 @@
445
451
 //                        EditSelection(false);
446
452
 //                }
447
453
 
448
-                refreshContents(false); // To refresh Info tab
454
+//                refreshContents(false); // To refresh Info tab
449
455
             }
450
456
         };
451
457
         objectPanel.addChangeListener(changeListener);
..
..
@@ -4161,7 +4167,7 @@
4161
4167
         System.err.println("Save");
4162
4168
         Replace();
4163
4169
         
4164
-        cRadio tab = GetCurrentTab();
4170
+        //cRadio tab = GetCurrentTab();
4165
4171
         
4166
4172
         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4167
4173
         
..
..
@@ -4328,10 +4334,13 @@
4328
4334
     
4329
4335
     void SetUndoStates()
4330
4336
     {
4331
-        cRadio tab = GetCurrentTab();
4337
+        //if (true)
4338
+        //    return;
4339
+                    
4340
+        //cRadio tab = GetCurrentTab();
4332
4341
         
4333
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4342
+        restoreButton.setEnabled(copy.versionindex != -1);
4343
+        replaceButton.setEnabled(copy.versionindex != -1);
4335
4344
         
4336
4345
         previousVersionButton.setEnabled(copy.versionindex > 0);
4337
4346
         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
..
..
@@ -4340,8 +4349,10 @@
4340
4349
                                         copy.versionlist[copy.versionindex + 1] != null);
4341
4350
         
4342
4351
         muteSlider = true;
4352
+        versionSlider.setMinimum(0);
4343
4353
         versionSlider.setMaximum(VersionCount() - 1);
4344
4354
         versionSlider.setInteger(copy.versionindex);
4355
+        versionSlider.setEnabled(copy.versionindex != -1);
4345
4356
         muteSlider = false;
4346
4357
     }
4347
4358
     
..
..
@@ -4352,7 +4363,7 @@
4352
4363
         
4353
4364
         System.err.println("Undo");
4354
4365
         
4355
-        cRadio tab = GetCurrentTab();
4366
+        //cRadio tab = GetCurrentTab();
4356
4367
         
4357
4368
         if (copy.versionindex == 0)
4358
4369
         {
..
..
@@ -4384,7 +4395,7 @@
4384
4395
     {
4385
4396
         System.err.println("Restore");
4386
4397
         
4387
-        cRadio tab = GetCurrentTab();
4398
+        //cRadio tab = GetCurrentTab();
4388
4399
         
4389
4400
         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4390
4401
         {
..
..
@@ -4402,7 +4413,7 @@
4402
4413
     {
4403
4414
         System.err.println("Replace");
4404
4415
         
4405
-        cRadio tab = GetCurrentTab();
4416
+        //cRadio tab = GetCurrentTab();
4406
4417
         
4407
4418
         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4408
4419
         {
..
..
@@ -4420,7 +4431,7 @@
4420
4431
         // Option?
4421
4432
         Replace();
4422
4433
         
4423
-        cRadio tab = GetCurrentTab();
4434
+        //cRadio tab = GetCurrentTab();
4424
4435
         
4425
4436
         if (copy.versionlist[copy.versionindex + 1] == null)
4426
4437
         {
..
..
@@ -4741,7 +4752,7 @@
4741
4752
             
4742
4753
             int version = versionSlider.getInteger();
4743
4754
             
4744
-            if (copy.versionlist[version] != null)
4755
+            if (version != -1 && copy.versionlist[version] != null)
4745
4756
             {
4746
4757
                 copy.versionindex = version;
4747
4758
                 CopyChanged();
..
..
@@ -5489,8 +5500,11 @@
5489
5500
             
5490
5501
         if (copy.versionlist == null)
5491
5502
         {
5503
+            // Backward compatibility
5492
5504
             copy.versionlist = new Object3D[100];
5493
5505
             copy.versionindex = -1;
5506
+            
5507
+            Save(true);
5494
5508
         }
5495
5509
         
5496
5510
             //? SetUndoStates();
 Sphere.java
..
..
@@ -126,6 +126,11 @@
126
126
         return 2;
127
127
     }
128
128
     
129
+    double vFlip(double v)
130
+    {
131
+        return 1-v;
132
+    }
133
+    
129
134
     Vertex biparamFunction(double u, double v)
130
135
     {
131
136
         double uAng = LA.toRadians(u * 360);
 Superellipsoid.java
..
..
@@ -153,6 +153,11 @@
153
153
         return 2;
154
154
     }
155
155
     
156
+    double vFlip(double v)
157
+    {
158
+        return 1-v;
159
+    }
160
+    
156
161
     Vertex biparamFunction(double u, double v)
157
162
     {
158
163
 		//System.out.println("U = " + u + "; V = " + v);
 cubemaps/default-skyboxes/rgb/negy.jpg
Binary files differ
 cubemaps/default-skyboxes/rgb/negz.jpg
Binary files differ
 cubemaps/default-skyboxes/rgb/posx.jpg
Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick1 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick1 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick1 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick10 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick10 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick10 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick2 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick2 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick2 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick3 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick3 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick3 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick4 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick4 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick4 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick5 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick5 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick5 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick6 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick6 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick6 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick7 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick7 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick7 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick8 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick8 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick8 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/iSourceTextures - Brick9 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/iSourceTextures - Brick9 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/iSourceTextures - Brick9 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick1 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick1 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick1 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick10 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick10 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick10 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick2 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick2 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick2 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick3 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick3 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick3 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick4 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick4 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick4 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick5 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick5 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick5 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick6 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick6 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick6 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick7 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick7 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick7 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick8 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick8 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick8 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick2/GrayBrick/icons/iSourceTextures - Brick9 (Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick2/GrayBrick/icons/iSourceTextures - Brick9 \050Vol1\051_DIFF.jpg"rename to "textures/Brick/GrayBrick/icons/iSourceTextures - Brick9 \050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof1(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof1\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof1\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof10(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof10\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof10\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof2(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof2\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof2\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof3(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof3\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof3\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof4(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof4\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof4\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof5(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof5\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof5\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof6(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof6\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof6\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof7(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof7\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof7\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof8(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof8\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof8\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof9(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/iSourceTextures - Ceramic_Roof9\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/iSourceTextures - Ceramic_Roof9\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof1(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof1\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof1\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof10(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof10\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof10\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof2(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof2\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof2\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof3(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof3\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof3\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof4(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof4\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof4\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof5(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof5\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof5\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof6(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof6\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof6\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof7(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof7\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof7\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof8(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof8\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof8\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof9(Vol1)_DIFF.jpg
similarity index 100%rename from "textures/Brick3/CeramicRoof/icons/iSourceTextures - Ceramic_Roof9\050Vol1\051_DIFF.jpg"rename to "textures/Brick2/CeramicRoof/icons/iSourceTextures - Ceramic_Roof9\050Vol1\051_DIFF.jpg"Binary files differ
 textures/Brick/BrownBrick/icons/tr_bks_001.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_001.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_001.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_002.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_002.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_002.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_003.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_003.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_003.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_004.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_004.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_004.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_005.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_005.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_005.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_006.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_006.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_006.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_007.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_007.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_007.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_008.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_008.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_008.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_009.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_009.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_009.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_010.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_010.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_010.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_011.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_011.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_011.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_012.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_012.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_012.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_013.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_013.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_013.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_014.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_014.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_014.jpgBinary files differ
 textures/Brick/BrownBrick/icons/tr_bks_015.jpg
similarity index 100%rename from textures/Brick/BrownBrick/icons/tr_bks_015.jpgrename to textures/Brick3/BrownBrick/icons/tr_bks_015.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_001.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_001.jpgrename to textures/Brick3/BrownBrick/tr_bks_001.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_002.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_002.jpgrename to textures/Brick3/BrownBrick/tr_bks_002.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_003.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_003.jpgrename to textures/Brick3/BrownBrick/tr_bks_003.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_004.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_004.jpgrename to textures/Brick3/BrownBrick/tr_bks_004.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_005.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_005.jpgrename to textures/Brick3/BrownBrick/tr_bks_005.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_006.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_006.jpgrename to textures/Brick3/BrownBrick/tr_bks_006.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_007.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_007.jpgrename to textures/Brick3/BrownBrick/tr_bks_007.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_008.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_008.jpgrename to textures/Brick3/BrownBrick/tr_bks_008.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_009.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_009.jpgrename to textures/Brick3/BrownBrick/tr_bks_009.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_010.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_010.jpgrename to textures/Brick3/BrownBrick/tr_bks_010.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_011.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_011.jpgrename to textures/Brick3/BrownBrick/tr_bks_011.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_012.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_012.jpgrename to textures/Brick3/BrownBrick/tr_bks_012.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_013.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_013.jpgrename to textures/Brick3/BrownBrick/tr_bks_013.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_014.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_014.jpgrename to textures/Brick3/BrownBrick/tr_bks_014.jpgBinary files differ
 textures/Brick/BrownBrick/tr_bks_015.jpg
similarity index 100%rename from textures/Brick/BrownBrick/tr_bks_015.jpgrename to textures/Brick3/BrownBrick/tr_bks_015.jpgBinary files differ