From ed4234f6b4c5ad62d1a88c6cad3a4650c3e24a49 Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Sat, 1 Jul 2017 13:12:22 +0200 Subject: [PATCH] Expose node target --- Sources/armory/logicnode/AppendTransformNode.hx | 5 +---- Sources/armory/logicnode/RotateObjectNode.hx | 5 +---- Sources/armory/logicnode/ScaleObjectNode.hx | 5 +---- Sources/armory/logicnode/SetLocationNode.hx | 5 +---- Sources/armory/logicnode/SetRotationNode.hx | 5 +---- Sources/armory/logicnode/SetScaleNode.hx | 5 +---- Sources/armory/logicnode/SetTransformNode.hx | 5 +---- Sources/armory/logicnode/TranslateObjectNode.hx | 5 +---- Sources/armory/trait/internal/RigidBody.hx | 1 + Sources/armory/trait/internal/SpaceArmory.hx | 4 ++-- blender/arm/make_utils.py | 2 ++ blender/arm/props.py | 3 ++- blender/arm/write_data.py | 2 +- 13 files changed, 16 insertions(+), 36 deletions(-) diff --git a/Sources/armory/logicnode/AppendTransformNode.hx b/Sources/armory/logicnode/AppendTransformNode.hx index 2088b700..ca5d6f58 100644 --- a/Sources/armory/logicnode/AppendTransformNode.hx +++ b/Sources/armory/logicnode/AppendTransformNode.hx @@ -22,10 +22,7 @@ class AppendTransformNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/RotateObjectNode.hx b/Sources/armory/logicnode/RotateObjectNode.hx index fc644e8c..c31dba94 100644 --- a/Sources/armory/logicnode/RotateObjectNode.hx +++ b/Sources/armory/logicnode/RotateObjectNode.hx @@ -29,10 +29,7 @@ class RotateObjectNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/ScaleObjectNode.hx b/Sources/armory/logicnode/ScaleObjectNode.hx index 26d2b13d..0c5710be 100644 --- a/Sources/armory/logicnode/ScaleObjectNode.hx +++ b/Sources/armory/logicnode/ScaleObjectNode.hx @@ -24,10 +24,7 @@ class ScaleObjectNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/SetLocationNode.hx b/Sources/armory/logicnode/SetLocationNode.hx index af78f531..f7f087e2 100644 --- a/Sources/armory/logicnode/SetLocationNode.hx +++ b/Sources/armory/logicnode/SetLocationNode.hx @@ -23,10 +23,7 @@ class SetLocationNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/SetRotationNode.hx b/Sources/armory/logicnode/SetRotationNode.hx index 78f65a7c..65acf256 100644 --- a/Sources/armory/logicnode/SetRotationNode.hx +++ b/Sources/armory/logicnode/SetRotationNode.hx @@ -23,10 +23,7 @@ class SetRotationNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/SetScaleNode.hx b/Sources/armory/logicnode/SetScaleNode.hx index 27902c96..115f043d 100644 --- a/Sources/armory/logicnode/SetScaleNode.hx +++ b/Sources/armory/logicnode/SetScaleNode.hx @@ -23,10 +23,7 @@ class SetScaleNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/SetTransformNode.hx b/Sources/armory/logicnode/SetTransformNode.hx index 7b736f66..5eed985a 100755 --- a/Sources/armory/logicnode/SetTransformNode.hx +++ b/Sources/armory/logicnode/SetTransformNode.hx @@ -22,10 +22,7 @@ class SetTransformNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/logicnode/TranslateObjectNode.hx b/Sources/armory/logicnode/TranslateObjectNode.hx index 6f9512d6..074ffcda 100644 --- a/Sources/armory/logicnode/TranslateObjectNode.hx +++ b/Sources/armory/logicnode/TranslateObjectNode.hx @@ -24,10 +24,7 @@ class TranslateObjectNode extends LogicNode { #if arm_physics var rigidBody = object.getTrait(RigidBody); - if (rigidBody != null) { - rigidBody.syncTransform(); - rigidBody.activate(); - } + if (rigidBody != null) rigidBody.syncTransform(); #end super.run(); diff --git a/Sources/armory/trait/internal/RigidBody.hx b/Sources/armory/trait/internal/RigidBody.hx index 69ce35da..79b6133d 100644 --- a/Sources/armory/trait/internal/RigidBody.hx +++ b/Sources/armory/trait/internal/RigidBody.hx @@ -258,6 +258,7 @@ class RigidBody extends Trait { // _motionState.getWorldTransform(trans); // trans.setOrigin(BtVector3.create(transform.loc.x, transform.loc.y, transform.loc.z)); // _motionState.setWorldTransform(trans); + activate(); } function addPointsToConvexHull(shape:BtConvexHullShapePointer, scale:Vec4, margin:Float) { diff --git a/Sources/armory/trait/internal/SpaceArmory.hx b/Sources/armory/trait/internal/SpaceArmory.hx index d0f43054..160bf0ee 100755 --- a/Sources/armory/trait/internal/SpaceArmory.hx +++ b/Sources/armory/trait/internal/SpaceArmory.hx @@ -98,7 +98,7 @@ class SpaceArmory extends Trait { // moveX = moveY = moveZ = false; // } - #if (js && kha_webgl) + #if (js && kha_webgl && !kha_node) time += iron.system.Time.delta; if (time > 1.0) { time = 0; @@ -107,7 +107,7 @@ class SpaceArmory extends Trait { #end } -#if (js && kha_webgl) +#if (js && kha_webgl && !kha_node) static var time = 0.0; static var lastMtime:Dynamic = null; function reloadOnUpdate() { diff --git a/blender/arm/make_utils.py b/blender/arm/make_utils.py index 9af8c519..e83c3e61 100755 --- a/blender/arm/make_utils.py +++ b/blender/arm/make_utils.py @@ -47,5 +47,7 @@ def target_to_gapi(): return 'arm_gapi_winapp' elif wrd.arm_project_target == 'android-native': return 'arm_gapi_android' + elif wrd.arm_project_target == 'node': + return 'arm_gapi_html5' else: return 'arm_gapi_' + wrd.arm_project_target diff --git a/blender/arm/props.py b/blender/arm/props.py index 8860ff6f..3f1af9f1 100755 --- a/blender/arm/props.py +++ b/blender/arm/props.py @@ -124,7 +124,8 @@ def init_properties(): ('linux', 'Linux', 'linux'), ('ios', 'iOS', 'ios'), ('android-native', 'Android', 'android-native'), - ('krom', 'Krom', 'krom')], + ('krom', 'Krom', 'krom'), + ('node', 'Node', 'node')], name="Target", default='html5', description='Build paltform') bpy.types.World.arm_project_name = StringProperty(name="Name", description="Exported project name", default="") bpy.types.World.arm_project_package = StringProperty(name="Package", description="Package name for scripts", default="arm") diff --git a/blender/arm/write_data.py b/blender/arm/write_data.py index 5ca1470e..ecc2a8c4 100755 --- a/blender/arm/write_data.py +++ b/blender/arm/write_data.py @@ -73,7 +73,7 @@ project.addSources('Sources'); if export_physics: assets.add_khafile_def('arm_physics') f.write(add_armory_library(sdk_path + '/lib/', 'haxebullet')) - if state.target == 'krom' or state.target == 'html5': + if state.target == 'krom' or state.target == 'html5' or state.target == 'node': ammojs_path = sdk_path + '/lib/haxebullet/js/ammo/ammo.js' ammojs_path = ammojs_path.replace('\\', '/') f.write(add_assets(ammojs_path))