From 6a823ffbfcda4c843f46e02e83c869d5bc323e25 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 21 Aug 2019 20:15:53 -0400
Subject: [PATCH] Parallax presets
---
ObjEditor.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index a9b5c11..b28d50a 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -2437,6 +2437,48 @@
});
presetpanel.add(shadowShader);
+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
+ para0.setToolTipText("No parallax");
+ para0.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ parallaxField.setFloat(0.25);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(para0);
+
+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
+ para1.setToolTipText("With parallax");
+ para1.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ parallaxField.setFloat(0.255);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(para1);
+
+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
+ para2.setToolTipText("Reset parallax");
+ para2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ parallaxField.setFloat(0.265);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(para2);
+
cGridBag panel = new cGridBag().setVertical(true);
presetpanel.preferredWidth = 1;
@@ -2682,6 +2724,12 @@
backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
colorSection.add(backlit);
+ 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);
+ colorSection.add(parallax);
+
//panel.add(new JSeparator());
//panel.add(globalSection);
@@ -3733,6 +3781,7 @@
shadowField.setFloat(mat.shadow);
textureField.setFloat(mat.texture);
opacityField.setFloat(mat.opacity);
+ parallaxField.setFloat(mat.parallax + 0.25f);
fakedepthField.setFloat(mat.fakedepth);
shadowbiasField.setFloat(mat.shadowbias);
bumpField.setInteger(1); // dec 2013
@@ -4957,6 +5006,7 @@
current.shadow = (float) shadowField.getFloat();
current.texture = (float) textureField.getFloat();
current.opacity = (float) opacityField.getFloat();
+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
current.fakedepth = (float) fakedepthField.getFloat();
current.shadowbias = (float) shadowbiasField.getFloat();
@@ -5011,6 +5061,8 @@
textureField.SetToolTipValue((mat.texture));
if (!Equal(opacityField.getFloat(), mat.opacity))
opacityField.SetToolTipValue((mat.opacity));
+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
+ parallaxField.SetToolTipValue((mat.parallax));
if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
fakedepthField.SetToolTipValue((mat.fakedepth));
if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
@@ -6267,6 +6319,8 @@
cNumberSlider textureField;
JLabel opacityLabel;
cNumberSlider opacityField;
+ JLabel parallaxLabel;
+ cNumberSlider parallaxField;
JLabel fakedepthLabel;
cNumberSlider fakedepthField;
JLabel shadowbiasLabel;
--
Gitblit v1.6.2