blame | history | patch | commit | commitdiff
Normand Briere
2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15 
 GroupEditor.java
....@@ -80,18 +80,20 @@
8080 		this.copy = this.group = copy;
8181 		//selectees = this.group.selectees;
8282 		
83
-        if (copy.versions == null)
84
-        {
85
-            copy.versions = new byte[100][];
86
-            copy.versionindex = -1;
87
-        }
88
-        
8983 		SetupMenu2(this); //objEditor);
9084 		SetupUI2(objEditor);
9185 		objEditor.SetupUI(true);
9286 		SetupViews(objEditor);
9387                 
9488                 ((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
89
+                
90
+        if (copy.versions == null)
91
+        {
92
+            copy.versions = new byte[100][];
93
+            copy.versionindex = -1;
94
+            
95
+            Save(true);
96
+        }
9597 	}
9698 
9799     void CloneSelection(boolean supports)
....@@ -526,10 +528,15 @@
526528 		attachBumpItem.addActionListener(this);
527529 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528530 		pigmentBumpItem.addActionListener(this);
531
+                //embedTexturesItem
529532 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530533 		detachPigmentItem.addActionListener(this);
531534 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532535 		detachBumpItem.addActionListener(this);
536
+		embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
537
+		embedTexturesItem.addActionListener(this);
538
+		deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
539
+		deEmbedTexturesItem.addActionListener(this);
533540 		menu.add("-");
534541 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535542 		sortbysizeItem.addActionListener(this);
....@@ -681,25 +688,25 @@
681688                         oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682689                         snapobjectButton.addActionListener(this);
683690                         snapobjectButton.setToolTipText("Snap Object");
691
+                        
692
+		oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
+		fourButton.addActionListener(this);
694
+                fourButton.setToolTipText("Show control panel only");
684695                 }
685696 
686697 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687698                 
688
-		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
-		fourButton.addActionListener(this);
690
-                fourButton.setToolTipText("Show left panel only");
691
-                
692
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
693
-                twoButton.setToolTipText("Show right view only");
699
+		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
+                twoButton.setToolTipText("Show 3D view only");
694701 		twoButton.addActionListener(this);
695702                 this.fullscreenLayout = twoButton;
696703                 
697
-		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
698
-                sixButton.setToolTipText("Show left and right");
704
+		oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
705
+                threeButton.setToolTipText("Show controls and 3D view");
706
+		threeButton.addActionListener(this);
707
+		oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
+                sixButton.setToolTipText("Show 3D view and controls");
699709 		sixButton.addActionListener(this);
700
-//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
701
-//                threeButton.setToolTipText("2-column layout right");
702
-//		threeButton.addActionListener(this);
703710 //		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
704711 //                sevenButton.setToolTipText("3-column layout");
705712 //		sevenButton.addActionListener(this);
....@@ -3151,7 +3158,7 @@
31513158 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
31523159 			{
31533160 				obj = (Object3D)e.nextElement();
3154
-                                obj.SetBumpTexture(null);
3161
+                                obj.ResetBumpTexture();
31553162 			}
31563163 			
31573164 			refreshContents();
....@@ -3165,6 +3172,31 @@
31653172                                 obj.SetBumpTexture(obj.GetPigmentTexture());
31663173 			}
31673174 			
3175
+			refreshContents();
3176
+		} else
3177
+		if (source == embedTexturesItem)
3178
+		{
3179
+			Object3D obj;
3180
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3181
+			{
3182
+				obj = (Object3D)e.nextElement();
3183
+                                obj.EmbedTextures(true);
3184
+			}
3185
+			
3186
+			refreshContents();
3187
+		} else
3188
+		if (source == deEmbedTexturesItem)
3189
+		{
3190
+			Object3D obj;
3191
+			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3192
+			{
3193
+				obj = (Object3D)e.nextElement();
3194
+                                obj.EmbedTextures(false);
3195
+			}
3196
+			
3197
+                CameraPane.texturepigment.clear();
3198
+                CameraPane.texturebump.clear();
3199
+                
31683200 			refreshContents();
31693201 		} else
31703202 		if (source == flashSelectionButton)
....@@ -3268,8 +3300,8 @@
32683300 //                    centralPanel.setVisible(true);
32693301 //                    XYZPanel.setVisible(true);
32703302                     bigThree.ClearUI();
3303
+                    bigThree.add(scenePanel);
32713304                     bigThree.add(centralPanel);
3272
-                    bigThree.add(XYZPanel);
32733305                     bigThree.FlushUI();
32743306                     
32753307                     cameraView.requestFocusInWindow();
....@@ -3349,8 +3381,8 @@
33493381 //                    centralPanel.setVisible(true);
33503382 //                    XYZPanel.setVisible(false);
33513383                     bigThree.ClearUI();
3352
-                    bigThree.add(scenePanel);
33533384                     bigThree.add(centralPanel);
3385
+                    bigThree.add(scenePanel);
33543386                     bigThree.FlushUI();
33553387                     
33563388                     cameraView.requestFocusInWindow();
....@@ -4161,7 +4193,7 @@
41614193                             
41624194                             try
41634195                             {
4164
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4196
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
41654197                             }
41664198                             catch (Exception e)
41674199                             {
....@@ -4798,7 +4830,7 @@
47984830 
47994831         void refreshContents(boolean cp)
48004832         {
4801
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4833
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
48024834             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
48034835             {
48044836                 objEditor.ClearInfo(); // .GetMaterial());
....@@ -5791,6 +5823,8 @@
57915823 	private MenuItem attachBumpItem;
57925824 	private MenuItem detachBumpItem;
57935825 	private MenuItem pigmentBumpItem;
5826
+	private MenuItem embedTexturesItem;
5827
+	private MenuItem deEmbedTexturesItem;
57945828 
57955829 	private MenuItem particleItem;
57965830 	private MenuItem ragdollItem;