From 7058eef32e524cae08a7373d8bc1061e373b223c Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Wed, 24 Jul 2019 23:51:25 -0400 Subject: [PATCH] Backlit --- GroupEditor.java | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/GroupEditor.java b/GroupEditor.java index 0372f78..f4c7c39 100644 --- a/GroupEditor.java +++ b/GroupEditor.java @@ -528,10 +528,15 @@ attachBumpItem.addActionListener(this); pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump")); pigmentBumpItem.addActionListener(this); + //embedTexturesItem detachPigmentItem = menu.add(new MenuItem("Detach Pigment")); detachPigmentItem.addActionListener(this); detachBumpItem = menu.add(new MenuItem("Detach Bump")); detachBumpItem.addActionListener(this); + embedTexturesItem = menu.add(new MenuItem("Embed Textures")); + embedTexturesItem.addActionListener(this); + deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures")); + deEmbedTexturesItem.addActionListener(this); menu.add("-"); sortbysizeItem = menu.add(new MenuItem("Sort by size")); sortbysizeItem.addActionListener(this); @@ -3169,6 +3174,31 @@ refreshContents(); } else + if (source == embedTexturesItem) + { + Object3D obj; + for (Enumeration e = group.selection.elements(); e.hasMoreElements();) + { + obj = (Object3D)e.nextElement(); + obj.EmbedTextures(true); + } + + refreshContents(); + } else + if (source == deEmbedTexturesItem) + { + Object3D obj; + for (Enumeration e = group.selection.elements(); e.hasMoreElements();) + { + obj = (Object3D)e.nextElement(); + obj.EmbedTextures(false); + } + + CameraPane.texturepigment.clear(); + CameraPane.texturebump.clear(); + + refreshContents(); + } else if (source == flashSelectionButton) { CameraPane.flash = true; @@ -4163,7 +4193,7 @@ try { - texturedata = Globals.theRenderer.GetTextureData(tex.pigmenttexture, pigment, false, node.texres); + texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres); } catch (Exception e) { @@ -5793,6 +5823,8 @@ private MenuItem attachBumpItem; private MenuItem detachBumpItem; private MenuItem pigmentBumpItem; + private MenuItem embedTexturesItem; + private MenuItem deEmbedTexturesItem; private MenuItem particleItem; private MenuItem ragdollItem; -- Gitblit v1.6.2