From 25ca07d3d2330813a56e05d37fdc30742cd94ec5 Mon Sep 17 00:00:00 2001 From: Matt Benson Date: Sun, 26 Jul 2015 18:26:22 -0500 Subject: [PATCH 01/31] light constructors --- .../java/com/jme3/light/AmbientLight.java | 10 +++++- .../java/com/jme3/light/DirectionalLight.java | 15 ++++++++- .../src/main/java/com/jme3/light/Light.java | 11 +++++-- .../main/java/com/jme3/light/PointLight.java | 15 ++++++++- .../main/java/com/jme3/light/SpotLight.java | 32 +++++++++++++------ 5 files changed, 69 insertions(+), 14 deletions(-) diff --git a/jme3-core/src/main/java/com/jme3/light/AmbientLight.java b/jme3-core/src/main/java/com/jme3/light/AmbientLight.java index e147c6590..8dd5f9266 100644 --- a/jme3-core/src/main/java/com/jme3/light/AmbientLight.java +++ b/jme3-core/src/main/java/com/jme3/light/AmbientLight.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2012, 2015 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,6 +32,7 @@ package com.jme3.light; import com.jme3.bounding.BoundingBox; +import com.jme3.math.ColorRGBA; import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; import com.jme3.scene.Spatial; @@ -49,6 +50,13 @@ import com.jme3.util.TempVars; */ public class AmbientLight extends Light { + public AmbientLight() { + } + + public AmbientLight(ColorRGBA color) { + super(color); + } + @Override public boolean intersectsBox(BoundingBox box, TempVars vars) { return true; diff --git a/jme3-core/src/main/java/com/jme3/light/DirectionalLight.java b/jme3-core/src/main/java/com/jme3/light/DirectionalLight.java index c4258a67f..31e6e34a9 100644 --- a/jme3-core/src/main/java/com/jme3/light/DirectionalLight.java +++ b/jme3-core/src/main/java/com/jme3/light/DirectionalLight.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2012, 2015 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,6 +36,7 @@ import com.jme3.export.InputCapsule; import com.jme3.export.JmeExporter; import com.jme3.export.JmeImporter; import com.jme3.export.OutputCapsule; +import com.jme3.math.ColorRGBA; import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; import com.jme3.scene.Spatial; @@ -53,6 +54,18 @@ public class DirectionalLight extends Light { protected Vector3f direction = new Vector3f(0f, -1f, 0f); + public DirectionalLight() { + } + + public DirectionalLight(Vector3f direction) { + setDirection(direction); + } + + public DirectionalLight(Vector3f direction, ColorRGBA color) { + super(color); + setDirection(direction); + } + @Override public void computeLastDistance(Spatial owner) { lastDistance = 0; // directional lights are always closest to their owner diff --git a/jme3-core/src/main/java/com/jme3/light/Light.java b/jme3-core/src/main/java/com/jme3/light/Light.java index 4217e1b62..b1c48be7a 100644 --- a/jme3-core/src/main/java/com/jme3/light/Light.java +++ b/jme3-core/src/main/java/com/jme3/light/Light.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2012, 2015 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -94,7 +94,7 @@ public abstract class Light implements Savable, Cloneable { } } - protected ColorRGBA color = new ColorRGBA(1f,1f,1f,1f); + protected ColorRGBA color = new ColorRGBA(ColorRGBA.White); /** * Used in LightList for caching the distance @@ -115,6 +115,13 @@ public abstract class Light implements Savable, Cloneable { boolean frustumCheckNeeded = true; boolean intersectsFrustum = false; + protected Light() { + } + + protected Light(ColorRGBA color) { + setColor(color); + } + /** * Returns the color of the light. * diff --git a/jme3-core/src/main/java/com/jme3/light/PointLight.java b/jme3-core/src/main/java/com/jme3/light/PointLight.java index 55a129275..50a89698c 100644 --- a/jme3-core/src/main/java/com/jme3/light/PointLight.java +++ b/jme3-core/src/main/java/com/jme3/light/PointLight.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2012, 2015 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,6 +38,7 @@ import com.jme3.export.InputCapsule; import com.jme3.export.JmeExporter; import com.jme3.export.JmeImporter; import com.jme3.export.OutputCapsule; +import com.jme3.math.ColorRGBA; import com.jme3.math.FastMath; import com.jme3.math.Plane; import com.jme3.math.Vector3f; @@ -62,6 +63,18 @@ public class PointLight extends Light { protected float radius = 0; protected float invRadius = 0; + public PointLight() { + } + + public PointLight(Vector3f position) { + setPosition(position); + } + + public PointLight(Vector3f position, ColorRGBA color) { + super(color); + setPosition(position); + } + @Override public void computeLastDistance(Spatial owner) { if (owner.getWorldBound() != null) { diff --git a/jme3-core/src/main/java/com/jme3/light/SpotLight.java b/jme3-core/src/main/java/com/jme3/light/SpotLight.java index e6443df7c..2eb69a473 100644 --- a/jme3-core/src/main/java/com/jme3/light/SpotLight.java +++ b/jme3-core/src/main/java/com/jme3/light/SpotLight.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012 jMonkeyEngine + * Copyright (c) 2009-2012, 2015 jMonkeyEngine * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,6 +34,7 @@ package com.jme3.light; import com.jme3.bounding.BoundingBox; import com.jme3.bounding.BoundingVolume; import com.jme3.export.*; +import com.jme3.math.ColorRGBA; import com.jme3.math.FastMath; import com.jme3.math.Plane; import com.jme3.math.Vector3f; @@ -44,27 +45,27 @@ import java.io.IOException; /** * Represents a spot light. - * A spot light emmit a cone of light from a position and in a direction. - * It can be used to fake torch lights or car's lights. + * A spot light emits a cone of light from a position and in a direction. + * It can be used to fake torch lights or cars' lights. *

* In addition to a position and a direction, spot lights also have a range which * can be used to attenuate the influence of the light depending on the - * distance between the light and the effected object. + * distance between the light and the affected object. * Also the angle of the cone can be tweaked by changing the spot inner angle and the spot outer angle. - * the spot inner angle determin the cone of light where light has full influence. - * the spot outer angle determin the cone global cone of light of the spot light. - * the light intensity slowly decrease between the inner cone and the outer cone. + * the spot inner angle determines the cone of light where light has full influence. + * the spot outer angle determines the cone global cone of light of the spot light. + * the light intensity slowly decreases between the inner cone and the outer cone. * @author Nehon */ public class SpotLight extends Light { protected Vector3f position = new Vector3f(); - protected Vector3f direction = new Vector3f(0,-1,0); + protected Vector3f direction = new Vector3f(0, -1, 0); protected float spotInnerAngle = FastMath.QUARTER_PI / 8; protected float spotOuterAngle = FastMath.QUARTER_PI / 6; protected float spotRange = 100; protected float invSpotRange = 1f / 100; - protected float packedAngleCos=0; + protected float packedAngleCos = 0; protected float outerAngleCosSqr, outerAngleSinSqr; protected float outerAngleSinRcp, outerAngleSin, outerAngleCos; @@ -74,6 +75,19 @@ public class SpotLight extends Light { computeAngleParameters(); } + public SpotLight(Vector3f position, Vector3f direction) { + this(); + setPosition(position); + setDirection(direction); + } + + public SpotLight(Vector3f position, Vector3f direction, ColorRGBA color) { + super(color); + computeAngleParameters(); + setPosition(position); + setDirection(direction); + } + private void computeAngleParameters() { float innerCos = FastMath.cos(spotInnerAngle); outerAngleCos = FastMath.cos(spotOuterAngle); From 758317d06a381abdd09436a384774bae62bd8c02 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 15 Aug 2015 12:16:37 -0400 Subject: [PATCH 02/31] sdk: enable font antialiasing, DPI awareness --- sdk/nbproject/project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/nbproject/project.properties b/sdk/nbproject/project.properties index 763f07fdc..64104ff3a 100644 --- a/sdk/nbproject/project.properties +++ b/sdk/nbproject/project.properties @@ -12,7 +12,7 @@ app.version=3.1-snapshot-github plugins.version=3.1.0 nbm.revision=0 #command line args -run.args.extra=-J-Xmx512m -J-XX\:PermSize\=128m -J-XX\:MaxDirectMemorySize\=2048m -J-Dsun.zip.disableMemoryMapping\=true -J-Dapple.awt.graphics.UseQuartz\=true -J-Dsun.java2d.noddraw\=true +run.args.extra=-J-Dsun.java2d.dpiaware\=true -J-Dapple.laf.useScreenMenuBar\=true -J-Dawt.useSystemAAFontSettings\=lcd -J-Dswing.aatext\=true -J-Xmx512m -J-XX\:MaxDirectMemorySize\=2048m -J-Dsun.zip.disableMemoryMapping\=true -J-Dapple.awt.graphics.UseQuartz\=true -J-Dsun.java2d.noddraw\=true auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true From 60f209c371758554fec5f7ff5775b5717fecbc63 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 15 Aug 2015 12:19:53 -0400 Subject: [PATCH 03/31] .gitignore: more sdk private folders --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 7efa14374..606f718e9 100644 --- a/.gitignore +++ b/.gitignore @@ -136,8 +136,10 @@ !/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so /.nb-gradle/ /sdk/ant-jme/nbproject/private/ +/sdk/nbi/stub/ext/engine/nbproject/private/ /sdk/nbi/stub/ext/components/products/jdk/nbproject/private/ /sdk/nbi/stub/ext/components/products/blender/nbproject/private/ +/sdk/nbi/stub/ext/components/products/helloworld/nbproject/private/ /sdk/BasicGameTemplate/nbproject/private/ /sdk/nbi/stub/ext/components/products/jdk/build/ /sdk/nbi/stub/ext/components/products/jdk/dist/ From e14c6467ffd1285eb6a818fde3c6ac1dae30027d Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 15 Aug 2015 13:09:38 -0400 Subject: [PATCH 04/31] sdk: update to blender 2.75a --- .../src/com/jme3/gde/blender/BlenderTool.java | 4 ++-- .../build/products/blender-linux-x64/build.properties | 8 ++++---- .../build/products/blender-linux-x86/build.properties | 8 ++++---- .../infra/build/products/blender-macosx/build.properties | 4 ++-- .../build/products/blender-windows-x64/build.properties | 6 +++--- .../build/products/blender-windows-x86/build.properties | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java index 0211cae7a..2ccb080e4 100644 --- a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java @@ -251,9 +251,9 @@ public class BlenderTool { } private static File getBlenderSettingsFolder() { - File blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.69", null, false); + File blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.75", null, false); if (blender == null) { - blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.67", null, false); + blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.69", null, false); } if (blender == null) { DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message("Error finding Blender settings")); diff --git a/sdk/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties b/sdk/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties index 80025b8d2..f211c8350 100644 --- a/sdk/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties +++ b/sdk/nbi/stub/ext/infra/build/products/blender-linux-x64/build.properties @@ -103,9 +103,9 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name} # * indices should start with 1 product.data.length=1 product.data.1.zip=false -product.data.1.uri=http://download.blender.org/release/Blender2.69/blender-2.69-linux-glibc211-x86_64.tar.bz2 -product.data.tar=blender-2.69-linux-glibc211-x86_64.tar.bz2 -product.data.sub.dir=blender-2.69-linux-glibc211-x86_64 +product.data.1.uri=http://download.blender.org/release/Blender2.75/blender-2.75a-linux-glibc211-x86_64.tar.bz2 +product.data.tar=blender-2.75a-linux-glibc211-x86_64.tar.bz2 +product.data.sub.dir=blender-2.75a-linux-glibc211-x86_64 # modificator for the required disk space parameter; the core value will be the # sum of unzipped unstallation data files @@ -158,4 +158,4 @@ product.properties.3.value=$N{install}/{product-install-directory-name-macosx}.a # * ${sources.params.length} - total number of the parameters # * indices should start with 1 # * parameters are not i18n compliant -sources.params.length=0 \ No newline at end of file +sources.params.length=0 diff --git a/sdk/nbi/stub/ext/infra/build/products/blender-linux-x86/build.properties b/sdk/nbi/stub/ext/infra/build/products/blender-linux-x86/build.properties index 001bf2a09..a4b1fbb88 100644 --- a/sdk/nbi/stub/ext/infra/build/products/blender-linux-x86/build.properties +++ b/sdk/nbi/stub/ext/infra/build/products/blender-linux-x86/build.properties @@ -103,9 +103,9 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name} # * indices should start with 1 product.data.length=1 product.data.1.zip=false -product.data.1.uri=http://download.blender.org/release/Blender2.69/blender-2.69-linux-glibc211-i686.tar.bz2 -product.data.tar=blender-2.69-linux-glibc211-i686.tar.bz2 -product.data.sub.dir=blender-2.69-linux-glibc211-i686 +product.data.1.uri=http://download.blender.org/release/Blender2.75/blender-2.75a-linux-glibc211-i686.tar.bz2 +product.data.tar=blender-2.75a-linux-glibc211-i686.tar.bz2 +product.data.sub.dir=blender-2.75a-linux-glibc211-i686 # modificator for the required disk space parameter; the core value will be the # sum of unzipped unstallation data files @@ -158,4 +158,4 @@ product.properties.3.value=$N{install}/{product-install-directory-name-macosx}.a # * ${sources.params.length} - total number of the parameters # * indices should start with 1 # * parameters are not i18n compliant -sources.params.length=0 \ No newline at end of file +sources.params.length=0 diff --git a/sdk/nbi/stub/ext/infra/build/products/blender-macosx/build.properties b/sdk/nbi/stub/ext/infra/build/products/blender-macosx/build.properties index b009bc2ec..ef15b8f6a 100644 --- a/sdk/nbi/stub/ext/infra/build/products/blender-macosx/build.properties +++ b/sdk/nbi/stub/ext/infra/build/products/blender-macosx/build.properties @@ -104,7 +104,7 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name} product.data.length=1 product.data.1.zip=true #normen -product.data.1.uri=http://download.blender.org/release/Blender2.69/blender-2.69-OSX_10.6-x86_64.zip +product.data.1.uri=http://download.blender.org/release/Blender2.75/blender-2.75a-OSX_10.6-x86_64.zip product.data.root=Blender product.data.sub.dir=Blender @@ -159,4 +159,4 @@ product.properties.3.value=$N{install}/{product-install-directory-name-macosx}.a # * ${sources.params.length} - total number of the parameters # * indices should start with 1 # * parameters are not i18n compliant -sources.params.length=0 \ No newline at end of file +sources.params.length=0 diff --git a/sdk/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties b/sdk/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties index a9a684573..b84a212f7 100644 --- a/sdk/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties +++ b/sdk/nbi/stub/ext/infra/build/products/blender-windows-x64/build.properties @@ -103,8 +103,8 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name} # * indices should start with 1 product.data.length=1 product.data.1.zip=true -product.data.1.uri=http://download.blender.org/release/Blender2.69/blender-2.69-windows64.zip -product.data.sub.dir=blender-2.69-windows64 +product.data.1.uri=http://download.blender.org/release/Blender2.75/blender-2.75a-windows64.zip +product.data.sub.dir=blender-2.75a-windows64 # modificator for the required disk space parameter; the core value will be the # sum of unzipped unstallation data files @@ -157,4 +157,4 @@ product.properties.3.value=$N{install}/{product-install-directory-name-macosx}.a # * ${sources.params.length} - total number of the parameters # * indices should start with 1 # * parameters are not i18n compliant -sources.params.length=0 \ No newline at end of file +sources.params.length=0 diff --git a/sdk/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties b/sdk/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties index 31e72a069..642584f24 100644 --- a/sdk/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties +++ b/sdk/nbi/stub/ext/infra/build/products/blender-windows-x86/build.properties @@ -103,9 +103,9 @@ product.logic.1.path=${nbproject.dist.dir}/${nbproject.dist.file.name} # * indices should start with 1 product.data.length=1 product.data.1.zip=true -#normenhttp://ftp.nluug.nl/pub/graphics/blender/release//Blender2.65/blender-2.65a-windows32.zip -product.data.1.uri=http://download.blender.org/release/Blender2.69/blender-2.69-windows32.zip -product.data.sub.dir=blender-2.69-windows32 +#normen +product.data.1.uri=http://download.blender.org/release/Blender2.75/blender-2.75a-windows32.zip +product.data.sub.dir=blender-2.75a-windows32 # modificator for the required disk space parameter; the core value will be the # sum of unzipped unstallation data files @@ -158,4 +158,4 @@ product.properties.3.value=$N{install}/{product-install-directory-name-macosx}.a # * ${sources.params.length} - total number of the parameters # * indices should start with 1 # * parameters are not i18n compliant -sources.params.length=0 \ No newline at end of file +sources.params.length=0 From 3bd52ba4f1e899d285ac1692ef501370cd99de53 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 15 Aug 2015 13:12:58 -0400 Subject: [PATCH 05/31] sdk blender plugin: fix settings path for Mac OS X --- .../src/com/jme3/gde/blender/BlenderTool.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java index 2ccb080e4..1d55a6b35 100644 --- a/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java +++ b/sdk/jme3-blender/src/com/jme3/gde/blender/BlenderTool.java @@ -164,6 +164,14 @@ public class BlenderTool { return "../blender"; } } + + private static String getBlenderOsSettingsPath() { + if (Utilities.isMac()) { + return "../blender/blender.app/Contents/Resources"; + } else { + return "../blender"; + } + } private static boolean checkBlenderFolders() { String jmpDir = Places.getUserDirectory().getAbsolutePath(); @@ -251,9 +259,9 @@ public class BlenderTool { } private static File getBlenderSettingsFolder() { - File blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.75", null, false); + File blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.75", null, false); if (blender == null) { - blender = InstalledFileLocator.getDefault().locate(getBlenderOsPath() + "/2.69", null, false); + blender = InstalledFileLocator.getDefault().locate(getBlenderOsSettingsPath() + "/2.69", null, false); } if (blender == null) { DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message("Error finding Blender settings")); From 639a1da78dbc49ccb0c81b10f369af7fec6c727b Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 15 Aug 2015 13:56:30 -0400 Subject: [PATCH 06/31] sdk: fix exception when creating "JME3 Tests" project --- .../com/jme3/gde/templates/tests/testsdesktop/Bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties index 189077573..c5264da33 100644 --- a/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties +++ b/sdk/jme3-tests-template/src/com/jme3/gde/templates/tests/testsdesktop/Bundle.properties @@ -1,7 +1,7 @@ # To change this license header, choose License Headers in Project Properties. # To change this template file, choose Tools | Templates # and open the template in the editor. - +LBL_CreateProjectStep=Name and Location JmeTestsPanelVisual.projectNameLabel.text=Project &Name: JmeTestsPanelVisual.projectLocationLabel.text=Project &Location: JmeTestsPanelVisual.browseButton.actionCommand=BROWSE From afe5b91605454e39856644ee1cafb108f8b503d5 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sat, 15 Aug 2015 14:09:09 -0400 Subject: [PATCH 07/31] sdk: fix library references in JME3 Tests template --- .../nbproject/project.properties | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sdk/JME3TestsTemplate/nbproject/project.properties b/sdk/JME3TestsTemplate/nbproject/project.properties index b502a6417..489a9c7d9 100644 --- a/sdk/JME3TestsTemplate/nbproject/project.properties +++ b/sdk/JME3TestsTemplate/nbproject/project.properties @@ -25,9 +25,17 @@ excludes= includes=** jar.compress=false javac.classpath=\ - ${libs.jme3.classpath}:\ - ${libs.jme3-libraries.classpath}:\ - ${libs.jme3-libraries-blender.classpath}:\ + ${libs.jme3-jogg.classpath}:\ + ${libs.jme3-blender.classpath}:\ + ${libs.jme3-networking.classpath}:\ + ${libs.jme3-plugins.classpath}:\ + ${libs.jme3-core.classpath}:\ + ${libs.jme3-desktop.classpath}:\ + ${libs.jme3-lwjgl.classpath}:\ + ${libs.jme3-niftygui.classpath}:\ + ${libs.jme3-effects.classpath}:\ + ${libs.jme3-terrain.classpath}:\ + ${libs.jme3-jbullet.classpath}:\ ${libs.jme3-test-data.classpath} # Space-separated list of extra javac options javac.compilerargs= @@ -36,9 +44,7 @@ javac.source=1.6 javac.target=1.6 javac.test.classpath=\ ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} + ${build.classes.dir} javadoc.additionalparam= javadoc.author=false javadoc.encoding=${source.encoding} From bcbbf001ce0522a1573aa01a668a15102b8e4907 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sun, 16 Aug 2015 18:44:41 -0400 Subject: [PATCH 08/31] sdk plugins: enable NBMs to be signed with jME signature --- .../nbproject/project.xml | 2 + ...g.netbeans.spi.autoupdate.KeyStoreProvider | 1 + .../keystore/JmeKeyStoreProvider.java | 47 ++++++++++++++++++ .../updatecenters/keystore/trustedcerts.jks | Bin 0 -> 802 bytes 4 files changed, 50 insertions(+) create mode 100644 sdk/jme3-core-updatecenters/src/META-INF/services/org.netbeans.spi.autoupdate.KeyStoreProvider create mode 100644 sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/JmeKeyStoreProvider.java create mode 100644 sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/trustedcerts.jks diff --git a/sdk/jme3-core-updatecenters/nbproject/project.xml b/sdk/jme3-core-updatecenters/nbproject/project.xml index 3979d8b02..abc894aed 100644 --- a/sdk/jme3-core-updatecenters/nbproject/project.xml +++ b/sdk/jme3-core-updatecenters/nbproject/project.xml @@ -8,6 +8,8 @@ org.netbeans.modules.autoupdate.services + + 1.47.2 diff --git a/sdk/jme3-core-updatecenters/src/META-INF/services/org.netbeans.spi.autoupdate.KeyStoreProvider b/sdk/jme3-core-updatecenters/src/META-INF/services/org.netbeans.spi.autoupdate.KeyStoreProvider new file mode 100644 index 000000000..1af1a906c --- /dev/null +++ b/sdk/jme3-core-updatecenters/src/META-INF/services/org.netbeans.spi.autoupdate.KeyStoreProvider @@ -0,0 +1 @@ +com.jme3.gde.core.updatecenters.keystore.JmeKeyStoreProvider diff --git a/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/JmeKeyStoreProvider.java b/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/JmeKeyStoreProvider.java new file mode 100644 index 000000000..d94e548bd --- /dev/null +++ b/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/JmeKeyStoreProvider.java @@ -0,0 +1,47 @@ +package com.jme3.gde.core.updatecenters.keystore; + +import java.io.IOException; +import java.io.InputStream; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import org.netbeans.spi.autoupdate.KeyStoreProvider; +import org.openide.util.Exceptions; + +/** + * Loads the jMonkeyEngine SDK Plugins certificates into the AutoUpdate system. + * + * @author Kirill Vainer + */ +public class JmeKeyStoreProvider implements KeyStoreProvider { + + @Override + public KeyStore getKeyStore() { + InputStream in = null; + try { + in = JmeKeyStoreProvider.class.getResourceAsStream("trustedcerts.jks"); + KeyStore store = KeyStore.getInstance("JKS"); + store.load(in, "trustedcerts".toCharArray()); + return store; + } catch (KeyStoreException ex) { + Exceptions.printStackTrace(ex); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } catch (NoSuchAlgorithmException ex) { + Exceptions.printStackTrace(ex); + } catch (CertificateException ex) { + Exceptions.printStackTrace(ex); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException ex) { + Exceptions.printStackTrace(ex); + } + } + } + return null; + } + +} diff --git a/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/trustedcerts.jks b/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/keystore/trustedcerts.jks new file mode 100644 index 0000000000000000000000000000000000000000..fef5a315c72fece2cb6691f697a3f910eb1d100b GIT binary patch literal 802 zcmezO_TO6u1_mY|W(3phS-Gi2`S~S4zQ4shiJJ_p5qhQumOv$s44Rnk0ddL#W+p}^ zCPqdBE;bIWHji_*EX+&>NrqwuB5cf|EL_68S-$ys*{PMTdFh#XsfKa}G9YngVNn!u z1!qTvAfQEt8U|`?oIrEhzVkA2GKxti=jW9qCYLy5<$_H~1)HLmUzBbjC(dhVYG7e# zW@KbwXy8oXa9J zW9PqF&CcSVtNWcd#pLs>d;T!@=bIm=Zd^*_etu((y3_M#yF5yJi{>~~m{#SzyD}$8 zsMTyu@&cdE7(>plZ?EpmGJgGa$!00hiOYqTp7v!o5?tK))}Zl~feVhG~g`7>KV5;`4yglQtV8D=RxQGjiHu&R{S|WisG2Nl4cZ znVB)^jq~pNU%k6uM}?NE{GBE9)hYQubQbKeczES@F}tv!LlQ@BDU%_?2NvmF zOtr;E=k8Bxu=?C};^j}9S)Up8Cio=2%YPxoYVLa0J8PN2;}yGhZWR7#QQrQ|D!27s U%zC~D+b`dI%qIIj{NSxE01vSWNdN!< literal 0 HcmV?d00001 From 11596f9e896454ab7418cd8d1cc3aee63bb47bd1 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sun, 16 Aug 2015 18:46:35 -0400 Subject: [PATCH 09/31] sdk update center: use 3.1 specific path for contributed plugins --- .../src/com/jme3/gde/core/updatecenters/Bundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties b/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties index dd627e347..eb84743c9 100644 --- a/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties +++ b/sdk/jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/Bundle.properties @@ -1,7 +1,7 @@ #jMP update centers com_jme3_gde_core_update_center_nightly=http://updates.jmonkeyengine.org/nightly/3.1/plugins/updates.xml com_jme3_gde_core_update_center_stable=http://updates.jmonkeyengine.org/stable/3.1/plugins/updates.xml -com_jme3_jmp_contributions_update_center=http://updates.jmonkeyengine.org/contributions/updates.xml +com_jme3_jmp_contributions_update_center=http://updates.jmonkeyengine.org/contrib/3.1/updates.xml #jMP update centers Services/AutoupdateType/com_jme3_gde_core_update_center_nightly.instance=jMonkeyEngine SDK Nightly (Breaks!) From 7b7ebaf94684fb95e463dc9dabace135c45196d2 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sun, 16 Aug 2015 22:21:08 -0400 Subject: [PATCH 10/31] version: use the two digit version to generate the full version string --- version.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/version.gradle b/version.gradle index a02f1d358..c0510e5d7 100644 --- a/version.gradle +++ b/version.gradle @@ -3,25 +3,25 @@ ===================== Nightly Build Snapshot - * Full Version: 3.1.0-5124 + * Full Version: 3.1-5124 * POM Version: 3.1.0-SNAPSHOT * NBM Revision: 5124 * NBM UC Suffix: nightly/3.1/plugins Nightly Build Snapshot (PBRIsComing branch) - * Full Version: 3.1.0-PBRIsComing-5124 + * Full Version: 3.1-PBRIsComing-5124 * POM Version: 3.1.0-PBRIsComing-SNAPSHOT * NBM Revision: 5124 * NBM UC Suffix: PBRIsComing-nightly/3.1/plugins Alpha1 Release - * Full Version: 3.1.0-alpha1 + * Full Version: 3.1-alpha1 * POM Version: 3.1.0-alpha1 * NBM Revision: 1 * NBM UC Suffix: stable/3.1/plugins Final Release - * Full Version: 3.1.0 + * Full Version: 3.1 * POM Version: 3.1.0 * NBM Revision: 5 * NBM UC Suffix: stable/3.1/plugins @@ -62,7 +62,7 @@ task configureVersionInfo { jmeGitTag = grgit.describe() if (jmeGitTag == null) jmeGitTag = "" - jmeFullVersion = "${jmeVersion}" + jmeFullVersion = jmeMainVersion jmePomVersion = jmeVersion if (jmeBranchName != "master") { From 8c4af6b03979c35952c1c62fa11d24bdff45ae8e Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Sun, 16 Aug 2015 22:25:48 -0400 Subject: [PATCH 11/31] sdk modules: fix missing metadata --- sdk/jme3-angelfont/nbproject/project.properties | 2 ++ sdk/jme3-blender/nbproject/project.properties | 1 + sdk/jme3-code-check/nbproject/project.properties | 3 +++ sdk/jme3-obfuscate/nbproject/project.properties | 1 + 4 files changed, 7 insertions(+) diff --git a/sdk/jme3-angelfont/nbproject/project.properties b/sdk/jme3-angelfont/nbproject/project.properties index 0411b6ff9..2cf7a410b 100644 --- a/sdk/jme3-angelfont/nbproject/project.properties +++ b/sdk/jme3-angelfont/nbproject/project.properties @@ -1,4 +1,6 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.6 javac.compilerargs=-Xlint -Xlint\:-serial +nbm.homepage=http\://www.jmonkeyengine.org +nbm.module.author=Normen Hansen spec.version.base=3.1.0 diff --git a/sdk/jme3-blender/nbproject/project.properties b/sdk/jme3-blender/nbproject/project.properties index fa453f9a3..b47098087 100644 --- a/sdk/jme3-blender/nbproject/project.properties +++ b/sdk/jme3-blender/nbproject/project.properties @@ -1,6 +1,7 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.6 javac.compilerargs=-Xlint -Xlint\:-serial +license.file=../license-jme.txt nbm.homepage=http\://www.jmonkeyengine.org nbm.module.author=Kaelthas nbm.needs.restart=true diff --git a/sdk/jme3-code-check/nbproject/project.properties b/sdk/jme3-code-check/nbproject/project.properties index 0411b6ff9..6700898e0 100644 --- a/sdk/jme3-code-check/nbproject/project.properties +++ b/sdk/jme3-code-check/nbproject/project.properties @@ -1,4 +1,7 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.6 javac.compilerargs=-Xlint -Xlint\:-serial +license.file=../license-jme.txt +nbm.homepage=http\://www.jmonkeyengine.org +nbm.module.author=Normen Hansen spec.version.base=3.1.0 diff --git a/sdk/jme3-obfuscate/nbproject/project.properties b/sdk/jme3-obfuscate/nbproject/project.properties index 93b5b7a4b..d16349a4f 100644 --- a/sdk/jme3-obfuscate/nbproject/project.properties +++ b/sdk/jme3-obfuscate/nbproject/project.properties @@ -1,6 +1,7 @@ #Thu, 25 Aug 2011 20:26:50 +0200 javac.source=1.6 javac.compilerargs=-Xlint -Xlint\:-serial +license.file=../license-jme.txt nbm.homepage=http\://proguard.sourceforge.net/ nbm.module.author=Normen Hansen nbm.needs.restart=true From a007c68c872dda89d912f8e74e7a74f145bd93c9 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Mon, 17 Aug 2015 21:32:40 -0400 Subject: [PATCH 12/31] sdk installer: fix NPE if folder to make executable is missing --- .../helloworld/src/org/mycompany/ConfigurationLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java b/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java index d6cd82a78..33919908c 100644 --- a/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java +++ b/sdk/nbi/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java @@ -213,7 +213,8 @@ public class ConfigurationLogic extends ProductConfigurationLogic { } private static void setExecutableContents(File parent, String path) { File binDir = new File(parent, path); - for (File file : binDir.listFiles()) { + File[] fileList = binDir.listFiles(); + for (File file : fileList) { try { file.setExecutable(true, false); } catch (Exception ex) { From c5c893fd11b1f4e267d4d66296d5c632f493a42f Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Mon, 17 Aug 2015 21:39:13 -0400 Subject: [PATCH 13/31] sdk platform: update build-impl from the netbeans harness --- sdk/JME3TestsTemplate/build.xml | 3 +- .../nbproject/genfiles.properties | 16 +- .../nbproject/genfiles.properties | 4 +- sdk/jme3-core-baselibs/nbproject/project.xml | 171 +++++++++--------- sdk/jme3-core-libraries/nbproject/project.xml | 54 ++++++ .../nbproject/genfiles.properties | 4 +- .../products/blender/nbproject/build-impl.xml | 147 ++++++++------- .../blender/nbproject/genfiles.properties | 4 +- .../helloworld/nbproject/build-impl.xml | 147 ++++++++------- .../helloworld/nbproject/genfiles.properties | 4 +- .../products/jdk/nbproject/build-impl.xml | 147 ++++++++------- .../jdk/nbproject/genfiles.properties | 4 +- .../stub/ext/engine/nbproject/build-impl.xml | 147 ++++++++------- .../ext/engine/nbproject/genfiles.properties | 4 +- 14 files changed, 489 insertions(+), 367 deletions(-) diff --git a/sdk/JME3TestsTemplate/build.xml b/sdk/JME3TestsTemplate/build.xml index c1f098b99..d39b505e6 100644 --- a/sdk/JME3TestsTemplate/build.xml +++ b/sdk/JME3TestsTemplate/build.xml @@ -51,8 +51,7 @@ -init-macrodef-junit: defines macro for junit execution -init-macrodef-debug: defines macro for class debugging -init-macrodef-java: defines macro for class execution - -do-jar-with-manifest: JAR building (if you are using a manifest) - -do-jar-without-manifest: JAR building (if you are not using a manifest) + -do-jar: JAR building run: execution of project -javadoc-build: Javadoc generation test-report: JUnit report generation diff --git a/sdk/JME3TestsTemplate/nbproject/genfiles.properties b/sdk/JME3TestsTemplate/nbproject/genfiles.properties index 6fb0f140e..eca6dafb7 100644 --- a/sdk/JME3TestsTemplate/nbproject/genfiles.properties +++ b/sdk/JME3TestsTemplate/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=0f706f4a -build.xml.script.CRC32=0b0b23c4 -build.xml.stylesheet.CRC32=28e38971@1.38.1.45 -# 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=0f706f4a -nbproject/build-impl.xml.script.CRC32=46d1a69a -nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 +build.xml.data.CRC32=0f706f4a +build.xml.script.CRC32=82b8b23d +build.xml.stylesheet.CRC32=8064a381@1.75.2.48 +# 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=0f706f4a +nbproject/build-impl.xml.script.CRC32=46d1a69a +nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 diff --git a/sdk/jme3-core-baselibs/nbproject/genfiles.properties b/sdk/jme3-core-baselibs/nbproject/genfiles.properties index 1b1c32b3b..c9714ad4e 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=278ea45d +build.xml.data.CRC32=d43b0890 build.xml.script.CRC32=cdae6a36 build.xml.stylesheet.CRC32=a56c6a5b@2.67.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=278ea45d +nbproject/build-impl.xml.data.CRC32=d43b0890 nbproject/build-impl.xml.script.CRC32=246f9b81 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1 diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml index df81e68ff..be7a3e038 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.xml +++ b/sdk/jme3-core-baselibs/nbproject/project.xml @@ -1,15 +1,15 @@ - - + + org.netbeans.modules.apisupport.project - + com.jme3.gde.core.baselibs - + com.jme3.gde.core.libraries - - + + 1 3.1.0 @@ -19,133 +19,142 @@ com.jme3.asset com.jme3.scene.plugins.blender - com.jme3.scene.plugins.blender.animations - com.jme3.scene.plugins.blender.cameras + com.jme3.scene.plugins.blender.math com.jme3.scene.plugins.blender.constraints com.jme3.scene.plugins.blender.constraints.definitions com.jme3.scene.plugins.blender.curves - com.jme3.scene.plugins.blender.file - com.jme3.scene.plugins.blender.landscape - com.jme3.scene.plugins.blender.lights - com.jme3.scene.plugins.blender.materials - com.jme3.scene.plugins.blender.math com.jme3.scene.plugins.blender.meshes - com.jme3.scene.plugins.blender.modifiers - com.jme3.scene.plugins.blender.objects com.jme3.scene.plugins.blender.particles + com.jme3.scene.plugins.blender.cameras + com.jme3.scene.plugins.blender.objects + com.jme3.scene.plugins.blender.landscape + com.jme3.scene.plugins.blender.modifiers com.jme3.scene.plugins.blender.textures + com.jme3.scene.plugins.blender.textures.io com.jme3.scene.plugins.blender.textures.blending com.jme3.scene.plugins.blender.textures.generating - com.jme3.scene.plugins.blender.textures.io - checkers.quals - com.jme3.animation - com.jme3.app - com.jme3.app.state - com.jme3.asset.cache - com.jme3.asset.plugins - com.jme3.audio - com.jme3.audio.openal - com.jme3.audio.plugins - com.jme3.bounding - com.jme3.cinematic - com.jme3.cinematic.events - com.jme3.collision - com.jme3.collision.bih - com.jme3.cursors.plugins - com.jme3.effect - com.jme3.effect.influencers - com.jme3.effect.shapes + com.jme3.scene.plugins.blender.animations + com.jme3.scene.plugins.blender.materials + com.jme3.scene.plugins.blender.file + com.jme3.scene.plugins.blender.lights + jme3tools.shader + jme3tools.savegame + jme3tools.shadercheck + jme3tools.optimize + jme3tools.converters + com.jme3.shader + com.jme3.shader.plugins com.jme3.export com.jme3.export.binary - com.jme3.font - com.jme3.font.plugins + com.jme3.cinematic + com.jme3.cinematic.events + com.jme3.math + com.jme3.util + com.jme3.util.blockparser + com.jme3.util.xml + com.jme3.post com.jme3.input - com.jme3.input.controls com.jme3.input.dummy + com.jme3.input.controls com.jme3.input.event - com.jme3.light + com.jme3.profile + com.jme3.ui + com.jme3.audio + com.jme3.audio.openal + com.jme3.audio.plugins + com.jme3.cursors.plugins + com.jme3.bounding + com.jme3.shadow + com.jme3.texture + com.jme3.texture.image + com.jme3.texture.plugins + com.jme3.system com.jme3.material com.jme3.material.plugins - com.jme3.math - com.jme3.post - com.jme3.profile com.jme3.renderer - com.jme3.renderer.opengl com.jme3.renderer.queue + com.jme3.renderer.opengl + com.jme3.effect + com.jme3.effect.shapes + com.jme3.effect.influencers + com.jme3.app + com.jme3.app.state + com.jme3.asset.plugins + com.jme3.asset.cache + com.jme3.light + com.jme3.animation + com.jme3.collision + com.jme3.collision.bih com.jme3.scene - com.jme3.scene.control + com.jme3.scene.shape + com.jme3.scene.plugins com.jme3.scene.debug com.jme3.scene.instancing + com.jme3.scene.control com.jme3.scene.mesh - com.jme3.scene.plugins - com.jme3.scene.shape - com.jme3.shader - com.jme3.shader.plugins - com.jme3.shadow - com.jme3.system - com.jme3.texture - com.jme3.texture.image - com.jme3.texture.plugins - com.jme3.ui - com.jme3.util - com.jme3.util.blockparser - com.jme3.util.xml - jme3tools.converters - jme3tools.converters.model - jme3tools.converters.model.strip - jme3tools.optimize - jme3tools.savegame - jme3tools.shader - jme3tools.shadercheck + com.jme3.font + com.jme3.font.plugins + checkers.quals + jme3tools.navigation com.jme3.input.awt com.jme3.system.awt - jme3tools.navigation - com.jme3.post.filters com.jme3.post.ssao + com.jme3.post.filters com.jme3.water com.jme3.bullet - com.jme3.bullet.collision - com.jme3.bullet.collision.shapes - com.jme3.bullet.collision.shapes.infos - com.jme3.bullet.control - com.jme3.bullet.control.ragdoll - com.jme3.bullet.debug + com.jme3.bullet.util com.jme3.bullet.joints com.jme3.bullet.joints.motors com.jme3.bullet.objects com.jme3.bullet.objects.infos - com.jme3.bullet.util - com.jme3.audio.lwjgl + com.jme3.bullet.debug + com.jme3.bullet.control + com.jme3.bullet.control.ragdoll + com.jme3.bullet.collision + com.jme3.bullet.collision.shapes + com.jme3.bullet.collision.shapes.infos com.jme3.input.lwjgl - com.jme3.renderer.lwjgl + com.jme3.audio.lwjgl com.jme3.system.lwjgl + com.jme3.renderer.lwjgl com.jme3.network - com.jme3.network.base com.jme3.network.kernel - com.jme3.network.kernel.tcp com.jme3.network.kernel.udp + com.jme3.network.kernel.tcp + com.jme3.network.util com.jme3.network.message com.jme3.network.rmi + com.jme3.network.base com.jme3.network.serializing com.jme3.network.serializing.serializers + com.jme3.network.service + com.jme3.network.service.rpc + com.jme3.network.service.rpc.msg + com.jme3.network.service.serializer com.jme3.niftygui com.jme3.export.xml com.jme3.scene.plugins.fbx + com.jme3.scene.plugins.fbx.obj + com.jme3.scene.plugins.fbx.anim + com.jme3.scene.plugins.fbx.node + com.jme3.scene.plugins.fbx.misc + com.jme3.scene.plugins.fbx.material com.jme3.scene.plugins.fbx.file + com.jme3.scene.plugins.fbx.mesh com.jme3.scene.plugins.ogre com.jme3.scene.plugins.ogre.matext com.jme3.terrain + com.jme3.terrain.heightmap com.jme3.terrain.geomipmap + com.jme3.terrain.geomipmap.picking com.jme3.terrain.geomipmap.grid com.jme3.terrain.geomipmap.lodcalc com.jme3.terrain.geomipmap.lodcalc.util - com.jme3.terrain.geomipmap.picking - com.jme3.terrain.heightmap com.jme3.terrain.noise - com.jme3.terrain.noise.basis com.jme3.terrain.noise.filter - com.jme3.terrain.noise.fractal com.jme3.terrain.noise.modulator + com.jme3.terrain.noise.fractal + com.jme3.terrain.noise.basis ext/jme3-blender-3.1.0-snapshot-github.jar @@ -193,4 +202,4 @@ - + \ No newline at end of file diff --git a/sdk/jme3-core-libraries/nbproject/project.xml b/sdk/jme3-core-libraries/nbproject/project.xml index 19469cf8a..c7b1f70f9 100644 --- a/sdk/jme3-core-libraries/nbproject/project.xml +++ b/sdk/jme3-core-libraries/nbproject/project.xml @@ -6,6 +6,44 @@ + org.ejml + org.ejml.interfaces.decomposition + org.ejml.interfaces.linsol + org.ejml.data + org.ejml.alg.dense.linsol + org.ejml.ops + org.ejml.factory + org.ejml.alg.fixed + org.ejml.alg.generic + org.ejml.alg.block + org.ejml.alg.block.decomposition.chol + org.ejml.alg.block.decomposition.qr + org.ejml.alg.block.decomposition.hessenberg + org.ejml.alg.block.decomposition.bidiagonal + org.ejml.alg.block.linsol.chol + org.ejml.alg.block.linsol.qr + org.ejml.alg.dense.decomposition + org.ejml.alg.dense.decomposition.chol + org.ejml.alg.dense.decomposition.lu + org.ejml.alg.dense.decomposition.qr + org.ejml.alg.dense.decomposition.hessenberg + org.ejml.alg.dense.decomposition.svd + org.ejml.alg.dense.decomposition.svd.implicitqr + org.ejml.alg.dense.decomposition.eig + org.ejml.alg.dense.decomposition.eig.watched + org.ejml.alg.dense.decomposition.eig.symm + org.ejml.alg.dense.decomposition.bidiagonal + org.ejml.alg.dense.mult + org.ejml.alg.dense.misc + org.ejml.alg.dense.linsol.chol + org.ejml.alg.dense.linsol.lu + org.ejml.alg.dense.linsol.qr + org.ejml.alg.dense.linsol.svd + org.ejml.simple + org.ejml.alg.dense.decompose + org.ejml.alg.dense.decompose.chol + org.ejml.alg.dense.decompose.lu + org.ejml.alg.dense.decompose.qr com.bulletphysics com.bulletphysics.collision.broadphase com.bulletphysics.collision.dispatch @@ -161,6 +199,22 @@ org.jglfont.impl.format.awt org.jglfont.impl + + ext/core-0.27.jar + release/modules/ext/core-0.27.jar + + + ext/dense64-0.27.jar + release/modules/ext/dense64-0.27.jar + + + ext/simple-0.27.jar + release/modules/ext/simple-0.27.jar + + + ext/denseC64-0.27.jar + release/modules/ext/denseC64-0.27.jar + ext/jbullet.jar release/modules/ext/jbullet.jar diff --git a/sdk/jme3-core-updatecenters/nbproject/genfiles.properties b/sdk/jme3-core-updatecenters/nbproject/genfiles.properties index 0dd897993..6b53da996 100644 --- a/sdk/jme3-core-updatecenters/nbproject/genfiles.properties +++ b/sdk/jme3-core-updatecenters/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=08468784 +build.xml.data.CRC32=e145fa2a build.xml.script.CRC32=cfa8d5c5 build.xml.stylesheet.CRC32=a56c6a5b@2.67.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=08468784 +nbproject/build-impl.xml.data.CRC32=e145fa2a nbproject/build-impl.xml.script.CRC32=270846fb nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.67.1 diff --git a/sdk/nbi/stub/ext/components/products/blender/nbproject/build-impl.xml b/sdk/nbi/stub/ext/components/products/blender/nbproject/build-impl.xml index 6b25635be..f15304e39 100644 --- a/sdk/nbi/stub/ext/components/products/blender/nbproject/build-impl.xml +++ b/sdk/nbi/stub/ext/components/products/blender/nbproject/build-impl.xml @@ -54,6 +54,7 @@ is divided into following sections: + @@ -71,16 +72,20 @@ is divided into following sections: - + - - + + + - - - + + + + + + @@ -91,12 +96,6 @@ is divided into following sections: - - - - - - @@ -115,24 +114,12 @@ is divided into following sections: - + - + - - - - - - - - - - - - @@ -186,7 +173,15 @@ is divided into following sections: - + + + + + + + + + @@ -275,6 +270,7 @@ is divided into following sections: + @@ -314,6 +310,7 @@ is divided into following sections: + @@ -370,6 +367,11 @@ is divided into following sections: + + + + + @@ -393,7 +395,7 @@ is divided into following sections: - + @@ -407,6 +409,9 @@ is divided into following sections: + + + @@ -438,7 +443,7 @@ is divided into following sections: - + @@ -534,7 +539,7 @@ is divided into following sections: - + @@ -548,6 +553,9 @@ is divided into following sections: + + + @@ -826,8 +834,8 @@ is divided into following sections: - - + + @@ -839,7 +847,7 @@ is divided into following sections: - + @@ -894,6 +902,7 @@ is divided into following sections: + @@ -927,7 +936,7 @@ is divided into following sections: - + @@ -962,41 +971,25 @@ is divided into following sections: - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - + - + - + - + + + + + + @@ -1004,23 +997,41 @@ is divided into following sections: - + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + + + + + + + + + + + + + + + + + - + + - + + - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - + - + - + - + + + + + + @@ -1004,23 +997,41 @@ is divided into following sections: - + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + + + + + + + + + + + + + + + + + - + + - + + - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - + - + - + - + + + + + + @@ -1004,23 +997,41 @@ is divided into following sections: - + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + + + + + + + + + + + + + + + + + - + + - + + - - - - - - - - - - - - - To run this application from the command line without Ant, try: - - - - - - - java -cp "${run.classpath.with.dist.jar}" ${main.class} - - + - + - + - + + + + + + @@ -1004,23 +997,41 @@ is divided into following sections: - + To run this application from the command line without Ant, try: java -jar "${dist.jar.resolved}" - + + + + + + + + + + + + + + + + + - + + - + +