From c67de8aca04d988179191ccb52461af00125920e Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Tue, 13 Aug 2019 11:41:53 -0400 Subject: [PATCH] RGB skybox --- ObjEditor.java | 97 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 25 deletions(-) diff --git a/ObjEditor.java b/ObjEditor.java index 389e50d..4b4a90a 100644 --- a/ObjEditor.java +++ b/ObjEditor.java @@ -297,11 +297,13 @@ client = inClient; copy = client; - if (copy.versionlist == null) - { - copy.versionlist = new Object3D[100]; - copy.versionindex = -1; - } +// if (copy.versionlist == null) +// { +// copy.versionlist = new Object3D[100]; +// copy.versionindex = -1; +// +// callee.Save(true); +// } // "this" is not called: SetupUI2(objEditor); } @@ -320,6 +322,8 @@ { copy.versionlist = new Object3D[100]; copy.versionindex = -1; + +// Save(true); } SetupUI2(callee.GetEditor()); @@ -354,11 +358,13 @@ copy = localCopy; copy.editWindow = this; - if (copy.versionlist == null) - { -// copy.versions = new byte[100][]; +// if (copy.versionlist == null) +// { +// copy.versionlist = new Object3D[100]; // copy.versionindex = -1; - } +// +// Save(true); +// } SetupMenu(); @@ -427,6 +433,8 @@ ChangeListener changeListener = new ChangeListener() { + String name; + public void stateChanged(ChangeEvent changeEvent) { // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed) @@ -445,7 +453,36 @@ // EditSelection(false); // } - refreshContents(false); // To refresh Info tab + if (objectPanel.getSelectedIndex() == 4) + { + name = copy.skyboxname; + + if (name == null) + { + name = ""; + } + + copy.skyboxname = "cubemaps/default-skyboxes/rgb"; + copy.skyboxext = "jpg"; + } + else + { + if (name != null) + { + if (name.equals("")) + { + copy.skyboxname = null; + copy.skyboxext = null; + } + else + { + copy.skyboxname = name; + } + } + } + +// refreshContents(false); // To refresh Info tab + cameraView.repaint(); } }; objectPanel.addChangeListener(changeListener); @@ -4123,7 +4160,7 @@ { //Save(true); Replace(); - SetUndoStates(); + SetVersionStates(); } private boolean Equal(byte[] compress, byte[] name) @@ -4153,7 +4190,7 @@ CopyChanged(); - SetUndoStates(); + SetVersionStates(); } public boolean Save(boolean user) @@ -4161,7 +4198,7 @@ System.err.println("Save"); Replace(); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"? @@ -4199,7 +4236,7 @@ // copy.versionlist[i] = null; // } - SetUndoStates(); + SetVersionStates(); // test save if (false) @@ -4259,7 +4296,7 @@ { Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]); - SetUndoStates(); + SetVersionStates(); boolean temp = CameraPane.SWITCH; CameraPane.SWITCH = false; @@ -4326,12 +4363,15 @@ return count; } - void SetUndoStates() + void SetVersionStates() { - cRadio tab = GetCurrentTab(); + //if (true) + // return; + + //cRadio tab = GetCurrentTab(); - restoreButton.setEnabled(true); // copy.versionindex != -1); - replaceButton.setEnabled(true); // copy.versionindex != -1); + restoreButton.setEnabled(copy.versionindex != -1); + replaceButton.setEnabled(copy.versionindex != -1); previousVersionButton.setEnabled(copy.versionindex > 0); nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null); @@ -4340,8 +4380,10 @@ copy.versionlist[copy.versionindex + 1] != null); muteSlider = true; + versionSlider.setMinimum(0); versionSlider.setMaximum(VersionCount() - 1); versionSlider.setInteger(copy.versionindex); + versionSlider.setEnabled(copy.versionindex != -1); muteSlider = false; } @@ -4352,7 +4394,7 @@ System.err.println("Undo"); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionindex == 0) { @@ -4384,7 +4426,7 @@ { System.err.println("Restore"); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null) { @@ -4402,7 +4444,7 @@ { System.err.println("Replace"); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null) { @@ -4420,7 +4462,7 @@ // Option? Replace(); - cRadio tab = GetCurrentTab(); + //cRadio tab = GetCurrentTab(); if (copy.versionlist[copy.versionindex + 1] == null) { @@ -4741,7 +4783,7 @@ int version = versionSlider.getInteger(); - if (copy.versionlist[version] != null) + if (version != -1 && copy.versionlist[version] != null) { copy.versionindex = version; CopyChanged(); @@ -5100,7 +5142,7 @@ } if (previousVersionButton != null && copy.versionlist != null) - SetUndoStates(); + SetVersionStates(); } static TweenManager tweenManager = new TweenManager(); @@ -5489,8 +5531,11 @@ if (copy.versionlist == null) { + // Backward compatibility copy.versionlist = new Object3D[100]; copy.versionindex = -1; + + Save(true); } //? SetUndoStates(); @@ -5582,6 +5627,8 @@ void save() { + Replace(); + if (lastname == null) { return; -- Gitblit v1.6.2