| .. | .. |
|---|
| 730 | 730 | public Scene load(String filename) throws FileNotFoundException, |
|---|
| 731 | 731 | IncorrectFormatException, ParsingErrorException |
|---|
| 732 | 732 | { |
|---|
| 733 | + if (filename.toLowerCase().endsWith(".obj")) |
|---|
| 734 | + { |
|---|
| 735 | + setBasePathFromFilename(filename); |
|---|
| 733 | 736 | |
|---|
| 734 | | - setBasePathFromFilename(filename); |
|---|
| 735 | | - |
|---|
| 736 | | - Reader reader = new BufferedReader(new FileReader(filename)); |
|---|
| 737 | | - return load(reader); |
|---|
| 737 | + Reader reader = new BufferedReader(new FileReader(filename)); |
|---|
| 738 | + return load(reader); |
|---|
| 739 | + } |
|---|
| 740 | + else // new 3ds loader |
|---|
| 741 | + return new com.microcrowd.loader.java3d.max3ds.Loader3DS().load(filename); |
|---|
| 738 | 742 | } // End of load(String) |
|---|
| 739 | 743 | |
|---|
| 740 | 744 | private void setBaseUrlFromUrl(URL url) |
|---|
