Skip to content

Commit ccd02d2

Browse files
authored
Replacing bullet-native with Minie (#547)
* Replacing bullet-native with Minie Removing blender module (will probably have to revert) Removing xbuf,blender dependency * Add back blender module, but strip it from blender related code. * setting gravity working. simulating physics working * blender begone * didn't commit build file with Heart change found more blender references * remove printout from build file
1 parent 8b07fc8 commit ccd02d2

File tree

58 files changed

+184
-6085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+184
-6085
lines changed

build.gradle

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,16 @@ configurations.examplelibs {
3333
}
3434

3535
dependencies {
36-
37-
corelibs dep("com.github.xbuf:jme3_xbuf:0.9.1", false, false)
3836
corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.2", true, true)
3937
corelibs dep("javax.help:javahelp:2.0.05", false, false)
4038

4139
corelibs dep("org.jmonkeyengine:jme3-core:$jmeVersion-$jmeVersionTag", true, true)
4240
corelibs dep("org.jmonkeyengine:jme3-desktop:$jmeVersion-$jmeVersionTag", true, true)
43-
corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
41+
corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
4442
corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", true, true)
4543
corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", true, true)
46-
corelibs dep("org.jmonkeyengine:jme3-blender:3.3.2-stable", false, false) // Pin Pointed until jme3-blender has a dedicated release or support is phased out.
47-
optlibs dep("com.github.stephengold:Minie:7.7.0", false, false) // replacement for bullet-native
44+
corelibs dep("com.github.stephengold:Minie:7.7.0", false, false) // replacement for bullet-native
45+
corelibs dep("com.github.stephengold:Heart:8.7.0", true, true) // requirement for Minie
4846
corelibs dep(fileTree("lib"), false, false)
4947
corelibs dep("org.jmonkeyengine:jme3-jogg:$jmeVersion-$jmeVersionTag", true, true)
5048

@@ -64,7 +62,6 @@ dependencies {
6462
optlibs dep("org.jmonkeyengine:jme3-ios:$jmeVersion-$jmeVersionTag", true, true)
6563
optlibs dep("org.jmonkeyengine:jme3-android-native:$jmeVersion-$jmeVersionTag", true, true)
6664
optlibs dep("org.jmonkeyengine:jme3-lwjgl3:$jmeVersion-$jmeVersionTag", true, true)
67-
optlibs dep("com.github.stephengold:Heart:8.7.0", true, true)
6865
optlibs dep("com.github.stephengold:Wes:0.7.5", true, true)
6966
testdatalibs dep("org.jmonkeyengine:jme3-testdata:$jmeVersion-$jmeVersionTag", false, false)
7067
examplelibs dep("org.jmonkeyengine:jme3-examples:$jmeVersion-$jmeVersionTag", false, true)
@@ -127,7 +124,19 @@ task copyBaseLibs(dependsOn:configurations.corelibs) {
127124
from file
128125
into "jme3-core-baselibs/release/modules/ext/"
129126
}
130-
}else if( !isSourceOrJavadoc(file.name)){
127+
} else if( file.name.contains("Minie") && !isSourceOrJavadoc(file.name)) {
128+
// Special handling of Minie, since it doesn't follow the name convention
129+
copy {
130+
from file
131+
into "jme3-core-baselibs/release/modules/ext/"
132+
}
133+
} else if( file.name.contains("Heart") && !isSourceOrJavadoc(file.name)) {
134+
// Special handling of Minie, since it doesn't follow the name convention
135+
copy {
136+
from file
137+
into "jme3-core-baselibs/release/modules/ext/"
138+
}
139+
} else if( !isSourceOrJavadoc(file.name)){
131140
copy {
132141
from file
133142
into "jme3-core-libraries/release/modules/ext/"
@@ -174,6 +183,16 @@ task createBaseXml(dependsOn: configurations.corelibs) {
174183
jmeJarFiles.add(file)
175184
}
176185

186+
} else if( file.name.contains("Minie") && !isSourceOrJavadoc(file.name)) {
187+
// Special handling of Minie, since it doesn't follow the name convention
188+
if(!jmeJarFiles.contains(file)) {
189+
jmeJarFiles.add(file)
190+
}
191+
} else if( file.name.contains("Heart") && !isSourceOrJavadoc(file.name)) {
192+
// Special handling of Minie, since it doesn't follow the name convention
193+
if(!jmeJarFiles.contains(file)) {
194+
jmeJarFiles.add(file)
195+
}
177196
} else if(!isSourceOrJavadoc(file.name)) {
178197
//collect external jars
179198
externalJarFiles.add(file)

jme3-blender/nbproject/project.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<compile-dependency/>
1313
<run-dependency>
1414
<release-version>1</release-version>
15-
<specification-version>3.3.0</specification-version>
15+
<specification-version>3.6.1</specification-version>
1616
</run-dependency>
1717
</dependency>
1818
<dependency>
@@ -21,7 +21,7 @@
2121
<compile-dependency/>
2222
<run-dependency>
2323
<release-version>1</release-version>
24-
<specification-version>3.3.0</specification-version>
24+
<specification-version>3.6.1</specification-version>
2525
</run-dependency>
2626
</dependency>
2727
<dependency>
@@ -30,7 +30,7 @@
3030
<compile-dependency/>
3131
<run-dependency>
3232
<release-version>1</release-version>
33-
<specification-version>3.3.0</specification-version>
33+
<specification-version>3.6.1</specification-version>
3434
</run-dependency>
3535
</dependency>
3636
<dependency>

jme3-blender/src/com/jme3/gde/blender/BlenderAssetManagerConfigurator.java

Lines changed: 0 additions & 51 deletions
This file was deleted.

jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)