Complete min shader.

Normand Briere

2019-07-23 0f4fa9dc4191aaee9661c1e6d73725436ae64ac2

 GroupEditor.java
..
..
@@ -528,10 +528,15 @@
528
528
 		attachBumpItem.addActionListener(this);
529
529
 		pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
530
530
 		pigmentBumpItem.addActionListener(this);
531
+                //embedTexturesItem
531
532
 		detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
532
533
 		detachPigmentItem.addActionListener(this);
533
534
 		detachBumpItem = menu.add(new MenuItem("Detach Bump"));
534
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);
535
540
 		menu.add("-");
536
541
 		sortbysizeItem = menu.add(new MenuItem("Sort by size"));
537
542
 		sortbysizeItem.addActionListener(this);
..
..
@@ -3153,7 +3158,7 @@
3153
3158
 			for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3154
3159
 			{
3155
3160
 				obj = (Object3D)e.nextElement();
3156
-                                obj.SetBumpTexture(null);
3161
+                                obj.ResetBumpTexture();
3157
3162
 			}
3158
3163
 			
3159
3164
 			refreshContents();
..
..
@@ -3167,6 +3172,31 @@
3167
3172
                                 obj.SetBumpTexture(obj.GetPigmentTexture());
3168
3173
 			}
3169
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
+                
3170
3200
 			refreshContents();
3171
3201
 		} else
3172
3202
 		if (source == flashSelectionButton)
..
..
@@ -4163,7 +4193,7 @@
4163
4193
                             
4164
4194
                             try
4165
4195
                             {
4166
-                                texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres);
4196
+                                texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
4167
4197
                             }
4168
4198
                             catch (Exception e)
4169
4199
                             {
..
..
@@ -5793,6 +5823,8 @@
5793
5823
 	private MenuItem attachBumpItem;
5794
5824
 	private MenuItem detachBumpItem;
5795
5825
 	private MenuItem pigmentBumpItem;
5826
+	private MenuItem embedTexturesItem;
5827
+	private MenuItem deEmbedTexturesItem;
5796
5828
 
5797
5829
 	private MenuItem particleItem;
5798
5830
 	private MenuItem ragdollItem;