Backlit

Normand Briere

2019-07-25 7058eef32e524cae08a7373d8bc1061e373b223c

 GroupEditor.java
..
..
@@ -60,6 +60,12 @@
60
60
 		this.copy = this.group = group;
61
61
 		//selectees = this.group.selectees;
62
62
 		
63
+        if (copy.versions == null)
64
+        {
65
+            copy.versions = new byte[100][];
66
+            copy.versionindex = -1;
67
+        }
68
+        
63
69
 		if(ui)
64
70
                     SetupUI(objEditor);
65
71
 	}
..
..
@@ -80,6 +86,14 @@
80
86
 		SetupViews(objEditor);
81
87
                 
82
88
                 ((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
+        }
83
97
 	}
84
98
 
85
99
     void CloneSelection(boolean supports)
..
..
@@ -194,8 +208,8 @@
194
208
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
195
209
 //		pasteExpandItem.addActionListener(this);
196
210
 		menu.add("-");
197
-		clearItem = menu.add(new MenuItem("Clear"));
198
-		clearItem.addActionListener(this);
211
+		deleteItem = menu.add(new MenuItem("Delete"));
212
+		deleteItem.addActionListener(this);
199
213
                 
200
214
         if (Globals.ADVANCED)
201
215
         {
..
..
@@ -421,7 +435,7 @@
421
435
 		genNormalsMESHItem.addActionListener(this);
422
436
         if (Globals.ADVANCED)
423
437
         {
424
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
438
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
425
439
 		genNormalsMINEItem.addActionListener(this);
426
440
         }
427
441
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -514,10 +528,15 @@
514
528
 		attachBumpItem.addActionListener(this);
515
529
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
516
530
 		pigmentBumpItem.addActionListener(this);
531
+                //embedTexturesItem
517
532
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
518
533
 		detachPigmentItem.addActionListener(this);
519
534
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
520
535
 		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);
521
540
 		menu.add("-");
522
541
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
523
542
 		sortbysizeItem.addActionListener(this);
..
..
@@ -673,27 +692,28 @@
673
692
 
674
693
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
675
694
                 
676
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
677
-                twoButton.setToolTipText("Show center view only");
678
-		twoButton.addActionListener(this);
679
-                this.fullscreenLayout = twoButton;
680
-                
681
695
 		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
682
696
 		fourButton.addActionListener(this);
683
697
                 fourButton.setToolTipText("Show left panel only");
698
+                
699
+		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
+                twoButton.setToolTipText("Show right view only");
701
+		twoButton.addActionListener(this);
702
+                this.fullscreenLayout = twoButton;
703
+                
684
704
 		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
685
-                sixButton.setToolTipText("2-column layout left");
705
+                sixButton.setToolTipText("Show left and right");
686
706
 		sixButton.addActionListener(this);
687
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
688
-                threeButton.setToolTipText("2-column layout right");
689
-		threeButton.addActionListener(this);
690
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
691
-                sevenButton.setToolTipText("3-column layout");
692
-		sevenButton.addActionListener(this);
707
+//		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
+//                threeButton.setToolTipText("2-column layout right");
709
+//		threeButton.addActionListener(this);
710
+//		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
711
+//                sevenButton.setToolTipText("3-column layout");
712
+//		sevenButton.addActionListener(this);
693
713
                 //
694
714
 
695
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
696
-                rootButton.setToolTipText("Edit selection in new tab");
715
+		oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
716
+                rootButton.setToolTipText("Open selection in new tab");
697
717
 		rootButton.addActionListener(this);
698
718
 
699
719
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -834,8 +854,8 @@
834
854
 
835
855
                 oe.treePanel.add(copyOptionsPanel);
836
856
                 oe.treePanel.Return();
837
-        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
838
-            versionField = (cNumberSlider)sliderPane.getComponent(1);
857
+        cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
858
+            versionSlider = (cNumberSlider)sliderPane.getComponent(1);
839
859
             sliderPane.preferredHeight = 1;
840
860
                 
841
861
 //        mainPanel.setDividerLocation(0.5); //1.0);
..
..
@@ -859,7 +879,7 @@
859
879
 		dgr.addDragGestureListener(this);
860
880
 		}catch(Exception e) {}
861
881
 		*/
862
-        radio.layout = sevenButton;
882
+        radio.layout = sixButton; // sevenButton;
863
883
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
864
884
 	}
865
885
         
..
..
@@ -1001,7 +1021,7 @@
1001
1021
             }
1002
1022
             
1003
1023
             radioButton.SetObject(obj);
1004
-            radioButton.layout = sevenButton;
1024
+            radioButton.layout = sixButton; // sevenButton;
1005
1025
             radioButton.SetCamera(cameraView.renderCamera, false);
1006
1026
             radioButton.addActionListener(this);
1007
1027
             radioPanel.add(radioButton);
..
..
@@ -1680,6 +1700,16 @@
1680
1700
                 listUI.remove(i);
1681
1701
             }
1682
1702
         }
1703
+    }
1704
+
1705
+    private void EditElement(Object3D elem, boolean newWindow)
1706
+    {
1707
+        //    if (!(elem instanceof Composite))
1708
+        //        newWindow = false;
1709
+            listUI.add(elem);
1710
+            elem.openEditWindow(this, newWindow); //, false);
1711
+            System.out.println("edit : " + elem);
1712
+            elem.editWindow.refreshContents(true); // ? new
1683
1713
     }
1684
1714
         
1685
1715
     /**
..
..
@@ -2646,7 +2676,7 @@
2646
2676
 		{
2647
2677
 			StepAll();
2648
2678
 		} else
2649
-		if (source == clearItem) // || event.getSource() == clearButton)
2679
+		if (source == deleteItem) // || event.getSource() == clearButton)
2650
2680
 		{
2651
2681
 			//int indices[] = jList.getSelectedIndices();
2652
2682
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3128,7 +3158,7 @@
3128
3158
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3129
3159
 			{
3130
3160
 				obj = (Object3D)e.nextElement();
3131
-                                obj.SetBumpTexture(null);
3161
+                                obj.ResetBumpTexture();
3132
3162
 			}
3133
3163
 			
3134
3164
 			refreshContents();
..
..
@@ -3142,6 +3172,31 @@
3142
3172
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3143
3173
 			}
3144
3174
 			
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
+                
3145
3200
 			refreshContents();
3146
3201
 		} else
3147
3202
 		if (source == flashSelectionButton)
..
..
@@ -3541,8 +3596,10 @@
3541
3596
                     radio.layout.doClick();
3542
3597
                     
3543
3598
                     ClearUnpinned();
3544
-                    SetPinStates(group.selection.size() > 0);
3545
-                    if (group.selection.size() == 1)
3599
+                    //Grafreed.Assert(group != null);
3600
+                    //Grafreed.Assert(group.selection != null);
3601
+                    SetPinStates(group.selection == null || group.selection.size() > 0);
3602
+                    if (group.selection == null || group.selection.size() == 1)
3546
3603
                         EditSelection(false);
3547
3604
                     keepparent = group.parent;
3548
3605
                     // PARENT = NULL or not???
..
..
@@ -4136,7 +4193,7 @@
4136
4193
                             
4137
4194
                             try
4138
4195
                             {
4139
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4196
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4140
4197
                             }
4141
4198
                             catch (Exception e)
4142
4199
                             {
..
..
@@ -4613,6 +4670,12 @@
4613
4670
 	
4614
4671
 	void EditSelection(boolean newWindow)
4615
4672
 	{
4673
+                if (group.selection == null)
4674
+                {
4675
+                     EditElement(group, newWindow); // ? new
4676
+                     return;
4677
+                }
4678
+                
4616
4679
         //    aConstraints.gridy = 0;
4617
4680
 		for (int i=0; i<group.selection.size(); i++)
4618
4681
 		{
..
..
@@ -4623,12 +4686,7 @@
4623
4686
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4624
4687
                         if(elem != group || !newWindow)
4625
4688
                         {
4626
-                        //    if (!(elem instanceof Composite))
4627
-                        //        newWindow = false;
4628
-                            listUI.add(elem);
4629
-                            elem.openEditWindow(this, newWindow); //, false);
4630
-                            System.out.println("edit : " + elem);
4631
-                            elem.editWindow.refreshContents(true); // ? new
4689
+                            EditElement(elem, newWindow); // ? new
4632
4690
                         }
4633
4691
 		}
4634
4692
 	}
..
..
@@ -4772,7 +4830,7 @@
4772
4830
 
4773
4831
         void refreshContents(boolean cp)
4774
4832
         {
4775
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4833
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4776
4834
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4777
4835
             {
4778
4836
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -5681,7 +5739,7 @@
5681
5739
 	private MenuItem pasteLinkItem;
5682
5740
 	private MenuItem pasteCloneItem;
5683
5741
 	private MenuItem pasteExpandItem;
5684
-	private MenuItem clearItem;
5742
+	private MenuItem deleteItem;
5685
5743
 	private MenuItem clearAllItem;
5686
5744
 	private MenuItem genUVItem;
5687
5745
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5765,6 +5823,8 @@
5765
5823
 	private MenuItem attachBumpItem;
5766
5824
 	private MenuItem detachBumpItem;
5767
5825
 	private MenuItem pigmentBumpItem;
5826
+	private MenuItem embedTexturesItem;
5827
+	private MenuItem deEmbedTexturesItem;
5768
5828
 
5769
5829
 	private MenuItem particleItem;
5770
5830
 	private MenuItem ragdollItem;