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 | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 35727f1..4b4a90a 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -433,6 +433,8 @@
ChangeListener changeListener = new ChangeListener()
{
+ String name;
+
public void stateChanged(ChangeEvent changeEvent)
{
// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
@@ -451,7 +453,36 @@
// EditSelection(false);
// }
+ 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);
@@ -4129,7 +4160,7 @@
{
//Save(true);
Replace();
- SetUndoStates();
+ SetVersionStates();
}
private boolean Equal(byte[] compress, byte[] name)
@@ -4159,7 +4190,7 @@
CopyChanged();
- SetUndoStates();
+ SetVersionStates();
}
public boolean Save(boolean user)
@@ -4205,7 +4236,7 @@
// copy.versionlist[i] = null;
// }
- SetUndoStates();
+ SetVersionStates();
// test save
if (false)
@@ -4265,7 +4296,7 @@
{
Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
- SetUndoStates();
+ SetVersionStates();
boolean temp = CameraPane.SWITCH;
CameraPane.SWITCH = false;
@@ -4332,7 +4363,7 @@
return count;
}
- void SetUndoStates()
+ void SetVersionStates()
{
//if (true)
// return;
@@ -5111,7 +5142,7 @@
}
if (previousVersionButton != null && copy.versionlist != null)
- SetUndoStates();
+ SetVersionStates();
}
static TweenManager tweenManager = new TweenManager();
@@ -5596,6 +5627,8 @@
void save()
{
+ Replace();
+
if (lastname == null)
{
return;
--
Gitblit v1.6.2