From 0c7b833be7d86598a6813cd1c6db0ca9e1b17966 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 21 Aug 2019 23:22:47 -0400
Subject: [PATCH] Clear versions.
---
ObjEditor.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index b28d50a..83bebe7 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -383,14 +383,6 @@
client = inClient;
copy = client;
- if (copy.versionlist == null)
- {
- copy.versionlist = new Object3D[100];
- copy.versionindex = -1;
-
-// Save(true);
- }
-
SetupUI2(callee.GetEditor());
}
@@ -1884,9 +1876,9 @@
if (Globals.ADVANCED)
{
- tabbedPane.add(infoPanel);
- tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
- tabbedPane.setToolTipTextAt(4, "Information");
+ objectPanel.add(infoPanel);
+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
+ objectPanel.setToolTipTextAt(4, "Information");
}
/*
@@ -2370,7 +2362,7 @@
{
public void mouseClicked(MouseEvent e)
{
- borderfadeField.setFloat(0.5);
+ borderfadeField.setFloat(0.4);
opacityField.setFloat(0.75);
materialtouched = true;
@@ -2443,7 +2435,7 @@
{
public void mouseClicked(MouseEvent e)
{
- parallaxField.setFloat(0.25);
+ parallaxField.setFloat(0.125);
materialtouched = true;
applySelf();
@@ -2457,7 +2449,7 @@
{
public void mouseClicked(MouseEvent e)
{
- parallaxField.setFloat(0.255);
+ parallaxField.setFloat(0.13);
materialtouched = true;
applySelf();
@@ -2471,7 +2463,7 @@
{
public void mouseClicked(MouseEvent e)
{
- parallaxField.setFloat(0.265);
+ parallaxField.setFloat(0.14);
materialtouched = true;
applySelf();
@@ -2727,7 +2719,7 @@
cGridBag parallax = new cGridBag();
parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
- parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
colorSection.add(parallax);
//panel.add(new JSeparator());
@@ -3781,7 +3773,7 @@
shadowField.setFloat(mat.shadow);
textureField.setFloat(mat.texture);
opacityField.setFloat(mat.opacity);
- parallaxField.setFloat(mat.parallax + 0.25f);
+ parallaxField.setFloat(mat.parallax + 0.125f);
fakedepthField.setFloat(mat.fakedepth);
shadowbiasField.setFloat(mat.shadowbias);
bumpField.setInteger(1); // dec 2013
@@ -4475,7 +4467,11 @@
System.err.println("Save");
Replace();
- //cRadio tab = GetCurrentTab();
+ if (copy.versionlist == null)
+ {
+ copy.versionlist = new Object3D[100];
+ copy.versionindex = -1;
+ }
Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
@@ -4649,7 +4645,7 @@
//cRadio tab = GetCurrentTab();
- if (copy.versionlist == null)
+ if (copy.versionindex == -2)
{
saveVersionButton.setEnabled(false);
restoreButton.setEnabled(false);
@@ -5006,7 +5002,7 @@
current.shadow = (float) shadowField.getFloat();
current.texture = (float) textureField.getFloat();
current.opacity = (float) opacityField.getFloat();
- current.parallax = (float) parallaxField.getFloat() - 0.25f;
+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
current.fakedepth = (float) fakedepthField.getFloat();
current.shadowbias = (float) shadowbiasField.getFloat();
--
Gitblit v1.6.2