From 91106535bc5aa5e67cbb02a67cf6de1519cba0e4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 13:27:24 -0400
Subject: [PATCH] iCameraPane refactoring phase 1.
---
BoundaryRep.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/BoundaryRep.java b/BoundaryRep.java
index 3a1d080..655d595 100644
--- a/BoundaryRep.java
+++ b/BoundaryRep.java
@@ -790,7 +790,7 @@
v.weights[k] = other.ComputeWeight(v, toRoot, k); // (float)(supportsize * normalweight * nz / Math.pow(tx*tx+ty*ty+tz*tz, 1));
v.totalweight += v.weights[k];
- if (CameraPane.CROWD)
+ if (Globals.CROWD)
{
// System.out.print("weight = " + v.weights[k]);
// System.out.println("; totalweight = " + v.totalweight);
@@ -2668,11 +2668,11 @@
tmp.set(v);
tmp.sub(eye);
- if (CameraPane.framecount - lastsoundtime > 30) // 0.25 secs
+ if (Globals.framecount - lastsoundtime > 30) // 0.25 secs
{
GrafreeD.wav.play((Math.random()+0.5)/Math.max(tmp.length2(),0.2)); //, 1);
- lastsoundtime = CameraPane.framecount;
+ lastsoundtime = Globals.framecount;
}
stepout = false;
@@ -4948,7 +4948,7 @@
{
Vertex v = GetVertex(i);
- if (v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
+ if (v.norm == null || v.norm.x == 0 && v.norm.y == 0 && v.norm.z == 0)
continue;
from.set(v.x, v.y, v.z);
--
Gitblit v1.6.2