diff --git a/core/IvmiNode.gd b/core/IvmiNode.gd index 7f6cf951ab7ad38bc8ee15c1d341129392dfb9aa..8b545f312fe48593db501be7e8d3029376196e4b 100644 --- a/core/IvmiNode.gd +++ b/core/IvmiNode.gd @@ -18,6 +18,7 @@ func _ready(): #add default properties _add_property("position", [position.x, position.y, position.z]) + _add_property("global_position", [position.x, position.y, position.z]) _add_property("scale", [scale.x, scale.y, scale.z]) _add_property("selected", [0]) _add_property("triggered", [0]) @@ -78,6 +79,9 @@ func set_property(prop, vals): "position": if _can_be_moved: position = Vector3(vals[0],vals[1],vals[2]) + "global_position": + if _can_be_moved: + global_position = Vector3(vals[0],vals[1],vals[2]) "rotation": if _can_be_rotated: rotation_degrees = Vector3(vals[0],vals[1],vals[2]) diff --git a/core/IvmiScene.gd b/core/IvmiScene.gd index 839dbb7092ed62381c4b4810a0aa5da2a384d16b..13ca34ba53cda9e3dc53d66baa8876e6aa57f676 100644 --- a/core/IvmiScene.gd +++ b/core/IvmiScene.gd @@ -38,7 +38,7 @@ enum VRMode {SplitHorizontal, SplitVertical, Anaglyph, QuadBuffer} @export var _screen_vr_screen_size=Vector2(3,2) : set = set_screen_vr_screen_size @export var _screen_vr_window_size=Vector2(1024,600) : set = set_screen_vr_window_size @export var _screen_vr_window_position=Vector2(640,480) : set = set_screen_vr_window_position -var _xr_interface +var _xr_interface : XRInterface var _config # Network variables diff --git a/core/net/GodOSC.gd b/core/net/GodOSC.gd index a631b8fa3b23654fc1618ecc5d971433718d4b34..a163aee8df5ec11058acc01ef9d907936610689e 100644 --- a/core/net/GodOSC.gd +++ b/core/net/GodOSC.gd @@ -7,6 +7,10 @@ var _socket = PacketPeerUDP.new() var _output_address = "127.0.0.1" var _output_port = 7770 var _input_port = 7771 +var _verbose = false + +func set_verbose(v : bool) -> void: + _verbose=v func set_output(address, port) : _output_address=address @@ -14,14 +18,16 @@ func set_output(address, port) : if _socket.set_dest_address(_output_address, _output_port)!=OK : print("GodOSC : Error setting output ", address, ":",port) else : - print("GodOSC : Setting output to ", address, ":", port) + if _verbose : + print("GodOSC : Setting output to ", address, ":", port) func set_input_port(port) : _input_port=port if _socket.bind(_input_port)!= OK : print("GodOSC : Error setting input ", port) else : - print("GodOSC : Listening to port ", port) + if _verbose : + print("GodOSC : Listening to port ", port) func set_multicast(addr) : @@ -30,7 +36,8 @@ func set_multicast(addr) : if _socket.join_multicast_group(addr, interf.name)!=OK : print("GodOSC : Error joining multicast on ", interf.name) else : - print("GodOSC : Joining multicast on ", interf.name) + if _verbose : + print("GodOSC : Joining multicast on ", interf.name) func send_msg(address, tags, args) : diff --git a/core/net/IvmiDiscov.gd b/core/net/IvmiDiscov.gd index 1d8417565fc002b85589d55f4a6fd592db5b2f05..7663ece30e3fa4b6bc30ea164c221d9425998e53 100644 --- a/core/net/IvmiDiscov.gd +++ b/core/net/IvmiDiscov.gd @@ -31,8 +31,6 @@ func start() : _osc_discov.set_input_port(mcprt) _osc_discov.set_multicast(mcadd) - print(_osc_discov.get_local_address()) - #retrieve local address _local_addr = _osc_discov.get_local_address()