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 | 42 ++++++++++++++++++++++++++++++++++++++++++
CameraPane.java | 2 +-
icons/shadericons/parallax0.png | 0
icons/shadericons/parallax1.png | 0
icons/shadericons/parallax2.png | 0
5 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 7370fc9..f2785e4 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -12999,7 +12999,7 @@
"POW temp.a, temp.a, params6.w;" + // punch through
"ADD texSamp, temp, texSamp;" +
- "MUL temp.xyz, half, texSamp;" +
+ "MUL texSamp.xyz, half, texSamp;" +
"MOV alpha, texSamp.aaaa;" +
diff --git a/ObjEditor.java b/ObjEditor.java
index 3f3be5b..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;
diff --git a/icons/shadericons/parallax0.png b/icons/shadericons/parallax0.png
new file mode 100644
index 0000000..32adeeb
--- /dev/null
+++ b/icons/shadericons/parallax0.png
Binary files differ
diff --git a/icons/shadericons/parallax1.png b/icons/shadericons/parallax1.png
new file mode 100644
index 0000000..d3883e6
--- /dev/null
+++ b/icons/shadericons/parallax1.png
Binary files differ
diff --git a/icons/shadericons/parallax2.png b/icons/shadericons/parallax2.png
new file mode 100644
index 0000000..efbeb25
--- /dev/null
+++ b/icons/shadericons/parallax2.png
Binary files differ
--
Gitblit v1.6.2