diff --git a/sdk/ant-lib/ant-jme.jar b/sdk/ant-lib/ant-jme.jar index 3fab26a20..880ebc7ba 100644 Binary files a/sdk/ant-lib/ant-jme.jar and b/sdk/ant-lib/ant-jme.jar differ diff --git a/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif b/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif index 5260f8d8b..7be754e5e 100644 Binary files a/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif and b/sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif differ diff --git a/sdk/branding/modules/org-netbeans-modules-autoupdate-services.jar/org/netbeans/modules/autoupdate/services/resources/icon-standard.png b/sdk/branding/modules/org-netbeans-modules-autoupdate-services.jar/org/netbeans/modules/autoupdate/services/resources/icon-standard.png new file mode 100644 index 000000000..f67785a6e Binary files /dev/null and b/sdk/branding/modules/org-netbeans-modules-autoupdate-services.jar/org/netbeans/modules/autoupdate/services/resources/icon-standard.png differ diff --git a/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties b/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties new file mode 100644 index 000000000..5b73b2f2d --- /dev/null +++ b/sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties @@ -0,0 +1 @@ +OperationDescriptionStep_BrokenPackageDepInit=

jMonkeyEngine3 SDK requires the JDK

Currently, jMonkeyEngine3 SDK appears to be running with the JRE instead of the full JDK.

To use the SDK, edit the --jdkhome command line option in jmonkeyplatform/etc/jmonkeyplatform.conf to the location of a JDK installation. See the jME wiki for more information.

diff --git a/sdk/jme3-blender/build.xml b/sdk/jme3-blender/build.xml new file mode 100644 index 000000000..535b63fb0 --- /dev/null +++ b/sdk/jme3-blender/build.xml @@ -0,0 +1,8 @@ + + + + + + Builds, tests, and runs the project com.jme3.gde.blender. + + diff --git a/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-about.html b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-about.html new file mode 100644 index 000000000..8c7fe2111 --- /dev/null +++ b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-about.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-hs.xml b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-hs.xml new file mode 100644 index 000000000..9693750da --- /dev/null +++ b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-hs.xml @@ -0,0 +1,31 @@ + + + + + Blender Support Help + + com.jme3.gde.blender.about + + + + TOC + + javax.help.TOCView + blender-toc.xml + + + Index + + javax.help.IndexView + blender-idx.xml + + + Search + + javax.help.SearchView + JavaHelpSearch + + diff --git a/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-idx.xml b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-idx.xml new file mode 100644 index 000000000..28057bc48 --- /dev/null +++ b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-idx.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-map.xml b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-map.xml new file mode 100644 index 000000000..983ffa9aa --- /dev/null +++ b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-map.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-toc.xml b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-toc.xml new file mode 100644 index 000000000..13449748d --- /dev/null +++ b/sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-toc.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/sdk/jme3-blender/manifest.mf b/sdk/jme3-blender/manifest.mf new file mode 100644 index 000000000..3f5117588 --- /dev/null +++ b/sdk/jme3-blender/manifest.mf @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +OpenIDE-Module: com.jme3.gde.blender +OpenIDE-Module-Implementation-Version: 0 +OpenIDE-Module-Layer: com/jme3/gde/blender/layer.xml +OpenIDE-Module-Localizing-Bundle: com/jme3/gde/blender/Bundle.properties +OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help + diff --git a/sdk/jme3-blender/nbproject/build-impl.xml b/sdk/jme3-blender/nbproject/build-impl.xml new file mode 100644 index 000000000..7232c5d6f --- /dev/null +++ b/sdk/jme3-blender/nbproject/build-impl.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + You must set 'suite.dir' to point to your containing module suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/jme3-blender/nbproject/genfiles.properties b/sdk/jme3-blender/nbproject/genfiles.properties new file mode 100644 index 000000000..287ff270f --- /dev/null +++ b/sdk/jme3-blender/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=919b4fec +build.xml.script.CRC32=0f77a514 +build.xml.stylesheet.CRC32=a56c6a5b@1.45.1 +# 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=919b4fec +nbproject/build-impl.xml.script.CRC32=5c5042d6 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1 diff --git a/sdk/jme3-blender/nbproject/project.properties b/sdk/jme3-blender/nbproject/project.properties new file mode 100644 index 000000000..8c97fa953 --- /dev/null +++ b/sdk/jme3-blender/nbproject/project.properties @@ -0,0 +1,7 @@ +javac.source=1.5 +javac.compilerargs=-Xlint -Xlint:-serial +javahelp.hs=blender-hs.xml +nbm.homepage=http://www.jmonkeyengine.com +nbm.module.author=Kaelthas +nbm.needs.restart=true +spec.version.base=0.8.0 diff --git a/sdk/jme3-blender/nbproject/project.xml b/sdk/jme3-blender/nbproject/project.xml new file mode 100644 index 000000000..b8e7a2f9e --- /dev/null +++ b/sdk/jme3-blender/nbproject/project.xml @@ -0,0 +1,107 @@ + + + org.netbeans.modules.apisupport.project + + + com.jme3.gde.blender + + + + com.jme3.gde.core + + + + 1 + 0.11 + + + + com.jme3.gde.core.baselibs + + + + 1 + 0.6 + + + + org.netbeans.api.progress + + + + 1 + 1.0 + + + + org.netbeans.modules.projectapi + + + + 1 + 1.0 + + + + org.openide.awt + + + + 7.0 + + + + org.openide.dialogs + + + + 7.0 + + + + org.openide.filesystems + + + + 7.0 + + + + org.openide.loaders + + + + 7.0 + + + + org.openide.nodes + + + + 7.0 + + + + org.openide.util + + + + 8.0 + + + + org.openide.util.lookup + + + + 8.0 + + + + + com.jme3.gde.blender + + + + diff --git a/sdk/jme3-blender/nbproject/suite.properties b/sdk/jme3-blender/nbproject/suite.properties new file mode 100644 index 000000000..29d7cc9bd --- /dev/null +++ b/sdk/jme3-blender/nbproject/suite.properties @@ -0,0 +1 @@ +suite.dir=${basedir}/.. diff --git a/sdk/jme3-blender/release/modules/ext/BlenderLoader.jar b/sdk/jme3-blender/release/modules/ext/BlenderLoader.jar new file mode 100644 index 000000000..d44397104 Binary files /dev/null and b/sdk/jme3-blender/release/modules/ext/BlenderLoader.jar differ diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderAssetManagerConfigurator.java b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderAssetManagerConfigurator.java new file mode 100644 index 000000000..71d7e774a --- /dev/null +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderAssetManagerConfigurator.java @@ -0,0 +1,20 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.blender; + +import com.jme3.asset.AssetManager; +import com.jme3.gde.core.assets.AssetManagerConfigurator; + +/** + * + * @author normenhansen + */ +@org.openide.util.lookup.ServiceProvider(service = AssetManagerConfigurator.class) +public class BlenderAssetManagerConfigurator implements AssetManagerConfigurator { + + public void prepareManager(AssetManager manager) { + manager.registerLoader(com.jme3.scene.plugins.blender.BlenderModelLoader.class, "blend"); + } +} diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java new file mode 100644 index 000000000..e88f43a94 --- /dev/null +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java @@ -0,0 +1,18 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.jme3.gde.blender; + +import com.jme3.gde.core.assets.SpatialAssetDataObject; +import java.io.IOException; +import org.openide.filesystems.FileObject; +import org.openide.loaders.DataObjectExistsException; +import org.openide.loaders.MultiFileLoader; + +public class BlenderDataObject extends SpatialAssetDataObject { + + public BlenderDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException { + super(pf, loader); + } +} diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderResolver.xml b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderResolver.xml new file mode 100644 index 000000000..4144653ca --- /dev/null +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderResolver.xml @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties b/sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties new file mode 100644 index 000000000..04673588b --- /dev/null +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties @@ -0,0 +1,8 @@ +LBL_Blender_loader_name=Blender Files +OpenIDE-Module-Display-Category=jMP User Contributions +OpenIDE-Module-Long-Description=\ + This plugin adds support for Blender .blend files to jMP +OpenIDE-Module-Name=Blender Support +OpenIDE-Module-Short-Description=Adds support for Blender .blend files to jMP +Services/MIMEResolver/BlenderResolver.xml=Blender Files +Templates/Other/BlenderTemplate.blend=Empty Blender file diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/blender-helpset.xml b/sdk/jme3-blender/src/com/jme3/gde/blender/blender-helpset.xml new file mode 100644 index 000000000..641e9f13c --- /dev/null +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/blender-helpset.xml @@ -0,0 +1,7 @@ + + + + diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/blender.png b/sdk/jme3-blender/src/com/jme3/gde/blender/blender.png new file mode 100644 index 000000000..ee263ec13 Binary files /dev/null and b/sdk/jme3-blender/src/com/jme3/gde/blender/blender.png differ diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/layer.xml b/sdk/jme3-blender/src/com/jme3/gde/blender/layer.xml new file mode 100644 index 000000000..8b4362075 --- /dev/null +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/layer.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/jme3-core-baselibs/nbproject/genfiles.properties b/sdk/jme3-core-baselibs/nbproject/genfiles.properties index e4524b4de..72661047e 100644 --- a/sdk/jme3-core-baselibs/nbproject/genfiles.properties +++ b/sdk/jme3-core-baselibs/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=525c4eca +build.xml.data.CRC32=e89ba76a build.xml.script.CRC32=cdae6a36 build.xml.stylesheet.CRC32=a56c6a5b@1.45.1 # 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=525c4eca +nbproject/build-impl.xml.data.CRC32=e89ba76a nbproject/build-impl.xml.script.CRC32=246f9b81 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1 diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml index 272dd53e2..35d8725b7 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.xml +++ b/sdk/jme3-core-baselibs/nbproject/project.xml @@ -87,6 +87,13 @@ com.jme3.scene.debug com.jme3.scene.mesh com.jme3.scene.plugins + com.jme3.scene.plugins.blender + com.jme3.scene.plugins.blender.data + com.jme3.scene.plugins.blender.exception + com.jme3.scene.plugins.blender.helpers + com.jme3.scene.plugins.blender.helpers.v249 + com.jme3.scene.plugins.blender.structures + com.jme3.scene.plugins.blender.utils com.jme3.scene.plugins.ogre com.jme3.scene.plugins.ogre.matext com.jme3.scene.shape diff --git a/sdk/nbproject/project.properties b/sdk/nbproject/project.properties index bee1e5436..ef565be82 100644 --- a/sdk/nbproject/project.properties +++ b/sdk/nbproject/project.properties @@ -41,10 +41,13 @@ modules=\ ${project.com.jme3.gde.welcome}:\ ${project.com.jme3.gde.codecheck}:\ ${project.com.jme3.gde.obfuscate}:\ + ${project.com.jme3.gde.blender}:\ ${project.com.jme3.gde.angelfont} project.com.jme3.gde.android=jme3-android project.com.jme3.gde.angelfont=jme3-angelfont +project.com.jme3.gde.blender=jme3-blender project.com.jme3.gde.codecheck=jme3-code-check +project.com.jme3.gde.customcontrols=jme3-custom-controls project.com.jme3.gde.desktop.executables=jme3-desktop-executables project.com.jme3.gde.assetpack=jme3-assetpack-support project.com.jme3.gde.cinematics=jme3-cinematics