sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed syntax error in ModifierHelper

Browse Source 
* Other minor fixes

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7855 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-07-13 00:30:57 +00:00
parent a0dea25ec5
commit b8826716b1
3 changed files with 646 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1255
engine/src/blender/com/jme3/scene/plugins/blender/helpers/v249/ModifierHelper.java
View File

File diff suppressed because it is too large Load Diff

16
engine/src/blender/com/jme3/scene/plugins/blender/structures/Modifier.java
View File

@ -7,16 +7,26 @@ package com.jme3.scene.plugins.blender.structures;
* @author Marcin Roguski (Kaelthas)
*/
public class Modifier {
public static final String ARRAY_MODIFIER_DATA = "ArrayModifierData";
public static final String ARMATURE_MODIFIER_DATA = "ArmatureModifierData";
public static final String PARTICLE_MODIFIER_DATA = "ParticleSystemModifierData";
public static final String MIRROR_MODIFIER_DATA = "MirrorModifierData";
public static final String OBJECT_ANIMATION_MODIFIER_DATA = "ObjectAnimationModifierData";
/** Blender's type of modifier. */
/**
* Blender's type of modifier.
*/
private String type;
/** JME modifier representation object. */
/**
* JME modifier representation object.
*/
private Object jmeModifierRepresentation;
/** Various additional data used by modifiers.*/
/**
* Various additional data used by modifiers.
*/
private Object additionalData;
/**

6
engine/src/core/com/jme3/asset/AssetKey.java
View File

@ -61,10 +61,10 @@ public class AssetKey<T> implements Savable {
protected static String getExtension(String name){
int idx = name.lastIndexOf('.');
//workaround for filenames ending with xml and another dot ending before that (my.mesh.xml)
if(name.toLowerCase().indexOf(".xml")==name.length()-4){
if (name.toLowerCase().endsWith(".xml")) {
idx = name.substring(0, idx).lastIndexOf('.');
if(idx==-1){
idx=name.lastIndexOf('.');
if (idx == -1) {
idx = name.lastIndexOf('.');
}
}
if (idx <= 0 || idx == name.length() - 1)