Skip to content

Replacing bullet-native with Minie #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 24, 2023
Merged

Replacing bullet-native with Minie #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
843841a
Replacing bullet-native with Minie
neph1 Nov 18, 2023
5b05706
Add back blender module, but strip it from blender related code.
neph1 Nov 18, 2023
dda50bc
setting gravity working. simulating physics working
neph1 Nov 19, 2023
fd36352
blender begone
neph1 Nov 20, 2023
8e57380
didn't commit build file with Heart change
neph1 Nov 20, 2023
35d2d61
remove printout from build file
neph1 Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,16 @@ configurations.examplelibs {
}

dependencies {

corelibs dep("com.github.xbuf:jme3_xbuf:0.9.1", false, false)
corelibs dep("com.badlogicgames.gdx:gdx-ai:1.8.2", true, true)
corelibs dep("javax.help:javahelp:2.0.05", false, false)

corelibs dep("org.jmonkeyengine:jme3-core:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-desktop:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-awt-dialogs:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-lwjgl:$jmeVersion-$jmeVersionTag", true, true)
corelibs dep("org.jmonkeyengine:jme3-effects:$jmeVersion-$jmeVersionTag", true, true)
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.
optlibs dep("com.github.stephengold:Minie:7.7.0", false, false) // replacement for bullet-native
corelibs dep("com.github.stephengold:Minie:7.7.0", false, false) // replacement for bullet-native
corelibs dep("com.github.stephengold:Heart:8.7.0", true, true) // requirement for Minie
corelibs dep(fileTree("lib"), false, false)
corelibs dep("org.jmonkeyengine:jme3-jogg:$jmeVersion-$jmeVersionTag", true, true)

Expand All @@ -64,7 +62,6 @@ dependencies {
optlibs dep("org.jmonkeyengine:jme3-ios:$jmeVersion-$jmeVersionTag", true, true)
optlibs dep("org.jmonkeyengine:jme3-android-native:$jmeVersion-$jmeVersionTag", true, true)
optlibs dep("org.jmonkeyengine:jme3-lwjgl3:$jmeVersion-$jmeVersionTag", true, true)
optlibs dep("com.github.stephengold:Heart:8.7.0", true, true)
optlibs dep("com.github.stephengold:Wes:0.7.5", true, true)
testdatalibs dep("org.jmonkeyengine:jme3-testdata:$jmeVersion-$jmeVersionTag", false, false)
examplelibs dep("org.jmonkeyengine:jme3-examples:$jmeVersion-$jmeVersionTag", false, true)
Expand Down Expand Up @@ -127,7 +124,19 @@ task copyBaseLibs(dependsOn:configurations.corelibs) {
from file
into "jme3-core-baselibs/release/modules/ext/"
}
}else if( !isSourceOrJavadoc(file.name)){
} else if( file.name.contains("Minie") && !isSourceOrJavadoc(file.name)) {
// Special handling of Minie, since it doesn't follow the name convention
copy {
from file
into "jme3-core-baselibs/release/modules/ext/"
}
} else if( file.name.contains("Heart") && !isSourceOrJavadoc(file.name)) {
// Special handling of Minie, since it doesn't follow the name convention
copy {
from file
into "jme3-core-baselibs/release/modules/ext/"
}
} else if( !isSourceOrJavadoc(file.name)){
copy {
from file
into "jme3-core-libraries/release/modules/ext/"
Expand Down Expand Up @@ -174,6 +183,16 @@ task createBaseXml(dependsOn: configurations.corelibs) {
jmeJarFiles.add(file)
}

} else if( file.name.contains("Minie") && !isSourceOrJavadoc(file.name)) {
// Special handling of Minie, since it doesn't follow the name convention
if(!jmeJarFiles.contains(file)) {
jmeJarFiles.add(file)
}
} else if( file.name.contains("Heart") && !isSourceOrJavadoc(file.name)) {
// Special handling of Minie, since it doesn't follow the name convention
if(!jmeJarFiles.contains(file)) {
jmeJarFiles.add(file)
}
} else if(!isSourceOrJavadoc(file.name)) {
//collect external jars
externalJarFiles.add(file)
Expand Down
6 changes: 3 additions & 3 deletions jme3-blender/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.6.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -21,7 +21,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.6.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand All @@ -30,7 +30,7 @@
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>3.3.0</specification-version>
<specification-version>3.6.1</specification-version>
</run-dependency>
</dependency>
<dependency>
Expand Down
51 changes: 0 additions & 51 deletions jme3-blender/src/com/jme3/gde/blender/BlenderAssetManagerConfigurator.java
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java
View file
Open in desktop

This file was deleted.

Loading