From b3ae4e889872ca0b9ca76f1d17b2f0b961226729 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 05 Aug 2019 21:48:55 -0400
Subject: [PATCH] Fix physics UI
---
cSpring.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/cSpring.java b/cSpring.java
index fcf1d91..b5d339c 100644
--- a/cSpring.java
+++ b/cSpring.java
@@ -543,13 +543,13 @@
}
// serial lost
- void DrawNode0(CameraPane display)
+ void DrawNode0(iCameraPane display)
{
super.DrawNode(display, null, false);
}
- void DrawNode/*notused*/(CameraPane display, Object3D /*Composite*/ root, boolean selected)
+ void DrawNode/*notused*/(iCameraPane display, Object3D /*Composite*/ root, boolean selected)
{
// assert displaylist == -1;
@@ -565,7 +565,7 @@
// }
//new Exception().printStackTrace();
- GL gl = display.GetGL(); // getGL();
+ GL gl = display.GetGL0(); // getGL();
//gl.glDisable(GL.GL_LIGHTING);
@@ -1208,7 +1208,10 @@
}
if (edges.size()%2 != 0)
+ {
+ new Exception().printStackTrace();
System.exit(0);
+ }
}
// if (clearsprings)
@@ -1516,7 +1519,10 @@
second = springs.get((i+1)%springs.size());
if (first == second)
+ {
+ new Exception().printStackTrace();
System.exit(0);
+ }
temp.set(first.GetOther(this).position);
temp.sub(position);
@@ -1646,7 +1652,10 @@
Spring second = springs.get((i+1)%springs.size());
if (first == second)
+ {
+ new Exception().printStackTrace();
System.exit(0);
+ }
temp.set(first.GetOther(this).position);
temp.sub(position);
@@ -1715,7 +1724,7 @@
// Phys.matrix.Transform(normal);
- if (position instanceof Vertex)
+ if (position instanceof Vertex && ((Vertex)position).norm != null)
((Vertex)position).norm.set(normal.x,normal.y,normal.z);
}
@@ -3289,6 +3298,7 @@
if (N2.mass == Float.MAX_VALUE)
{
+ new Exception().printStackTrace();
System.exit(0);
magnitude *= solidity; // * K;
--
Gitblit v1.6.2