From 1e3de699b037989e8deded5c7830139f97c64136 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 09:25:50 -0400
Subject: [PATCH] No use of META ("Windows") modifier.

---
 Object3D.java |   76 +++++++++++++++++++++++++++++++++-----
 1 files changed, 66 insertions(+), 10 deletions(-)

diff --git a/Object3D.java b/Object3D.java
index 8beaebd..6536ddc 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -2300,6 +2300,7 @@
     {
         if (newWindow)
         {
+                new Exception().printStackTrace();
             System.exit(0);
             if (parent != null)
             {
@@ -2906,7 +2907,8 @@
     {
         if (bRep != null)
         {
-            bRep.GenUV();
+            bRep.GenUV(); //1);
+            //bRep.UnfoldUV();
             Touch();
         }
     }
@@ -5157,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)
@@ -5169,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()
@@ -5246,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;
@@ -5898,6 +5952,7 @@
             return;
         }
         
+        //bRep.GenUV(1/material.diffuseness);
 //        bRep.lock = true;
 
         //javax.media.opengl.GL gl = display.GetGL();
@@ -6929,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;
@@ -7375,6 +7430,7 @@
             objectUI.closeUI();
             if (editWindow != null)
             {
+                editWindow.ctrlPanel.FlushUI();
                 editWindow.refreshContents();
             } // ? new
             objectUI = null;

--
Gitblit v1.6.2