From 9cf2c36d644d0aaa28797f57a3e71591d8e66973 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 06 Oct 2019 10:56:18 -0400
Subject: [PATCH] Save image helper.
---
Object3D.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 7a66915..0843864 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -41,7 +41,7 @@
java.util.Hashtable<java.util.UUID, Object3D> versiontable; // = new java.util.Hashtable<java.util.UUID, Object3D>();
- int tabIndex;
+ transient int tabIndex; // Tabs can change between sessions.
ScriptNode scriptnode;
@@ -1142,6 +1142,8 @@
(Globals.DrawMode() == iCameraPane.SHADOW || !Globals.RENDERSHADOW || !Globals.COMPUTESHADOWWHENLIVE) &&
currentframe != Globals.framecount)
{
+ Globals.lighttouched = true;
+
currentframe = Globals.framecount;
// System.err.println("transformcount = " + transformcount);
@@ -3419,7 +3421,7 @@
}
}
- public void Scale(int scale)
+ public void Scale(float scale)
{
Object3D obj = this;
@@ -6200,7 +6202,7 @@
// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
}
- if (live && Link2Support() && support == null && !this.marked) // project on ground
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
{
getBounds(minima, maxima, true);
center.x = (minima.x + maxima.x) / 2;
@@ -6301,7 +6303,7 @@
if (!selectmode && //display.DrawMode() != display.SELECTION &&
//(touched || (bRep != null && bRep.displaylist <= 0)))
- (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
+ ((Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE) || touched)) // || (bRep != null && bRep.displaylist <= 0)))
{
Globals.lighttouched = true;
} // all panes...
@@ -6856,7 +6858,8 @@
//javax.media.opengl.GL gl = display.GetGL();
- if (CameraPane.BOXMODE && !Link2Support()) //selected) // || CameraPane.movingcamera)
+ if (CameraPane.BOXMODE && //!Link2Support()) //
+ !selected) // || CameraPane.movingcamera)
{
int fc = bRep.FaceCount();
int vc = bRep.VertexCount();
--
Gitblit v1.6.2