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

- fix dependency issues

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7233 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-04-11 23:43:15 +00:00
parent e22c3f0349
commit 7d09cafa71
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/jme3-code-check/nbproject/genfiles.properties
View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=9d32300f
build.xml.data.CRC32=6f1a60ee
build.xml.script.CRC32=a481f885
build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=9d32300f
nbproject/build-impl.xml.data.CRC32=6f1a60ee
nbproject/build-impl.xml.script.CRC32=0691bb76
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2

6
sdk/jme3-code-check/nbproject/project.xml
View File

@ -38,7 +38,7 @@
<compile-dependency/>
<run-dependency>
<release-version>3</release-version>
<specification-version>1.50.1.3.10.2</specification-version>
<specification-version>1.56.0.5.13.8</specification-version>
</run-dependency>
</dependency>
<dependency>
@ -72,8 +72,8 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>0</release-version>
<implementation-version/>
<release-version>0-1</release-version>
<specification-version>1.17.0.7.8</specification-version>
</run-dependency>
</dependency>
<dependency>

4
sdk/jme3-core-baselibs/nbproject/genfiles.properties
View File

@ -1,8 +1,8 @@
build.xml.data.CRC32=f8e0e6a8
build.xml.data.CRC32=e2184cca
build.xml.script.CRC32=cdae6a36
build.xml.stylesheet.CRC32=a56c6a5b@1.42.2
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=f8e0e6a8
nbproject/build-impl.xml.data.CRC32=e2184cca
nbproject/build-impl.xml.script.CRC32=246f9b81
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.42.2

7
sdk/jme3-core-baselibs/nbproject/project.xml
View File

@ -17,6 +17,7 @@
</dependency>
</module-dependencies>
<public-packages>
<package>checkers.quals</package>
<package>com.jme3.animation</package>
<package>com.jme3.app</package>
<package>com.jme3.app.state</package>
@ -34,7 +35,6 @@
<package>com.jme3.bullet.control</package>
<package>com.jme3.bullet.joints</package>
<package>com.jme3.bullet.joints.motors</package>
<package>com.jme3.bullet.nodes</package>
<package>com.jme3.bullet.objects</package>
<package>com.jme3.bullet.objects.infos</package>
<package>com.jme3.bullet.util</package>
@ -58,8 +58,13 @@
<package>com.jme3.material</package>
<package>com.jme3.material.plugins</package>
<package>com.jme3.math</package>
<package>com.jme3.network</package>
<package>com.jme3.network.base</package>
<package>com.jme3.network.connection</package>
<package>com.jme3.network.events</package>
<package>com.jme3.network.kernel</package>
<package>com.jme3.network.kernel.tcp</package>
<package>com.jme3.network.kernel.udp</package>
<package>com.jme3.network.message</package>
<package>com.jme3.network.queue</package>
<package>com.jme3.network.rmi</package>

6
sdk/jme3-core-libraries/nbproject/project.xml
View File

@ -60,6 +60,7 @@
<package>de.lessvoid.nifty.effects</package>
<package>de.lessvoid.nifty.effects.impl</package>
<package>de.lessvoid.nifty.elements</package>
<package>de.lessvoid.nifty.elements.events</package>
<package>de.lessvoid.nifty.elements.render</package>
<package>de.lessvoid.nifty.elements.tools</package>
<package>de.lessvoid.nifty.input</package>
@ -77,6 +78,9 @@
<package>de.lessvoid.nifty.loaderv2.types.resolver.style</package>
<package>de.lessvoid.nifty.nulldevice</package>
<package>de.lessvoid.nifty.render</package>
<package>de.lessvoid.nifty.render.image</package>
<package>de.lessvoid.nifty.render.image.areaprovider</package>
<package>de.lessvoid.nifty.render.image.renderstrategy</package>
<package>de.lessvoid.nifty.screen</package>
<package>de.lessvoid.nifty.sound</package>
<package>de.lessvoid.nifty.spi.input</package>
@ -105,6 +109,8 @@
<package>org.lwjgl</package>
<package>org.lwjgl.input</package>
<package>org.lwjgl.openal</package>
<package>org.lwjgl.opencl</package>
<package>org.lwjgl.opencl.api</package>
<package>org.lwjgl.opengl</package>
<package>org.xmlpull.mxp1</package>
<package>org.xmlpull.mxp1_serializer</package>

11
sdk/jme3-materialeditor/src/com/jme3/gde/materials/EditableMaterialFile.java
View File

@ -140,7 +140,7 @@ public class EditableMaterialFile {
}
}
}
parseMatDef();
checkWithMatDef();
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
@ -189,10 +189,11 @@ public class EditableMaterialFile {
}
/**
* finds and loads the matdef file either from project or from base jme
* Finds and loads the matdef file either from project or from base jme,
* then applies the parameter values to the material parameter entries.
* @param line
*/
private void parseMatDef() {
private void checkWithMatDef() {
//load matdef
matDefEntries.clear();
boolean params = false;
@ -480,7 +481,7 @@ public class EditableMaterialFile {
additionalRenderStates.put("Blend", new MaterialProperty("BlendMode", "Blend", mat.getAdditionalRenderState().getBlendMode().name()));
additionalRenderStates.put("AlphaTestFalloff", new MaterialProperty("Float", "AlphaTestFalloff", mat.getAdditionalRenderState().getAlphaFallOff() + ""));
additionalRenderStates.put("PolyOffset", new MaterialProperty("Float,Float", "PolyOffset", mat.getAdditionalRenderState().getPolyOffsetUnits() + " " + mat.getAdditionalRenderState().getPolyOffsetFactor()));
parseMatDef();
checkWithMatDef();
setAsText(getUpdatedContent());
}
@ -498,7 +499,7 @@ public class EditableMaterialFile {
this.matDefName = matDefName;
assert (matDefName != null);
initMatDef();
parseMatDef();
checkWithMatDef();
}
public String getMaterialPath() {