Min shader.

Normand Briere

2019-07-23 de4f66e0239a736bce24e09c9a0b49b5bb92d84b

 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)
..
..
@@ -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);
..
..
@@ -3151,7 +3158,7 @@
3151
3158
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3152
3159
 			{
3153
3160
 				obj = (Object3D)e.nextElement();
3154
-                                obj.SetBumpTexture(null);
3161
+                                obj.ResetBumpTexture();
3155
3162
 			}
3156
3163
 			
3157
3164
 			refreshContents();
..
..
@@ -3165,6 +3172,31 @@
3165
3172
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3166
3173
 			}
3167
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
+                
3168
3200
 			refreshContents();
3169
3201
 		} else
3170
3202
 		if (source == flashSelectionButton)
..
..
@@ -4161,7 +4193,7 @@
4161
4193
                             
4162
4194
                             try
4163
4195
                             {
4164
-                                texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
4196
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4165
4197
                             }
4166
4198
                             catch (Exception e)
4167
4199
                             {
..
..
@@ -4798,7 +4830,7 @@
4798
4830
 
4799
4831
         void refreshContents(boolean cp)
4800
4832
         {
4801
-            if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4833
+            if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
4802
4834
             if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4803
4835
             {
4804
4836
                 objEditor.ClearInfo(); // .GetMaterial());
..
..
@@ -5791,6 +5823,8 @@
5791
5823
 	private MenuItem attachBumpItem;
5792
5824
 	private MenuItem detachBumpItem;
5793
5825
 	private MenuItem pigmentBumpItem;
5826
+	private MenuItem embedTexturesItem;
5827
+	private MenuItem deEmbedTexturesItem;
5794
5828
 
5795
5829
 	private MenuItem particleItem;
5796
5830
 	private MenuItem ragdollItem;