From 1e1c7fcdb3d0f8be350c5f6c32b6afa6705168ea Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 05 May 2019 08:58:54 -0400
Subject: [PATCH] Fix import OBJ
---
ObjEditor.java | 2 +-
GroupEditor.java | 25 ++++++++++++++++++-------
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index e205d0c..6995fb1 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);
@@ -1859,7 +1862,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)
{
diff --git a/ObjEditor.java b/ObjEditor.java
index 2f289ea..466594b 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -2400,7 +2400,7 @@
{
/**/
FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
- browser.show();
+ browser.setVisible(true);
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
--
Gitblit v1.6.2