From 8f471ab58f8676229d29cde03aba3597d096cf84 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 14 Oct 2019 20:07:35 -0400
Subject: [PATCH] Color/parallax
---
Object3D.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 0843864..31964db 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -1428,7 +1428,7 @@
blockloop = true;
- other.parent = parent;
+ // other.parent = parent;
//System.out.println("COPY " + this + " to " + other);
//new Exception().printStackTrace();
@@ -1464,7 +1464,7 @@
Object3D obj = (Object3D)Children().get(i);
if (IsContainedIn(obj))
{
-// assert(false); // ?!?!?!?!?!
+ assert(false); // ?!?!?!?!?!
c.Children().setElementAt(c, i);
}
else
@@ -2562,7 +2562,7 @@
return b;
}
- void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate)
+ void UpdateMaterial(cMaterial anchor, cMaterial current, boolean propagate, boolean colorparallax)
{
if (blockloop)
{
@@ -2572,7 +2572,7 @@
// super.UpdateMaterial(anchor, current, false);
if (material != null)
{
- material.UpdateMaterial(anchor, current);
+ material.UpdateMaterial(anchor, current, colorparallax);
}
if (!propagate)
@@ -2586,7 +2586,7 @@
if (child == null)
continue;
blockloop = true;
- child.UpdateMaterial(anchor, current, propagate);
+ child.UpdateMaterial(anchor, current, propagate, false);
blockloop = false;
Children().release(i);
}
@@ -2600,7 +2600,7 @@
if (child == null)
continue;
blockloop = true;
- child.UpdateMaterial(anchor, current, propagate);
+ child.UpdateMaterial(anchor, current, propagate, false);
blockloop = false;
Children().release(i);
}
--
Gitblit v1.6.2