Textures pane.

Normand Briere

2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e

 GroupEditor.java
..
..
@@ -16,7 +16,7 @@
16
16
 //import buoy.widget.BFileChooser;
17
17
 
18
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
-    Grafreed.iResourceCallBack,
19
+        Grafreed.iResourceCallBack,
20
20
         ObjectUI,
21
21
         Runnable,
22
22
         ActionListener,
..
..
@@ -42,6 +42,22 @@
42
42
         });
43
43
     }
44
44
 
45
+    public void AddTextureButton(String f, final String t, cGridBag row)
46
+    {
47
+        cButton textureButton;
48
+        final String path = "textures/" + f + "/"; // + t;
49
+        row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50
+        textureButton.setToolTipText(f + "s");
51
+        textureButton.addActionListener(new ActionListener()
52
+        {
53
+                @Override
54
+                public void actionPerformed(ActionEvent e)
55
+                {
56
+                    ChangeTexture(path + t);
57
+                }
58
+        });
59
+    }
60
+    
45
61
     public void AddSkyboxTab0(JTabbedPane skyboxpanel)
46
62
     {
47
63
         cGridBag tab0 = new cGridBag().setVertical(true);
..
..
@@ -312,26 +328,31 @@
312
328
         }
313
329
     }
314
330
         
315
-    public void CallBack(String[] path)
316
-    {
317
-        for (int i = 0; i < path.length; i++)
318
-        {
319
-            System.out.print(path[i] + "/");
320
-        }
321
-        
322
-        System.out.println();
323
-    }
324
-    
325
331
     public void ChangeSkybox(String skybox)
326
332
     {
327
333
         //cameraView.envyoff = false;
328
334
         group.skyboxname = skybox;
329
335
         group.skyboxext = "jpg";
330
336
         cameraView.repaint();
337
+    }
331
338
 
332
-        Grafreed.ParseResources("textures", this);
339
+    public void CreateSkyboxPanel(cGridBag skyboxPanel)
340
+    {
341
+        JTabbedPane skyboxpane = new JTabbedPane();
342
+        
343
+        AddSkyboxTab0(skyboxpane);
344
+        AddSkyboxTab1(skyboxpane);
345
+        AddSkyboxTab2(skyboxpane);
346
+        AddSkyboxTab3(skyboxpane);
347
+        
348
+        skyboxPanel.add(skyboxpane);
333
349
     }
334
350
     
351
+    public void ChangeTexture(String texture)
352
+    {
353
+        cameraView.repaint();
354
+    }
355
+
335
356
     //ObjEditor objEditor;
336
357
 	public void closeUI2()
337
358
 	{
..
..
@@ -872,6 +893,67 @@
872
893
 		buildToolsMenu(menu);
873
894
 	}
874
895
 	
896
+        JTabbedPane resourcecontainer;
897
+        cGridBag currenttab;
898
+        boolean added; // patch for jar
899
+                
900
+        int tabcount = 0;
901
+        int colcount = 0;
902
+        int rowcount = 0;
903
+        
904
+        int columns = 5;
905
+        int rows = 7;
906
+        
907
+    public void ResourceCallBack(String[] path)
908
+    {
909
+        for (int i = 0; i < path.length; i++)
910
+            System.out.print(path[i] + "/");
911
+        System.out.println();
912
+        if (rowcount == 0)
913
+        {
914
+            currenttab = new cGridBag();
915
+            added = false;
916
+            String tabname = String.valueOf((char)('A'+tabcount));
917
+            currenttab.setName(tabname);
918
+            rowcount = 1;
919
+        }
920
+        
921
+        if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
922
+        {
923
+            if (!added)
924
+            {
925
+                added = true;
926
+                resourcecontainer.add(currenttab);
927
+                String tabname = String.valueOf((char)('A'+tabcount));
928
+                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
929
+            }
930
+            
931
+            AddTextureButton(path[0], path[1], currenttab);
932
+            if (++colcount >= columns)
933
+            {
934
+                colcount = 0;
935
+                currenttab.Return();
936
+                
937
+                if (rowcount++ >= rows)
938
+                {
939
+                    rowcount = 0;
940
+                }
941
+            }
942
+        }
943
+        else
944
+        {
945
+//            if (!path[path.length-1].equals("icons"))
946
+//                resourcecontainer.Return();
947
+        }
948
+    }
949
+    
950
+        void CreateTexturePanel(cGridBag container)
951
+        {
952
+            resourcecontainer = new JTabbedPane();
953
+            container.add(resourcecontainer);
954
+            
955
+            Grafreed.ParseResources("textures", this);
956
+        }
875
957
         
876
958
 	void SetupUI2(ObjEditor oe)
877
959
 	{
..
..
@@ -1107,19 +1189,15 @@
1107
1189
 
1108
1190
                 oe.toolboxPanel.add(row2);
1109
1191
                 
1110
-                // ENVYMAPS
1111
-                cGridBag skyboxpane = new cGridBag();
1112
-                skyboxpane.preferredHeight = 100;
1192
+                cGridBag textures = new cGridBag();
1113
1193
                 
1114
-                oe.toolboxPanel.add(skyboxpane);
1194
+                CreateTexturePanel(textures);
1115
1195
                 
1116
-                JTabbedPane skyboxpanel = new JTabbedPane();
1117
-                skyboxpane.add(skyboxpanel);
1196
+                oe.toolboxPanel.add(textures);
1118
1197
                 
1119
-                AddSkyboxTab0(skyboxpanel);
1120
-                AddSkyboxTab1(skyboxpanel);
1121
-                AddSkyboxTab2(skyboxpanel);
1122
-                AddSkyboxTab3(skyboxpanel);
1198
+                textures.preferredHeight = 100;
1199
+                
1200
+                CreateSkyboxPanel(oe.skyboxPanel);
1123
1201
                 
1124
1202
                 // EDIT panel
1125
1203
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1131,16 +1209,16 @@
1131
1209
 		uneditButton.addActionListener(this);
1132
1210
 
1133
1211
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1134
-                allParamsButton.setToolTipText("Show all controle");
1212
+                allParamsButton.setToolTipText("Show all controls");
1135
1213
 		allParamsButton.addActionListener(this);
1136
1214
 
1137
1215
 		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1138
-                clearPanelButton.setToolTipText("Clear edit panel");
1216
+                clearPanelButton.setToolTipText("Clear all controls");
1139
1217
 		clearPanelButton.addActionListener(this);
1140
1218
 
1141
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1142
-                unselectButton.setToolTipText("Unselect");
1143
-		unselectButton.addActionListener(this);
1219
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                //unselectButton.setToolTipText("Unselect");
1221
+		//unselectButton.addActionListener(this);
1144
1222
 
1145
1223
 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1146
1224
                 flashSelectionButton.setToolTipText("Highlight selection");
..
..
@@ -5182,7 +5260,7 @@
5182
5260
         {
5183
5261
             editButton.setEnabled(enabled);
5184
5262
             uneditButton.setEnabled(enabled);
5185
-            unselectButton.setEnabled(enabled);
5263
+            //unselectButton.setEnabled(enabled);
5186
5264
             flashSelectionButton.setEnabled(enabled);
5187
5265
             
5188
5266
             clearPanelButton.setEnabled(!listUI.isEmpty());
..
..
@@ -5190,7 +5268,7 @@
5190
5268
 
5191
5269
         void refreshContents(boolean cp)
5192
5270
         {
5193
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5271
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5194
5272
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5195
5273
             {
5196
5274
                 objEditor.ClearInfo(); // .GetMaterial());