From d7bc8865056ea0d35df261e719f92e1422af7c6e Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 09:00:26 -0400
Subject: [PATCH] Fix Windows issues.
---
GroupEditor.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 56e3aff..cbd2ec6 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -171,6 +171,14 @@
//editItem.addActionListener(this);
duplicateItem = menu.add(new MenuItem("Duplicate"));
duplicateItem.addActionListener(this);
+ cloneItem = menu.add(new MenuItem("Clone"));
+ cloneItem.addActionListener(this);
+ if (Globals.ADVANCED)
+ {
+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
+ cloneSupportItem.addActionListener(this);
+ }
+ menu.add("-");
cutItem = menu.add(new MenuItem("Cut"));
cutItem.addActionListener(this);
copyItem = menu.add(new MenuItem("Copy"));
@@ -178,10 +186,7 @@
pasteItem = menu.add(new MenuItem("Paste"));
pasteItem.addActionListener(this);
menu.add("-");
- cloneItem = menu.add(new MenuItem("Clone"));
- cloneItem.addActionListener(this);
- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
- cloneSupportItem.addActionListener(this);
+
menu.add("-");
pasteIntoItem = menu.add(new MenuItem("Paste into"));
pasteIntoItem.addActionListener(this);
@@ -272,6 +277,7 @@
if (Globals.ADVANCED)
{
+ menu.add("-");
physicsItem = menu.add(new MenuItem("Physics"));
physicsItem.addActionListener(this);
frameselectorItem = menu.add(new MenuItem("Frame Selector"));
@@ -297,6 +303,7 @@
shadowZItem.addActionListener(this);
if (Globals.ADVANCED)
{
+ menu.add("-");
linkerItem = menu.add(new MenuItem("Linker"));
linkerItem.addActionListener(this);
attributeItem = menu.add(new MenuItem("Attribute"));
@@ -305,8 +312,8 @@
templateItem.addActionListener(this);
pointflowItem = menu.add(new MenuItem("Point Flow"));
pointflowItem.addActionListener(this);
- menu.add("-");
}
+ menu.add("-");
resetTransformItem = menu.add(new MenuItem("Reset Transform"));
resetTransformItem.addActionListener(this);
resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
@@ -432,14 +439,17 @@
buildCreateMenu(menu);
oe.menuBar.add(menu = new Menu("Include"));
- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
- importGFDItem.addActionListener(this);
- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
- importVRMLX3DItem.addActionListener(this);
- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
importOBJItem.addActionListener(this);
- import3DSItem = menu.add(new MenuItem("3DS Object..."));
+ menu.add("-");
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
import3DSItem.addActionListener(this);
+ menu.add("-");
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
+ importVRMLX3DItem.addActionListener(this);
+ menu.add("-");
+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
+ importGFDItem.addActionListener(this);
oe.menuBar.add(menu = new Menu("Tools"));
buildToolsMenu(menu);
@@ -930,7 +940,9 @@
// objEditor.DropFile((java.io.File[]) object, true);
// return;
// }
- if (string.charAt(0) == '/')
+
+ // File path for Mac and Windows
+ if (string.charAt(0) == '/' || string.charAt(1) == ':')
{
// file(s)
String[] names = string.split("\n");
@@ -1164,13 +1176,13 @@
parseverticesItem.addActionListener(this);
textureFieldItem = menu.add(new MenuItem("Texture Field"));
textureFieldItem.addActionListener(this);
- alignItem = menu.add(new MenuItem("Align Object"));
+ alignItem = menu.add(new MenuItem("Align Objects"));
alignItem.addActionListener(this);
reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
reduceMorphItem.addActionListener(this);
reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
reduce34MorphItem.addActionListener(this);
-
+ menu.add("-");
menu.add(computeAOItem = new MenuItem("Compute AO"));
computeAOItem.addActionListener(this);
@@ -1852,7 +1864,15 @@
} else
if (source == importOBJItem)
{
- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
+ browser.setVisible(true);
+ String filename = browser.getFile();
+ if (filename != null && filename.length() > 0)
+ {
+ String fullname = browser.getDirectory() + filename;
+ makeSomething(ReadOBJ(fullname), true);
+ }
} else
if (source == computeAOItem)
{
--
Gitblit v1.6.2