From 4629090fafbef256abd0686a85ee12042d658868 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 12 Jun 2019 22:37:48 -0400
Subject: [PATCH] Mocap big data
---
Composite.java | 78 ++++++++++++++++++++++-----------------
1 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/Composite.java b/Composite.java
index 6156d60..2a525ae 100644
--- a/Composite.java
+++ b/Composite.java
@@ -160,36 +160,37 @@
// //Touch();
// }
- public void clear()
- {
- if (blockloop)
- {
- //blockloop = false;
- return;
- }
-
- blockloop = true;
- //Applet3D.tracein("Clear", this);
- for (int i = 0; i < Children().size(); i++)
- {
- Object3D obj = (Object3D) Children().get(i); // reserve(i);
-
- //if (!obj.ReadOnly()) // Object3D Serial...
- if (!(obj instanceof Composite) || !((Composite) obj).ReadOnly())
- {
- obj.clear();
- //Children().release(i);
- Children().remove(i);
- --i;
- } else
- {
- //Children().release(i);
- }
- }
- //Applet3D.traceout("Clear", this);
-
- blockloop = false;
- }
+ // JUNE 2019??? That cannot work...
+// public void clear()
+// {
+// if (blockloop)
+// {
+// //blockloop = false;
+// return;
+// }
+//
+// blockloop = true;
+// //Applet3D.tracein("Clear", this);
+// for (int i = 0; i < Children().size(); i++)
+// {
+// Object3D obj = (Object3D) Children().get(i); // reserve(i);
+//
+// //if (!obj.ReadOnly()) // Object3D Serial...
+// if (!(obj instanceof Composite) || !((Composite) obj).ReadOnly())
+// {
+// obj.clear();
+// //Children().release(i);
+// Children().remove(i);
+// --i;
+// } else
+// {
+// //Children().release(i);
+// }
+// }
+// //Applet3D.traceout("Clear", this);
+//
+// blockloop = false;
+// }
boolean ReadOnly()
{
@@ -205,6 +206,7 @@
boolean HasLoops()
{
+ new Exception().printStackTrace();
System.exit(0);
if (blockloop)
{
@@ -348,6 +350,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;
@@ -837,7 +840,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 +858,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 +867,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 +1004,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