Skip to content

Commit

Permalink
Merge pull request #44 from jperedadnr/issue-38
Browse files Browse the repository at this point in the history
Issue 38: Added Maya Importer
  • Loading branch information
José Pereda committed Nov 3, 2018
2 parents 83eda93 + 74b5220 commit bcd823e
Show file tree
Hide file tree
Showing 82 changed files with 37,791 additions and 22 deletions.
4 changes: 1 addition & 3 deletions FXyz-Core/build.gradle
Expand Up @@ -31,6 +31,4 @@ compileJava {
javadoc {
options.addBooleanOption("Xdoclint:none").setValue(true);
options.addBooleanOption("javafx").setValue(true);
options.addBooleanOption("html5").setValue(true);
}

}
4 changes: 1 addition & 3 deletions FXyz-Importers/build.gradle
Expand Up @@ -35,6 +35,4 @@ compileJava {
javadoc {
options.addBooleanOption("Xdoclint:none").setValue(true);
options.addBooleanOption("javafx").setValue(true);
options.addBooleanOption("html5").setValue(true);
}

}
Expand Up @@ -32,6 +32,7 @@
package org.fxyz3d.importers;

import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLClassLoader;

Expand Down Expand Up @@ -122,7 +123,7 @@ public static Pair<Node,Timeline> loadIncludingAnimation(String fileUrl, boolean
for (String name : names) {
try {
Class<?> clazz = Class.forName(name);
Object obj = clazz.newInstance();
Object obj = clazz.getDeclaredConstructor().newInstance();
if (obj instanceof Importer) {
Importer plugin = (Importer) obj;
if (plugin.isSupported(extension)) {
Expand All @@ -131,7 +132,8 @@ public static Pair<Node,Timeline> loadIncludingAnimation(String fileUrl, boolean
break;
}
}
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException e) {
// FAIL SILENTLY
}
}
Expand Down
58 changes: 58 additions & 0 deletions FXyz-Importers/src/main/java/org/fxyz3d/importers/maya/Frame.java
@@ -0,0 +1,58 @@
/*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates.
* All rights reserved. Use is subject to license terms.
*
* This file is available and licensed under the following license:
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the distribution.
* - Neither the name of Oracle Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

package org.fxyz3d.importers.maya;

import javafx.util.Duration;

public class Frame extends Duration {

static final double FPS = 24.0;

Frame(double frames) {
super(frames / FPS * 1000.0);
}

Frame(int frames) {
super((double) frames / FPS * 1000.0);
}

Frame(int frames, int fps) {
super(((double) frames) / ((double) fps) * 1000.0);
}

public static Duration valueOf(double frames) {
return Duration.seconds(frames / FPS * 1000.0);
}

}

0 comments on commit bcd823e

Please sign in to comment.