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.
---
GroupEditor.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index e205d0c..a0702c4 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -439,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);
@@ -937,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");
@@ -964,7 +969,7 @@
flashIt = false;
CameraPane pane = (CameraPane) target;
- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
if (group.selection.size() == 1)
@@ -1859,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