Merge pull request #2 from JavaSaBr/develop

Develop

Author: jmecn

.gitignore

@@ -1,8 +1,12 @@
 /bin/
 *.so
+*.dll
 *.log
 /build/
 /native-build/
 /.gradle/
 /.idea/
 /out/
+.classpath
+.project
+/.settings/

README.md

@@ -1,16 +1,30 @@
-# jMonkeyEngine 3 SpaceShift Editor 1.1.0 #
+# jMonkeyBuilder 1.3.0 #
 ## License: Apache Version 2.0 ##
 
 [![Join the chat at https://gitter.im/jME3-SpaceShift-Editor/Lobby](https://badges.gitter.im/jME3-SpaceShift-Editor/Lobby.svg)](https://gitter.im/jME3-SpaceShift-Editor/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-* [Wiki](https://bitbucket.org/JavaSabr/jme3-spaceshift-editor/wiki/Home)
+* [Wiki](https://bitbucket.org/JavaSabr/jmonkeybuilder/wiki/Home)
 * [Download](https://yadi.sk/d/UuKcJBNgqbV3a)
 * [Gitter](https://gitter.im/jME3-SpaceShift-Editor/Lobby?source=orgpage)
-* [Official jMonkey thread](https://hub.jmonkeyengine.org/t/jme3-spaceshift-editor/35179)
+* [Official jMonkey thread](https://hub.jmonkeyengine.org/t/editor-jmonkeybuilder/35179)
 * [Youtube channel](https://www.youtube.com/playlist?list=PLNdOH0eRoQMBkLPBvTIDn02UFhcTJWsh7)
 
 ## [Video about this editor](https://youtu.be/5nX8HXYdENU) ##
 
+## ver. 1.3.0 ##
+* -Updated static light probes.
+* -Implemented the import model action.
+* -Updated jME libraries.
+* -Fixed some bugs.
+
+## ver. 1.2.0 ##
+* -Fixed the far view plane distance of the editor camera.
+* -Updated tonegod.emitter library.
+* -Added the new plugin Shader Node Tools.
+* -Updated jME libraries.
+* -Updated Tree Generator plugin.
+* -Fixed some bugs.
+
 ## ver. 1.1.0 ##
 * -Added the new plugin to generate trees.
 * -Updated the Material Editor.
@@ -27,13 +41,13 @@ an option to the Settings Dialog to enable/disable native Folder Chooser.
 
 ## ver. 1.0.1 ##
 * -Implemented D&D of controls in a model tree.
-* -Implemented to load compiled classes from any IDE to improve integration with IDE's.
+* -Implemented a setting to load compiled classes from any IDE to improve integration with IDE's.
 * -Updated toneg0d.emitter library.
-* -Added glTF loader.
-* -Implemented auto-finding all available controls to create it in model tree.
-* -Added to show custom objects from user data of Spatial.
+* -Added glTF converter.
+* -Implemented auto-finding all available controls for the action to create a custom control.
+* -Added to show custom objects from user data of Spatial on the property panel.
 * -Included jME font creator plugin.
-* -Added to create editable sky nodes.
+* -Added an action to create editable sky nodes in Model Editor.
 * -Added image preview tooltips to Asset tree.
 * -Improved usability and fixed a lot of little bugs with UI.
 

app.version

@@ -1 +1 @@
-1.2.0
+1.3.1

build-native.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="jME SpaceShift Editor" default="do-deploy" basedir="native-build"
+<project name="jMonkeyBuilder" default="do-deploy" basedir="native-build"
          xmlns:fx="javafx:com.sun.javafx.tools.ant">
 
-    <property name="editor.version" value="1.2.0"/>
+    <property name="editor.version" value="1.3.1"/>
     <property environment="env"/>
 
     <condition property="gradle.executable" value="${basedir}/../gradlew.bat"
@@ -149,7 +149,7 @@
         </copy>
 
         <fx:resources id="appRes" >
-            <fx:fileset dir="dist" includes="jme3-spaceshift-editor.jar"/>
+            <fx:fileset dir="dist" includes="jmonkeybuilder.jar"/>
             <fx:fileset dir="dist" includes="licenses/*"/>
             <fx:fileset dir="dist" includes="licenses/libraries-licenses/*"/>
             <fx:fileset dir="dist" includes="libs/*"/>
@@ -159,26 +159,27 @@
         </fx:resources>
 
         <fx:application id="fxApplication"
-                        name="jME3-SpaceShift-Editor"
+                        name="jMonkeyBuilder"
                         mainClass="com.ss.editor.JFXApplication"
                         toolkit="fx"
                         version="${editor.version}"/>
 
         <mkdir dir="build/classes/META-INF"/>
 
-        <fx:jar destfile="dist/jme3-spaceshift-editor.jar">
+        <fx:jar destfile="dist/jmonkeybuilder.jar">
             <fx:application refid="fxApplication"/>
             <fileset dir="build/classes"/>
             <fx:resources refid="appRes"/>
 
             <manifest>
-                <attribute name="Implementation-Vendor" value="spaceshift.ru"/>
-                <attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
+                <attribute name="Implementation-Vendor" value="javasabr@gmail.com"/>
+                <attribute name="Implementation-Title" value="jMonkeyBuilder"/>
                 <attribute name="Implementation-Version" value="${editor.version}"/>
             </manifest>
         </fx:jar>
 
         <replace file="package/linux/control" token="@version@" value="${editor.version}"/>
+        <replace file="package/windows/jMonkeyBuilder.wxs" token="@version@" value="${editor.version}"/>
 
         <mkdir dir="deploy"/>
         <!-- Need to use ${basedir} because somehow the ant task is calculating the directory differently -->
@@ -188,27 +189,25 @@
                 includeDT="false"
                 offlineAllowed="true"
                 outdir="${basedir}/deploy"
-                outfile="jME3 SpaceShift Editor" nativeBundles="all"
+                outfile="jMonkeyBuilder" nativeBundles="all"
                 updatemode="background" verbose="true">
 
             <fx:platform>
-                <fx:jvmarg value="-XX:+AggressiveOpts"/>
                 <fx:jvmarg value="-XX:+UseParallelGC"/>
-                <fx:jvmarg value="-XX:+UseTLAB"/>
-                <fx:jvmarg value="-Djavafx.animation.fullspeed=true"/>
                 <!--<fx:jvmarg value="-agentlib:jdwp=transport=dt_socket,server=n,address=192.168.94.210:6005,suspend=y"/>-->
             </fx:platform>
 
             <preferences shortcut="true" menu="true" install="false"/>
 
-            <info category="graphics" copyright="spaceshift.ru"
-                  description="Editor for jMonkeyEngine 3 by SpaceShift Team"
-                  email="javasabr@gmail.com" license="Freeware" title="jME3 SpaceShift Editor" vendor="spaceshift.ru"/>
+            <info category="graphics"
+                  description="The 3D Editor for jMonkeyEngine 3.2"
+                  email="javasabr@gmail.com" license="Freeware" title="jMonkeyBuilder" vendor="javasabr@gmail.com"/>
 
             <application refId="fxApplication"/>
             <resources refid="appRes"/>
         </fx:deploy>
 
         <replace file="package/linux/control" token="${editor.version}" value="@version@"/>
+        <replace file="package/windows/jMonkeyBuilder.wxs" token="${editor.version}" value="@version@"/>
     </target>
 </project>

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0-RC2'
+        classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.0'
     }
 }
 
@@ -13,7 +13,7 @@ apply plugin: 'idea'
 apply plugin: 'org.junit.platform.gradle.plugin'
 
 group = 'com.spaceshift'
-version = '1.2.0'
+version = '1.3.1'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -24,11 +24,11 @@ compileTestJava {
     options.compilerArgs += '-parameters'
 }
 
-ext.jmeVersion = "3.2_branch-SNAPSHOT"
+ext.jmeVersion = "3.2-SNAPSHOT"
 ext.jme3_xbuf_version = '0.9.1'
 ext.lwjglVersion = "3.1.2"
-ext.junitPlatformVersion = "1.0.0-M5"
-ext.junitJupiterVersion = "5.0.0-M5"
+ext.junitPlatformVersion = "1.0.0"
+ext.junitJupiterVersion = "5.0.0"
 ext.log4jVersion = '2.6.2'
 
 junitPlatform {
@@ -41,7 +41,6 @@ junitPlatform {
     logManager 'org.apache.logging.log4j.jul.LogManager'
 }
 
-
 repositories {
     mavenCentral()
     jcenter()
@@ -126,10 +125,10 @@ dependencies {
     compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
 
     // extensions
-    compile ('com.github.JavaSaBr:jme3-spaceshift-extension:1.6.0') {
+    compile ('com.github.JavaSaBr:jmonkeybuilder-extension:1.9.3') {
         exclude group: 'org.jmonkeyengine'
     }
-    compile ('com.github.JavaSaBr:tonegodemitter:2.3.4') {
+    compile ('com.github.JavaSaBr:tonegodemitter:2.4.0') {
         exclude group: 'org.jmonkeyengine'
     }
 
@@ -174,7 +173,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.1'
+    gradleVersion = '4.3'
 }
 
 artifacts {
@@ -188,11 +187,10 @@ defaultTasks 'clean', 'install'
 install {
     repositories.mavenInstaller {
         pom.version = version
-        pom.artifactId = 'jme3-spaceshift-editor'
+        pom.artifactId = 'jmonkeybuilder'
         pom.project {
             licenses {
                 license {
-                    name 'The Apache Software License, Version 2.0'
                     url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     distribution 'repo'
                 }