- move blender loader to jMP default bundle

- add some branding things and new splash screen to jmp

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7555 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
3.0
nor..67 14 years ago
parent 36d041fae6
commit 66935d6a4c
  1. BIN
      sdk/ant-lib/ant-jme.jar
  2. BIN
      sdk/branding/core/core.jar/org/netbeans/core/startup/splash.gif
  3. BIN
      sdk/branding/modules/org-netbeans-modules-autoupdate-services.jar/org/netbeans/modules/autoupdate/services/resources/icon-standard.png
  4. 1
      sdk/branding/modules/org-netbeans-modules-autoupdate-ui.jar/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties
  5. 8
      sdk/jme3-blender/build.xml
  6. 2
      sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-about.html
  7. 31
      sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-hs.xml
  8. 9
      sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-idx.xml
  9. 9
      sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-map.xml
  10. 11
      sdk/jme3-blender/javahelp/com/jme3/gde/blender/docs/blender-toc.xml
  11. 7
      sdk/jme3-blender/manifest.mf
  12. 45
      sdk/jme3-blender/nbproject/build-impl.xml
  13. 8
      sdk/jme3-blender/nbproject/genfiles.properties
  14. 7
      sdk/jme3-blender/nbproject/project.properties
  15. 107
      sdk/jme3-blender/nbproject/project.xml
  16. 1
      sdk/jme3-blender/nbproject/suite.properties
  17. BIN
      sdk/jme3-blender/release/modules/ext/BlenderLoader.jar
  18. 20
      sdk/jme3-blender/src/com/jme3/gde/blender/BlenderAssetManagerConfigurator.java
  19. 18
      sdk/jme3-blender/src/com/jme3/gde/blender/BlenderDataObject.java
  20. 12
      sdk/jme3-blender/src/com/jme3/gde/blender/BlenderResolver.xml
  21. 8
      sdk/jme3-blender/src/com/jme3/gde/blender/Bundle.properties
  22. 7
      sdk/jme3-blender/src/com/jme3/gde/blender/blender-helpset.xml
  23. BIN
      sdk/jme3-blender/src/com/jme3/gde/blender/blender.png
  24. 92
      sdk/jme3-blender/src/com/jme3/gde/blender/layer.xml
  25. 4
      sdk/jme3-core-baselibs/nbproject/genfiles.properties
  26. 7
      sdk/jme3-core-baselibs/nbproject/project.xml
  27. 3
      sdk/nbproject/project.properties

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 38 KiB

@ -0,0 +1 @@
OperationDescriptionStep_BrokenPackageDepInit=<h3>jMonkeyEngine3 SDK requires the JDK</h3>Currently, jMonkeyEngine3 SDK appears to be running with the JRE instead of the full JDK.<br><br>To use the SDK, edit the <code>--jdkhome</code> command line option in jmonkeyplatform/etc/jmonkeyplatform.conf to the location of a JDK installation. See <a href="http://jmonkeyengine.org/wiki/doku.php/sdk:troubleshooting">the jME wiki</a> for more information.<br><br>

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
<project name="com.jme3.gde.blender" default="netbeans" basedir=".">
<description>Builds, tests, and runs the project com.jme3.gde.blender.</description>
<import file="nbproject/build-impl.xml"/>
</project>

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To change this template, choose Tools | Templates
and open the template in the editor.
-->
<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "http://java.sun.com/products/javahelp/helpset_2_0.dtd">
<helpset version="2.0">
<title>Blender Support Help</title>
<maps>
<homeID>com.jme3.gde.blender.about</homeID>
<mapref location="blender-map.xml"/>
</maps>
<view mergetype="javax.help.AppendMerge">
<name>TOC</name>
<label>Table of Contents</label>
<type>javax.help.TOCView</type>
<data>blender-toc.xml</data>
</view>
<view mergetype="javax.help.AppendMerge">
<name>Index</name>
<label>Index</label>
<type>javax.help.IndexView</type>
<data>blender-idx.xml</data>
</view>
<view>
<name>Search</name>
<label>Search</label>
<type>javax.help.SearchView</type>
<data engine="com.sun.java.help.search.DefaultSearchEngine">JavaHelpSearch</data>
</view>
</helpset>

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To change this template, choose Tools | Templates
and open the template in the editor.
-->
<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 2.0//EN" "http://java.sun.com/products/javahelp/index_2_0.dtd">
<index version="2.0">
<indexitem text="About Blender Support" target="com.jme3.gde.blender.about"/>
</index>

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To change this template, choose Tools | Templates
and open the template in the editor.
-->
<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 2.0//EN" "http://java.sun.com/products/javahelp/map_2_0.dtd">
<map version="2.0">
<mapID target="com.jme3.gde.blender.about" url="blender-about.html"/>
</map>

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To change this template, choose Tools | Templates
and open the template in the editor.
-->
<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN" "http://java.sun.com/products/javahelp/toc_2_0.dtd">
<toc version="2.0">
<tocitem text="Blender Support">
<tocitem text="About Blender Support" target="com.jme3.gde.blender.about"/>
</tocitem>
</toc>

@ -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

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
*** GENERATED FROM project.xml - DO NOT EDIT ***
*** EDIT ../build.xml INSTEAD ***
-->
<project name="com.jme3.gde.blender-impl" basedir="..">
<fail message="Please build using Ant 1.7.1 or higher.">
<condition>
<not>
<antversion atleast="1.7.1"/>
</not>
</condition>
</fail>
<property file="nbproject/private/suite-private.properties"/>
<property file="nbproject/suite.properties"/>
<fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
<property file="${suite.dir}/nbproject/private/platform-private.properties"/>
<property file="${suite.dir}/nbproject/platform.properties"/>
<macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
<attribute name="name"/>
<attribute name="value"/>
<sequential>
<property name="@{name}" value="${@{value}}"/>
</sequential>
</macrodef>
<macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
<attribute name="property"/>
<attribute name="value"/>
<sequential>
<property name="@{property}" value="@{value}"/>
</sequential>
</macrodef>
<property file="${user.properties.file}"/>
<nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
<fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
<condition>
<not>
<contains string="${cluster.path.evaluated}" substring="platform"/>
</not>
</condition>
</fail>
<import file="${harness.dir}/build.xml"/>
</project>

@ -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

@ -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

@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>com.jme3.gde.blender</code-name-base>
<suite-component/>
<module-dependencies>
<dependency>
<code-name-base>com.jme3.gde.core</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>0.11</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>com.jme3.gde.core.baselibs</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>0.6</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.progress</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.projectapi</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>1</release-version>
<specification-version>1.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.awt</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.dialogs</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.filesystems</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.loaders</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.nodes</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>7.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.0</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.openide.util.lookup</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<specification-version>8.0</specification-version>
</run-dependency>
</dependency>
</module-dependencies>
<public-packages>
<package>com.jme3.gde.blender</package>
</public-packages>
</data>
</configuration>
</project>

@ -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");
}
}

@ -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);
}
}

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To change this template, choose Tools | Templates
and open the template in the editor.
-->
<!DOCTYPE MIME-resolver PUBLIC "-//NetBeans//DTD MIME Resolver 1.0//EN" "http://www.netbeans.org/dtds/mime-resolver-1_0.dtd">
<MIME-resolver>
<file>
<ext name="blend"/>
<resolver mime="application/blender"/>
</file>
</MIME-resolver>

@ -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

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
To change this template, choose Tools | Templates
and open the template in the editor.
-->
<!DOCTYPE helpsetref PUBLIC "-//NetBeans//DTD JavaHelp Help Set Reference 1.0//EN" "http://www.netbeans.org/dtds/helpsetref-1_0.dtd">
<helpsetref url="nbdocs:/com/jme3/gde/blender/docs/blender-hs.xml"/>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="Loaders">
<folder name="application">
<folder name="blender">
<folder name="Actions">
<file name="com-jme3-gde-core-assets-actions-ConvertModel.shadow">
<attr name="originalFile" stringvalue="Actions/jMonkeyPlatform/com-jme3-gde-core-assets-actions-ConvertModel.instance"/>
<attr name="position" intvalue="10"/>
</file>
<file name="com-jme3-gde-core-assets-actions-OpenModel.shadow">
<attr name="originalFile" stringvalue="Actions/jMonkeyPlatform/com-jme3-gde-core-assets-actions-OpenModel.instance"/>
<attr name="position" intvalue="20"/>
</file>
<file name="org-openide-actions-CopyAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
<attr name="position" intvalue="300"/>
</file>
<file name="org-openide-actions-CutAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CutAction.instance"/>
<attr name="position" intvalue="200"/>
</file>
<file name="org-openide-actions-DeleteAction.shadow">
<attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-DeleteAction.instance"/>
<attr name="position" intvalue="500"/>
</file>
<file name="org-openide-actions-FileSystemAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-FileSystemAction.instance"/>
<attr name="position" intvalue="1000"/>
</file>
<file name="org-openide-actions-PropertiesAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-PropertiesAction.instance"/>
<attr name="position" intvalue="1300"/>
</file>
<file name="org-openide-actions-RenameAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-RenameAction.instance"/>
<attr name="position" intvalue="600"/>
</file>
<file name="org-openide-actions-SaveAsTemplateAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAsTemplateAction.instance"/>
<attr name="position" intvalue="800"/>
</file>
<file name="org-openide-actions-ToolsAction.shadow">
<attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
<attr name="position" intvalue="1200"/>
</file>
<file name="sep-1.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="100"/>
</file>
<file name="sep-2.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="400"/>
</file>
<file name="sep-3.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="700"/>
</file>
<file name="sep-4.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="900"/>
</file>
<file name="sep-5.instance">
<attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
<attr name="position" intvalue="1100"/>
</file>
</folder>
<folder name="Factories">
<file name="BlenderDataLoader.instance">
<attr name="SystemFileSystem.icon" urlvalue="nbresloc:/com/jme3/gde/blender/blender.png"/>
<attr name="dataObjectClass" stringvalue="com.jme3.gde.blender.BlenderDataObject"/>
<attr name="instanceCreate" methodvalue="org.openide.loaders.DataLoaderPool.factory"/>
<attr name="mimeType" stringvalue="application/blender"/>
</file>
</folder>
</folder>
</folder>
</folder>
<folder name="Services">
<folder name="JavaHelp">
<file name="blender-helpset.xml" url="blender-helpset.xml">
<attr name="position" intvalue="3133"/>
</file>
</folder>
<folder name="MIMEResolver">
<file name="BlenderResolver.xml" url="BlenderResolver.xml">
<attr name="displayName" bundlevalue="com.jme3.gde.blender.Bundle#Services/MIMEResolver/BlenderResolver.xml"/>
</file>
</folder>
</folder>
</filesystem>

@ -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

@ -87,6 +87,13 @@
<package>com.jme3.scene.debug</package>
<package>com.jme3.scene.mesh</package>
<package>com.jme3.scene.plugins</package>
<package>com.jme3.scene.plugins.blender</package>
<package>com.jme3.scene.plugins.blender.data</package>
<package>com.jme3.scene.plugins.blender.exception</package>
<package>com.jme3.scene.plugins.blender.helpers</package>
<package>com.jme3.scene.plugins.blender.helpers.v249</package>
<package>com.jme3.scene.plugins.blender.structures</package>
<package>com.jme3.scene.plugins.blender.utils</package>
<package>com.jme3.scene.plugins.ogre</package>
<package>com.jme3.scene.plugins.ogre.matext</package>
<package>com.jme3.scene.shape</package>

@ -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

Loading…
Cancel
Save