From ab9e1281ca1ccb3e5d01eb24934f81c1072114f2 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 12 Sep 2019 21:14:10 -0400
Subject: [PATCH] Four new presets + sort option.
---
CameraPane.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index f05e777..232593d 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -3601,6 +3601,8 @@
};
/**/
+ static Object3D lastObject;
+
//com.sun.opengl.util.texture.Texture
TextureData
GetFileTexture(String name, boolean bump, int resolution)
@@ -3637,6 +3639,8 @@
// return null;
//if (i == 2)
// return null;
+ // TIFF issue sept 2019
+ System.err.println("lastObject = " + lastObject);
e.printStackTrace();
name = name.split("\\.tif")[0] + ".jpg";
}
@@ -15753,6 +15757,16 @@
break;
case 'l':
lightMode ^= true;
+ if (lightMode)
+ {
+ keepshadow = Globals.RENDERSHADOW;
+ Globals.RENDERSHADOW = false;
+ }
+ else
+ {
+ Globals.RENDERSHADOW = keepshadow;
+ }
+
Globals.lighttouched = true;
manipCamera = renderCamera = lightMode ? lightCamera : eyeCamera;
targetLookAt.set(manipCamera.lookAt);
@@ -17410,7 +17424,7 @@
float depth = depths[y * TEX_SIZE + x];
- if (pointselection && mouseMode == SELECT && depth != 0 && depth != 1)
+ if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
{
pointselection = false;
@@ -18075,6 +18089,8 @@
boolean OCCLUSION_CULLING = false; //true;
public boolean lightMode = false;
+ private boolean keepshadow;
+
public boolean capsLocked = false; // VR
static public int indexcount = 0;
--
Gitblit v1.6.2