Embed JPEG.

Normand Briere

2019-07-23 cf7cfa1c792eebba606a48aa648893f6e4873263

 GroupEditor.java
..
..
@@ -80,18 +80,20 @@
80
80
 		this.copy = this.group = copy;
81
81
 		//selectees = this.group.selectees;
82
82
 		
83
-        if (copy.versions == null)
84
-        {
85
-            copy.versions = new byte[100][];
86
-            copy.versionindex = -1;
87
-        }
88
-        
89
83
 		SetupMenu2(this); //objEditor);
90
84
 		SetupUI2(objEditor);
91
85
 		objEditor.SetupUI(true);
92
86
 		SetupViews(objEditor);
93
87
                 
94
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
+        }
95
97
 	}
96
98
 
97
99
     void CloneSelection(boolean supports)
..
..
@@ -206,8 +208,8 @@
206
208
 //		pasteExpandItem = menu.add(new MenuItem("Paste expand"));
207
209
 //		pasteExpandItem.addActionListener(this);
208
210
 		menu.add("-");
209
-		clearItem = menu.add(new MenuItem("Clear"));
210
-		clearItem.addActionListener(this);
211
+		deleteItem = menu.add(new MenuItem("Delete"));
212
+		deleteItem.addActionListener(this);
211
213
                 
212
214
         if (Globals.ADVANCED)
213
215
         {
..
..
@@ -433,7 +435,7 @@
433
435
 		genNormalsMESHItem.addActionListener(this);
434
436
         if (Globals.ADVANCED)
435
437
         {
436
-		genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
438
+		genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
437
439
 		genNormalsMINEItem.addActionListener(this);
438
440
         }
439
441
 		stripifyItem = menu.add(new MenuItem("Stripify"));
..
..
@@ -526,10 +528,15 @@
526
528
 		attachBumpItem.addActionListener(this);
527
529
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
528
530
 		pigmentBumpItem.addActionListener(this);
531
+                //embedTexturesItem
529
532
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
530
533
 		detachPigmentItem.addActionListener(this);
531
534
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
532
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);
533
540
 		menu.add("-");
534
541
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
535
542
 		sortbysizeItem.addActionListener(this);
..
..
@@ -685,27 +692,28 @@
685
692
 
686
693
 		//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
687
694
                 
688
-		oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
689
-                twoButton.setToolTipText("Show center view only");
690
-		twoButton.addActionListener(this);
691
-                this.fullscreenLayout = twoButton;
692
-                
693
695
 		oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
694
696
 		fourButton.addActionListener(this);
695
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
+                
696
704
 		oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
697
-                sixButton.setToolTipText("2-column layout left");
705
+                sixButton.setToolTipText("Show left and right");
698
706
 		sixButton.addActionListener(this);
699
-		oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
700
-                threeButton.setToolTipText("2-column layout right");
701
-		threeButton.addActionListener(this);
702
-		oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
703
-                sevenButton.setToolTipText("3-column layout");
704
-		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);
705
713
                 //
706
714
 
707
-		oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
708
-                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");
709
717
 		rootButton.addActionListener(this);
710
718
 
711
719
                 oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..
..
@@ -871,7 +879,7 @@
871
879
 		dgr.addDragGestureListener(this);
872
880
 		}catch(Exception e) {}
873
881
 		*/
874
-        radio.layout = sevenButton;
882
+        radio.layout = sixButton; // sevenButton;
875
883
         oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
876
884
 	}
877
885
         
..
..
@@ -1013,7 +1021,7 @@
1013
1021
             }
1014
1022
             
1015
1023
             radioButton.SetObject(obj);
1016
-            radioButton.layout = sevenButton;
1024
+            radioButton.layout = sixButton; // sevenButton;
1017
1025
             radioButton.SetCamera(cameraView.renderCamera, false);
1018
1026
             radioButton.addActionListener(this);
1019
1027
             radioPanel.add(radioButton);
..
..
@@ -1692,6 +1700,16 @@
1692
1700
                 listUI.remove(i);
1693
1701
             }
1694
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
1695
1713
     }
1696
1714
         
1697
1715
     /**
..
..
@@ -2658,7 +2676,7 @@
2658
2676
 		{
2659
2677
 			StepAll();
2660
2678
 		} else
2661
-		if (source == clearItem) // || event.getSource() == clearButton)
2679
+		if (source == deleteItem) // || event.getSource() == clearButton)
2662
2680
 		{
2663
2681
 			//int indices[] = jList.getSelectedIndices();
2664
2682
 			//for (int i = indices.length - 1; i >= 0; i--)
..
..
@@ -3140,7 +3158,7 @@
3140
3158
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3141
3159
 			{
3142
3160
 				obj = (Object3D)e.nextElement();
3143
-                                obj.SetBumpTexture(null);
3161
+                                obj.ResetBumpTexture();
3144
3162
 			}
3145
3163
 			
3146
3164
 			refreshContents();
..
..
@@ -3154,6 +3172,31 @@
3154
3172
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3155
3173
 			}
3156
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
+                
3157
3200
 			refreshContents();
3158
3201
 		} else
3159
3202
 		if (source == flashSelectionButton)
..
..
@@ -3553,10 +3596,10 @@
3553
3596
                     radio.layout.doClick();
3554
3597
                     
3555
3598
                     ClearUnpinned();
3556
-                    Grafreed.Assert(group != null);
3557
-                    Grafreed.Assert(group.selection != null);
3558
-                    SetPinStates(group.selection.size() > 0);
3559
-                    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)
3560
3603
                         EditSelection(false);
3561
3604
                     keepparent = group.parent;
3562
3605
                     // PARENT = NULL or not???
..
..
@@ -4150,7 +4193,7 @@
4150
4193
                             
4151
4194
                             try
4152
4195
                             {
4153
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4196
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4154
4197
                             }
4155
4198
                             catch (Exception e)
4156
4199
                             {
..
..
@@ -4627,6 +4670,12 @@
4627
4670
 	
4628
4671
 	void EditSelection(boolean newWindow)
4629
4672
 	{
4673
+                if (group.selection == null)
4674
+                {
4675
+                     EditElement(group, newWindow); // ? new
4676
+                     return;
4677
+                }
4678
+                
4630
4679
         //    aConstraints.gridy = 0;
4631
4680
 		for (int i=0; i<group.selection.size(); i++)
4632
4681
 		{
..
..
@@ -4637,12 +4686,7 @@
4637
4686
 			Object3D elem = (Object3D)group.selection.elementAt(i);
4638
4687
                         if(elem != group || !newWindow)
4639
4688
                         {
4640
-                        //    if (!(elem instanceof Composite))
4641
-                        //        newWindow = false;
4642
-                            listUI.add(elem);
4643
-                            elem.openEditWindow(this, newWindow); //, false);
4644
-                            System.out.println("edit : " + elem);
4645
-                            elem.editWindow.refreshContents(true); // ? new
4689
+                            EditElement(elem, newWindow); // ? new
4646
4690
                         }
4647
4691
 		}
4648
4692
 	}
..
..
@@ -4786,7 +4830,7 @@
4786
4830
 
4787
4831
         void refreshContents(boolean cp)
4788
4832
         {
4789
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4833
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4790
4834
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4791
4835
             {
4792
4836
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -5695,7 +5739,7 @@
5695
5739
 	private MenuItem pasteLinkItem;
5696
5740
 	private MenuItem pasteCloneItem;
5697
5741
 	private MenuItem pasteExpandItem;
5698
-	private MenuItem clearItem;
5742
+	private MenuItem deleteItem;
5699
5743
 	private MenuItem clearAllItem;
5700
5744
 	private MenuItem genUVItem;
5701
5745
 	private MenuItem genNormalsMESHItem;
..
..
@@ -5779,6 +5823,8 @@
5779
5823
 	private MenuItem attachBumpItem;
5780
5824
 	private MenuItem detachBumpItem;
5781
5825
 	private MenuItem pigmentBumpItem;
5826
+	private MenuItem embedTexturesItem;
5827
+	private MenuItem deEmbedTexturesItem;
5782
5828
 
5783
5829
 	private MenuItem particleItem;
5784
5830
 	private MenuItem ragdollItem;