maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix register issue on Windows

Browse source
This commit is contained in:
Lubos Lenco 2017-04-20 00:13:43 +02:00
parent 71e9cce396
commit 8fe5f6b9c1
5 changed files with 63 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Sources/armory/logicnode/NotNode.hx Normal file
View file

@ -0,0 +1,15 @@
package armory.logicnode;
class NotNode extends LogicNode {
public var property0:String;
public function new(tree:LogicTree) {
super(tree);
}
override function get(from:Int):Dynamic {
var v1:Bool = inputs[0].get();
return !v1;
}
}

3
Sources/armory/logicnode/SpawnObjectNode.hx
View file

@ -13,7 +13,8 @@ class SpawnObjectNode extends LogicNode {
override function run() {
var objectName:String = cast(inputs[1].node, ObjectNode).objectName;
var objectNode = cast(inputs[1].node, ObjectNode);
var objectName:String = objectNode.objectName != "" ? objectNode.objectName : tree.object.name;
var matrix:Mat4 = inputs[2].get();
Scene.active.spawnObject(objectName, null, function(o:armory.object.Object) {

49
Sources/armory/trait/WalkNavigation.hx
View file

@ -50,29 +50,38 @@ class WalkNavigation extends Trait {
var fast = keyboard.down("shift") ? 2.0 : (keyboard.down("alt") ? 0.5 : 1.0);
if (gamepad != null) {
dir.set(0, 0, 0);
var leftStickY = Math.abs(gamepad.leftStick.y) > 0.05;
var leftStickX = Math.abs(gamepad.leftStick.x) > 0.05;
var r1 = gamepad.down("r1") > 0.0;
var l1 = gamepad.down("l1") > 0.0;
var rightStickX = Math.abs(gamepad.rightStick.x) > 0.1;
var rightStickY = Math.abs(gamepad.rightStick.y) > 0.1;
if (Math.abs(gamepad.leftStick.y) > 0.05) {
yvec.setFrom(camera.look());
yvec.mult(gamepad.leftStick.y);
dir.add(yvec);
}
if (Math.abs(gamepad.leftStick.x) > 0.05) {
xvec.setFrom(camera.right());
xvec.mult(gamepad.leftStick.x);
dir.add(xvec);
}
if (gamepad.down("r1") > 0.0) dir.addf(0, 0, 1);
if (gamepad.down("l1") > 0.0) dir.addf(0, 0, -1);
if (leftStickY || leftStickX || r1 || l1 || rightStickX || rightStickY) {
dir.set(0, 0, 0);
var d = Time.delta * speed * fast;
camera.move(dir, d);
if (leftStickY) {
yvec.setFrom(camera.look());
yvec.mult(gamepad.leftStick.y);
dir.add(yvec);
}
if (leftStickX) {
xvec.setFrom(camera.right());
xvec.mult(gamepad.leftStick.x);
dir.add(xvec);
}
if (r1) dir.addf(0, 0, 1);
if (l1) dir.addf(0, 0, -1);
if (Math.abs(gamepad.rightStick.x) > 0.1) {
camera.rotate(Vec4.zAxis(), -gamepad.rightStick.x / 15.0);
}
if (Math.abs(gamepad.rightStick.y) > 0.1) {
camera.rotate(camera.right(), gamepad.rightStick.y / 15.0);
var d = Time.delta * speed * fast;
camera.move(dir, d);
if (rightStickX) {
camera.rotate(Vec4.zAxis(), -gamepad.rightStick.x / 15.0);
}
if (rightStickY) {
camera.rotate(camera.right(), gamepad.rightStick.y / 15.0);
}
}
}

16
blender/arm/logicnode/logic_not.py Normal file
View file

@ -0,0 +1,16 @@
import bpy
from bpy.props import *
from bpy.types import Node, NodeSocket
from arm.logicnode.arm_nodes import *
class NotNode(Node, ArmLogicTreeNode):
'''Not node'''
bl_idname = 'LNNotNode'
bl_label = 'Not'
bl_icon = 'CURVE_PATH'
def init(self, context):
self.inputs.new('NodeSocketBool', 'Value')
self.outputs.new('NodeSocketBool', 'Value')
add_node(NotNode, category='Logic')

2
blender/start.py
View file

@ -31,7 +31,6 @@ def register():
arm.props_ui.register()
arm.props_renderer.register()
arm.nodes_logic.register()
arm.handlers.register()
arm.nodes_renderpath.register()
arm.make_renderer.register()
arm.props_traits_params.register()
@ -42,6 +41,7 @@ def register():
arm.props_virtualinput.register()
arm.space_armory.register()
arm.keymap.register()
arm.handlers.register()
def unregister():
global registered