From 98896326eb94666451b7e419becfb5d721840313 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 10 Jun 2019 20:36:03 -0400
Subject: [PATCH] Fix shadow in light mode
---
Composite.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Composite.java b/Composite.java
index 2a20ab9..1d9e036 100644
--- a/Composite.java
+++ b/Composite.java
@@ -205,6 +205,7 @@
boolean HasLoops()
{
+ new Exception().printStackTrace();
System.exit(0);
if (blockloop)
{
@@ -348,6 +349,7 @@
void getBounds0(cVector minima, cVector maxima, boolean xform)
{
+ new Exception().printStackTrace();
System.exit(0);
minima.x = minima.y = minima.z = 1E10;
maxima.x = maxima.y = maxima.z = -1E10;
@@ -822,7 +824,7 @@
}
- void draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
+ void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
{
if (this instanceof BezierPatch)
{
@@ -837,7 +839,7 @@
}
if ((//display.drawMode == CameraPane.SHADOW ||
- display.drawMode == CameraPane.SELECTION || CameraPane.DEBUG_SELECTION) &&
+ display.DrawMode() == CameraPane.SELECTION || display.IsDebugSelection()) &&
//HasTransparency())
// SERIAL PATCH
// if (viewCode == -1)
@@ -855,7 +857,7 @@
cTexture tex = null;
- boolean selectmode = display.drawMode == display.SELECTION || CameraPane.DEBUG_SELECTION;
+ boolean selectmode = display.DrawMode() == display.SELECTION || display.IsDebugSelection();
if (//display.drawMode != display.SHADOW &&
!selectmode // display.drawMode != display.SELECTION
@@ -864,7 +866,14 @@
tex = GetTextures();
}
- display.BindTextures(tex, texres);
+ try
+ {
+ display.BindTextures(tex, texres);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAILED: " + this);
+ }
if (//true) // new NORMAND
touched || softtouched)
@@ -994,7 +1003,7 @@
// }
// }
- void drawSelfOld(CameraPane display, Object3D /*Composite*/ root, boolean selected)
+ void drawSelfOld(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
{
// if (count <= 0) // || display.IsFreezed())
// {
--
Gitblit v1.6.2