From 631719825b865aaf9fa1cb124d9fc5bd9dd78bd4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 10:27:02 -0400
Subject: [PATCH] Disabled timer for instant selection.
---
Object3D.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 deletions(-)
diff --git a/Object3D.java b/Object3D.java
index 1478589..76593d2 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -2477,13 +2477,13 @@
return retval;
}
- void doEditDrag(ClickInfo info)
+ void doEditDrag(ClickInfo info, boolean opposite)
{
switch (doSomething)
{
case 1: // '\001'
//super.
- doEditDrag0(info);
+ doEditDrag0(info, opposite);
break;
case 2: // '\002'
@@ -2496,11 +2496,11 @@
{
//sel.hitSomething = childToDrag.hitSomething;
//childToDrag.doEditDrag(info);
- sel.doEditDrag(info);
+ sel.doEditDrag(info, opposite);
} else
{
//super.
- doEditDrag0(info);
+ doEditDrag0(info, opposite);
}
}
break;
@@ -5159,10 +5159,34 @@
// System.out.println("Fullname = " + fullname);
- if (fullname.name.indexOf(":") == -1)
- return fullname.name;
+ // Does not work on Windows due to C:
+// if (fullname.name.indexOf(":") == -1)
+// return fullname.name;
+//
+// return fullname.name.substring(0,fullname.name.indexOf(":"));
- return fullname.name.substring(0,fullname.name.indexOf(":"));
+ String[] split = fullname.name.split(":");
+
+ if (split.length == 0)
+ {
+ return "";
+ }
+
+ if (split.length <= 2)
+ {
+ if (fullname.name.endsWith(":"))
+ {
+ // Windows
+ return fullname.name.substring(0, fullname.name.length()-1);
+ }
+
+ return split[0];
+ }
+
+ // Windows
+ assert(split.length == 4);
+
+ return split[0] + ":" + split[1];
}
static String GetBump(cTexture fullname)
@@ -5171,10 +5195,38 @@
return "";
// System.out.println("Fullname = " + fullname);
- if (fullname.name.indexOf(":") == -1)
- return "";
-
- return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
+ // Does not work on Windows due to C:
+// if (fullname.name.indexOf(":") == -1)
+// return "";
+//
+// return fullname.name.substring(fullname.name.indexOf(":")+1,fullname.name.length());
+ String[] split = fullname.name.split(":");
+
+ if (split.length == 0)
+ {
+ return "";
+ }
+
+ if (split.length == 1)
+ {
+ return "";
+ }
+
+ if (split.length == 2)
+ {
+ if (fullname.name.endsWith(":"))
+ {
+ // Windows
+ return "";
+ }
+
+ return split[1];
+ }
+
+ // Windows
+ assert(split.length == 4);
+
+ return split[2] + ":" + split[3];
}
String GetPigmentTexture()
@@ -5248,7 +5300,7 @@
System.out.print("; textures = " + textures);
System.out.println("; usedtextures = " + usedtextures);
- if (GetTextures() == null)
+ if (GetTextures() == null) // What is that??
GetTextures().name = ":";
String texname = tex;
@@ -6932,7 +6984,7 @@
}
//System.out.println("info.modifiers = " + info.modifiers);
- modified = (info.modifiers & CameraPane.META) != 0;
+ modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
//System.out.println("modified = " + modified);
//new Exception().printStackTrace();
//viewCode = info.pane.renderCamera.viewCode;
@@ -6960,7 +7012,7 @@
return true;
}
- void doEditDrag0(ClickInfo info)
+ void doEditDrag0(ClickInfo info, boolean opposite)
{
if (hitSomething == 0)
{
@@ -6987,7 +7039,7 @@
scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
- if (modified)
+ if (modified || opposite)
{
//assert(false);
/*
@@ -7081,6 +7133,7 @@
if (modified)
{
+ // Rotate 90 degrees
angle /= (Math.PI / 4);
angle = Math.floor(angle + 0.5);
angle *= (Math.PI / 4);
--
Gitblit v1.6.2