From f868664f7e7626f651e6ade9c9f6863851ef43b7 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 06 Nov 2019 23:12:57 -0500
Subject: [PATCH] Dangerous "reset".
---
ObjectFile.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ObjectFile.java b/ObjectFile.java
index 5dad1c3..ceaa352 100644
--- a/ObjectFile.java
+++ b/ObjectFile.java
@@ -730,11 +730,15 @@
public Scene load(String filename) throws FileNotFoundException,
IncorrectFormatException, ParsingErrorException
{
+ if (filename.toLowerCase().endsWith(".obj"))
+ {
+ setBasePathFromFilename(filename);
- setBasePathFromFilename(filename);
-
- Reader reader = new BufferedReader(new FileReader(filename));
- return load(reader);
+ Reader reader = new BufferedReader(new FileReader(filename));
+ return load(reader);
+ }
+ else // new 3ds loader
+ return new com.microcrowd.loader.java3d.max3ds.Loader3DS().load(filename);
} // End of load(String)
private void setBaseUrlFromUrl(URL url)
--
Gitblit v1.6.2