Textures pane.

Normand Briere

2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e

 GroupEditor.java
..
..
@@ -16,6 +16,7 @@
16
16
 //import buoy.widget.BFileChooser;
17
17
 
18
18
 class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
19
+        Grafreed.iResourceCallBack,
19
20
         ObjectUI,
20
21
         Runnable,
21
22
         ActionListener,
..
..
@@ -41,6 +42,22 @@
41
42
         });
42
43
     }
43
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
+    
44
61
     public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45
62
     {
46
63
         cGridBag tab0 = new cGridBag().setVertical(true);
..
..
@@ -311,14 +328,31 @@
311
328
         }
312
329
     }
313
330
         
314
-    public void ChangeSkybox(String name)
331
+    public void ChangeSkybox(String skybox)
315
332
     {
316
333
         //cameraView.envyoff = false;
317
-        group.skyboxname = name;
334
+        group.skyboxname = skybox;
318
335
         group.skyboxext = "jpg";
319
336
         cameraView.repaint();
320
337
     }
338
+
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);
349
+    }
321
350
     
351
+    public void ChangeTexture(String texture)
352
+    {
353
+        cameraView.repaint();
354
+    }
355
+
322
356
     //ObjEditor objEditor;
323
357
 	public void closeUI2()
324
358
 	{
..
..
@@ -859,6 +893,67 @@
859
893
 		buildToolsMenu(menu);
860
894
 	}
861
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
+        }
862
957
         
863
958
 	void SetupUI2(ObjEditor oe)
864
959
 	{
..
..
@@ -931,32 +1026,36 @@
931
1026
                 restoreCameraButton.setToolTipText("Restore viewpoint");
932
1027
 		restoreCameraButton.addActionListener(this);
933
1028
                 
934
-		copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935
-                saveButton.setToolTipText("Duplicate current version");
936
-		saveButton.addActionListener(this);
1029
+		copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030
+                saveVersionButton.setToolTipText("Duplicate current version");
1031
+		saveVersionButton.addActionListener(this);
937
1032
                                                 
938
-		copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939
-                undoButton.setToolTipText("Previous version");
940
-		undoButton.addActionListener(this);
941
-                undoButton.setEnabled(false);
1033
+		copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1034
+                deleteVersionButton.setToolTipText("Delete current version");
1035
+		deleteVersionButton.addActionListener(this);
1036
+                                                
1037
+		copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1038
+                previousVersionButton.setToolTipText("Previous version");
1039
+		previousVersionButton.addActionListener(this);
1040
+                previousVersionButton.setEnabled(false);
942
1041
                 
943
1042
                 cGridBag updown = new cGridBag().setVertical(true);
944
1043
 		updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945
1044
                 restoreButton.setToolTipText("Undo (restore current version)");
946
1045
 		restoreButton.addActionListener(this);
947
-                restoreButton.setEnabled(false);
1046
+                //restoreButton.setEnabled(false);
948
1047
                 
949
1048
 		updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950
1049
                 replaceButton.setToolTipText("Save (replace current version)");
951
1050
 		replaceButton.addActionListener(this);
952
-                replaceButton.setEnabled(false);
1051
+                //replaceButton.setEnabled(false);
953
1052
                 
954
1053
                 copyOptionsPanel.add(updown);
955
1054
                 
956
-		copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
957
-                redoButton.setToolTipText("Next version");
958
-		redoButton.addActionListener(this);
959
-                redoButton.setEnabled(false);
1055
+		copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056
+                nextVersionButton.setToolTipText("Next version");
1057
+		nextVersionButton.addActionListener(this);
1058
+                nextVersionButton.setEnabled(false);
960
1059
                 
961
1060
                 oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962
1061
                 liveCB.setToolTipText("Enable animation");
..
..
@@ -1090,19 +1189,15 @@
1090
1189
 
1091
1190
                 oe.toolboxPanel.add(row2);
1092
1191
                 
1093
-                // ENVYMAPS
1094
-                cGridBag skyboxpane = new cGridBag();
1095
-                skyboxpane.preferredHeight = 100;
1192
+                cGridBag textures = new cGridBag();
1096
1193
                 
1097
-                oe.toolboxPanel.add(skyboxpane);
1194
+                CreateTexturePanel(textures);
1098
1195
                 
1099
-                JTabbedPane skyboxpanel = new JTabbedPane();
1100
-                skyboxpane.add(skyboxpanel);
1196
+                oe.toolboxPanel.add(textures);
1101
1197
                 
1102
-                AddSkyboxTab0(skyboxpanel);
1103
-                AddSkyboxTab1(skyboxpanel);
1104
-                AddSkyboxTab2(skyboxpanel);
1105
-                AddSkyboxTab3(skyboxpanel);
1198
+                textures.preferredHeight = 100;
1199
+                
1200
+                CreateSkyboxPanel(oe.skyboxPanel);
1106
1201
                 
1107
1202
                 // EDIT panel
1108
1203
 		editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -1114,16 +1209,16 @@
1114
1209
 		uneditButton.addActionListener(this);
1115
1210
 
1116
1211
 		editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117
-                allParamsButton.setToolTipText("Show all controle");
1212
+                allParamsButton.setToolTipText("Show all controls");
1118
1213
 		allParamsButton.addActionListener(this);
1119
1214
 
1120
1215
 		editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121
-                clearPanelButton.setToolTipText("Clear edit panel");
1216
+                clearPanelButton.setToolTipText("Clear all controls");
1122
1217
 		clearPanelButton.addActionListener(this);
1123
1218
 
1124
-		editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125
-                unselectButton.setToolTipText("Unselect");
1126
-		unselectButton.addActionListener(this);
1219
+		//editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1220
+                //unselectButton.setToolTipText("Unselect");
1221
+		//unselectButton.addActionListener(this);
1127
1222
 
1128
1223
 		editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129
1224
                 flashSelectionButton.setToolTipText("Highlight selection");
..
..
@@ -2571,7 +2666,7 @@
2571
2666
 		if (source == invariantsItem)
2572
2667
 		{
2573
2668
                     System.out.println("Invariants:");
2574
-                    Grafreed.grafreeD.universe.invariants();
2669
+                    Grafreed.grafreed.universe.invariants();
2575
2670
 		} else
2576
2671
 		if (source == memoryItem)
2577
2672
 		{
..
..
@@ -2602,35 +2697,40 @@
2602
2697
 		{
2603
2698
 			ToggleFullScreen();
2604
2699
 		} else
2605
-		if (source == undoButton)
2700
+		if (source == previousVersionButton)
2606
2701
 		{
2607
2702
                         // Go to previous version
2608
2703
 			//if (!Undo())
2609
2704
                             //java.awt.Toolkit.getDefaultToolkit().beep();
2610
-			Undo();
2705
+			PreviousVersion();
2611
2706
 		} else
2612
2707
 		if (source == restoreButton)
2613
2708
 		{
2614
2709
                         // Restore current version
2615
2710
 			Restore();
2616
-        restoreButton.setEnabled(false);
2711
+        //restoreButton.setEnabled(false);
2617
2712
 		} else
2618
2713
 		if (source == replaceButton)
2619
2714
 		{
2620
2715
                         // Overwrite current version
2621
2716
 			Replace();
2622
-        replaceButton.setEnabled(false);
2717
+        //replaceButton.setEnabled(false);
2623
2718
 		} else
2624
-		if (source == redoButton)
2719
+		if (source == nextVersionButton)
2625
2720
 		{
2626
2721
                         // Go to next version
2627
-			Redo();
2722
+			NextVersion();
2628
2723
 		} else
2629
-		if (source == saveButton)
2724
+		if (source == saveVersionButton)
2630
2725
 		{
2631
2726
                         // Save a new version
2632
2727
 			if (!Save(true))
2633
2728
                             java.awt.Toolkit.getDefaultToolkit().beep();
2729
+		} else
2730
+		if (source == deleteVersionButton)
2731
+		{
2732
+                        // Delete a new version
2733
+                        DeleteVersion();
2634
2734
 		} else
2635
2735
 		if (source == oneStepButton)
2636
2736
 		{
..
..
@@ -2685,11 +2785,11 @@
2685
2785
 		} else
2686
2786
 		if (source == undoItem)
2687
2787
 		{
2688
-			Undo();
2788
+			PreviousVersion();
2689
2789
 		} else
2690
2790
 		if (source == redoItem)
2691
2791
 		{
2692
-			Redo();
2792
+			NextVersion();
2693
2793
 		} else
2694
2794
 		if (source == duplicateItem)
2695
2795
 		{
..
..
@@ -5160,7 +5260,7 @@
5160
5260
         {
5161
5261
             editButton.setEnabled(enabled);
5162
5262
             uneditButton.setEnabled(enabled);
5163
-            unselectButton.setEnabled(enabled);
5263
+            //unselectButton.setEnabled(enabled);
5164
5264
             flashSelectionButton.setEnabled(enabled);
5165
5265
             
5166
5266
             clearPanelButton.setEnabled(!listUI.isEmpty());
..
..
@@ -5168,7 +5268,7 @@
5168
5268
 
5169
5269
         void refreshContents(boolean cp)
5170
5270
         {
5171
-            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5271
+            //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5172
5272
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5173
5273
             {
5174
5274
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -6004,7 +6104,6 @@
6004
6104
 	
6005
6105
 	cButton restoreCameraButton;
6006
6106
         
6007
-	cButton saveButton;
6008
6107
 	cButton oneStepButton;
6009
6108
         
6010
6109
         cButton groupButton;