From bc396627b8c13aa11e90e88639d4c875f3abb245 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Wed, 19 Jun 2019 17:03:28 +0200 Subject: [PATCH] Cleanup --- Assets/_/default_logic.json | 1 - Assets/_/logic_nodes.json | 1 - Sources/arm/App.hx | 1 - Sources/arm/Config.hx | 1 - Sources/arm/Importer.hx | 3 - Sources/arm/MaterialBuilder.hx | 30 ---- Sources/arm/MaterialParser.hx | 21 --- Sources/arm/Project.hx | 2 - Sources/arm/Uniforms.hx | 4 - Sources/arm/creator/NodeCreatorLogic.hx | 181 -------------------- Sources/arm/renderpath/RenderPathPreview.hx | 52 +----- Sources/arm/ui/UIFiles.hx | 61 ------- Sources/arm/ui/UIMenu.hx | 1 - Sources/arm/ui/UINodes.hx | 65 ++----- Sources/arm/ui/UITrait.hx | 86 +--------- Sources/arm/util/Path.hx | 1 - Sources/arm/util/UVUtil.hx | 2 - 17 files changed, 18 insertions(+), 495 deletions(-) delete mode 100644 Assets/_/default_logic.json delete mode 100644 Assets/_/logic_nodes.json delete mode 100644 Sources/arm/creator/NodeCreatorLogic.hx diff --git a/Assets/_/default_logic.json b/Assets/_/default_logic.json deleted file mode 100644 index 2ade6886..00000000 --- a/Assets/_/default_logic.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"Logic","nodes":[],"links":[]} \ No newline at end of file diff --git a/Assets/_/logic_nodes.json b/Assets/_/logic_nodes.json deleted file mode 100644 index b2fc017b..00000000 --- a/Assets/_/logic_nodes.json +++ /dev/null @@ -1 +0,0 @@ -{"categories": [{"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Group"}], "type": "AddGroupNode", "name": "Add Group", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Trait"}], "type": "AddTraitNode", "name": "Add Trait", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Transform"}], "type": "AppendTransformNode", "name": "Append Transform", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "CallGroupNode", "name": "Call Node Group", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "BOOL", "name": "Keep Transform"}], "type": "ClearParentNode", "name": "Clear Parent", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "GroupOutputNode", "name": "Node Group Output", "outputs": []}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Value"}], "type": "PrintNode", "name": "Print", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "RemoveActiveSceneNode", "name": "Remove Active Scene", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Group"}], "type": "RemoveGroupNode", "name": "Remove Group", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}], "type": "RemoveObjectNode", "name": "Remove Object", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Trait"}], "type": "RemoveTraitNode", "name": "Remove Trait", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Vector"}], "type": "RotateObjectNode", "name": "Rotate Object", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Vector"}], "type": "ScaleObjectNode", "name": "Scale Object", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Event"}, {"type": "OBJECT", "name": "Object"}], "type": "SendEventNode", "name": "Send Event", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Event"}], "type": "SendGlobalEventNode", "name": "Send Global Event", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VALUE", "name": "FOV"}], "type": "SetCameraFovNode", "name": "Set Camera FOV", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Location"}], "type": "SetLocationNode", "name": "Set Location", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Material"}], "type": "SetMaterialNode", "name": "Set Material", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Material"}, {"type": "STRING", "name": "Node"}, {"type": "STRING", "name": "Image"}], "type": "SetMaterialImageParamNode", "name": "Set Material Image Param", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Material"}, {"type": "STRING", "name": "Node"}, {"type": "RGBA", "name": "Color"}], "type": "SetMaterialRgbParamNode", "name": "Set Material RGB Param", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Material"}, {"type": "INTEGER", "name": "Slot"}], "type": "SetMaterialSlotNode", "name": "Set Material Slot", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Material"}, {"type": "STRING", "name": "Node"}, {"type": "VALUE", "name": "Value"}], "type": "SetMaterialValueParamNode", "name": "Set Material Value Param", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Mesh"}], "type": "SetMeshNode", "name": "Set Mesh", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Name"}], "type": "SetNameNode", "name": "Set Name", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "OBJECT", "name": "Parent"}], "type": "SetParentNode", "name": "Set Parent", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "OBJECT", "name": "Parent"}, {"type": "STRING", "name": "Bone"}], "type": "SetParentBoneNode", "name": "Set Parent Bone", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Property"}, {"type": "SHADER", "name": "Value"}], "type": "SetPropertyNode", "name": "Set Property", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Rotation"}], "type": "SetRotationNode", "name": "Set Rotation", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Scale"}], "type": "SetScaleNode", "name": "Set Scale", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Scene"}], "type": "SetSceneNode", "name": "Set Scene", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "OBJECT", "name": "Root"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "VALUE", "name": "Scale"}], "type": "SetTimeScaleNode", "name": "Set Time Scale", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Transform"}], "type": "SetTransformNode", "name": "Set Transform", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Variable"}, {"type": "SHADER", "name": "Value"}], "type": "SetVariableNode", "name": "Set Variable", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "BOOL", "name": "Bool"}], "type": "SetVisibleNode", "name": "Set Visible", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "VALUE", "name": "Time"}], "type": "SleepNode", "name": "Sleep", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Transform"}], "type": "SpawnObjectNode", "name": "Spawn Object", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Scene"}, {"type": "SHADER", "name": "Transform"}], "type": "SpawnSceneNode", "name": "Spawn Scene", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "OBJECT", "name": "Root"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Vector"}], "type": "TranslateObjectNode", "name": "Translate Object", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VALUE", "name": "Speed"}, {"type": "INTEGER", "name": "Forward/Up/Right"}, {"type": "BOOL", "name": "Inverse"}], "type": "TranslateOnLocalAxisNode", "name": "Translate On Local Axis", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Key"}, {"type": "SHADER", "name": "Value"}], "type": "WriteStorageNode", "name": "Write Storage", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Action"}, {"nodes": [{"buttons": [{"default_value": 0, "data": ["Enter", "Leave", "Overlap"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "OBJECT", "name": "Volume"}], "type": "VolumeTriggerNode", "name": "Volume Trigger", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [], "inputs": [], "type": "ActiveCameraNode", "name": "Active Camera", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [], "type": "ActiveSceneNode", "name": "Active Scene", "outputs": [{"type": "SHADER", "name": "Scene"}]}, {"buttons": [{"default_value": 0, "data": ["Equal", "Not Equal", "Less Than", "Less Than or Equal", "Greater Than", "Greater Than or Equal"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "SHADER", "name": "Value"}, {"type": "SHADER", "name": "Value"}], "type": "CompareNode", "name": "Compare", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [], "inputs": [{"type": "STRING", "name": "Input 0"}], "type": "ConcatenateStringNode", "name": "Concatenate String", "outputs": [{"type": "STRING", "name": "String"}]}, {"buttons": [{"default_value": 0, "data": ["Contains", "Starts With", "Ends With"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "STRING", "name": "String"}, {"type": "STRING", "name": "Find"}], "type": "ContainsStringNode", "name": "Contains String", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "Degrees"}], "type": "DegToRadNode", "name": "Deg to Rad", "outputs": [{"type": "VALUE", "name": "Radians"}]}, {"buttons": [], "inputs": [], "type": "DisplayInfoNode", "name": "Display Info", "outputs": [{"type": "INTEGER", "name": "Width"}, {"type": "INTEGER", "name": "Height"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetCameraFovNode", "name": "Get Camera FOV", "outputs": [{"type": "VALUE", "name": "FOV"}]}, {"buttons": [{"default_value": 0, "data": ["By Name", "Contains", "Starts With", "Ends With"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Child"}], "type": "GetChildNode", "name": "Get Child", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetChildrenNode", "name": "Get Children", "outputs": [{"type": "ARRAY", "name": "Array"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "OBJECT", "name": "Object"}], "type": "GetDistanceNode", "name": "Get Distance", "outputs": [{"type": "VALUE", "name": "Distance"}]}, {"buttons": [], "inputs": [{"type": "STRING", "name": "Name"}], "type": "GetGroupNode", "name": "Get Group", "outputs": [{"type": "ARRAY", "name": "Array"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetLocationNode", "name": "Get Location", "outputs": [{"type": "VECTOR", "name": "Location"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetMaterialNode", "name": "Get Material", "outputs": [{"type": "SHADER", "name": "Material"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetMeshNode", "name": "Get Mesh", "outputs": [{"type": "SHADER", "name": "Mesh"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetNameNode", "name": "Get Name", "outputs": [{"type": "STRING", "name": "Name"}]}, {"buttons": [], "inputs": [{"type": "STRING", "name": "Name"}], "type": "GetObjectNode", "name": "Get Object", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetParentNode", "name": "Get Parent", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Property"}], "type": "GetPropertyNode", "name": "Get Property", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetRotationNode", "name": "Get Rotation", "outputs": [{"type": "VECTOR", "name": "Rotation"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetScaleNode", "name": "Get Scale", "outputs": [{"type": "VECTOR", "name": "Scale"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Name"}], "type": "GetTraitNode", "name": "Get Trait", "outputs": [{"type": "SHADER", "name": "Trait"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetTransformNode", "name": "Get Transform", "outputs": [{"type": "SHADER", "name": "Transform"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetVisibleNode", "name": "Get Visible", "outputs": [{"type": "BOOL", "name": "Visible"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "From Location"}, {"type": "VECTOR", "name": "To Location"}], "type": "LookAtNode", "name": "Look At", "outputs": [{"type": "VECTOR", "name": "Rotation"}]}, {"buttons": [{"default_value": 0, "data": ["Add", "Multiply", "Sine", "Cosine", "Max", "Min", "Abs", "Subtract", "Divide", "Tangent", "Arcsine", "Arccosine", "Arctangent", "Power", "Logarithm", "Round", "Less Than", "Greater Than", "Modulo"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "VALUE", "name": "Value"}, {"type": "VALUE", "name": "Value"}], "type": "MathNode", "name": "Math", "outputs": [{"type": "VALUE", "name": "Value"}]}, {"buttons": [{"default_value": 0, "data": ["Multiply"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "SHADER", "name": "Matrix"}, {"type": "SHADER", "name": "Matrix"}], "type": "MatrixMathNode", "name": "Matrix Math", "outputs": [{"type": "SHADER", "name": "Matrix"}]}, {"buttons": [{"default_value": 0, "data": ["Linear", "Sine", "Quad", "Cubic", "Quart", "Quint", "Expo", "Circ", "Back"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["In", "Out", "InOut"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "VALUE", "name": "Factor"}, {"type": "VALUE", "name": "Value1"}, {"type": "VALUE", "name": "Value2"}], "type": "MixNode", "name": "Mix", "outputs": [{"type": "VALUE", "name": "Value"}]}, {"buttons": [], "inputs": [], "type": "NoneNode", "name": "None", "outputs": [{"type": "SHADER", "name": "None"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "Radians"}], "type": "RadToDegNode", "name": "Rad to Deg", "outputs": [{"type": "VALUE", "name": "Degrees"}]}, {"buttons": [], "inputs": [], "type": "RandomBooleanNode", "name": "Random (Boolean)", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [], "inputs": [], "type": "RandomColorNode", "name": "Random (Color)", "outputs": [{"type": "RGBA", "name": "Color"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "Min"}, {"type": "VALUE", "name": "Max"}], "type": "RandomFloatNode", "name": "Random (Float)", "outputs": [{"type": "VALUE", "name": "Float"}]}, {"buttons": [], "inputs": [{"type": "INTEGER", "name": "Min"}, {"type": "INTEGER", "name": "Max"}], "type": "RandomIntegerNode", "name": "Random (Integer)", "outputs": [{"type": "INTEGER", "name": "Int"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Min"}, {"type": "VECTOR", "name": "Max"}], "type": "RandomVectorNode", "name": "Random (Vector)", "outputs": [{"type": "VECTOR", "name": "Vector"}]}, {"buttons": [], "inputs": [{"type": "STRING", "name": "Key"}, {"type": "STRING", "name": "Default"}], "type": "ReadStorageNode", "name": "Read Storage", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Vector"}], "type": "ScreenToWorldSpaceNode", "name": "Screen To World Space", "outputs": [{"type": "VECTOR", "name": "Vector"}]}, {"buttons": [], "inputs": [], "type": "SelfNode", "name": "Self", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [], "type": "SelfTraitNode", "name": "Self Trait", "outputs": [{"type": "SHADER", "name": "Trait"}]}, {"buttons": [], "inputs": [{"type": "RGBA", "name": "Color"}], "type": "SeparateColorNode", "name": "Separate RGB", "outputs": [{"type": "VALUE", "name": "R"}, {"type": "VALUE", "name": "G"}, {"type": "VALUE", "name": "B"}]}, {"buttons": [], "inputs": [{"type": "SHADER", "name": "Transform"}], "type": "SeparateTransformNode", "name": "Separate Transform", "outputs": [{"type": "VECTOR", "name": "Location"}, {"type": "VECTOR", "name": "Rotation"}, {"type": "VECTOR", "name": "Scale"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Vector"}], "type": "SeparateVectorNode", "name": "Separate XYZ", "outputs": [{"type": "VALUE", "name": "X"}, {"type": "VALUE", "name": "Y"}, {"type": "VALUE", "name": "Z"}]}, {"buttons": [], "inputs": [], "type": "TimeNode", "name": "Time", "outputs": [{"type": "VALUE", "name": "Time"}, {"type": "VALUE", "name": "Delta"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Vector"}, {"type": "VALUE", "name": "Min"}, {"type": "VALUE", "name": "Max"}], "type": "VectorClampToSizeNode", "name": "Vector Clamp To Size", "outputs": [{"type": "VECTOR", "name": "Vector"}]}, {"buttons": [{"default_value": 0, "data": ["Up", "Right", "Look", "Quaternion"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "SHADER", "name": "Transform"}], "type": "VectorFromTransformNode", "name": "Vector From Transform", "outputs": [{"type": "VECTOR", "name": "Vector"}]}, {"buttons": [{"default_value": 0, "data": ["Add", "Dot Product", "Multiply", "Normalize", "Subtract", "Average", "Cross Product", "Length"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "VECTOR", "name": "Vector"}, {"type": "VECTOR", "name": "Vector"}], "type": "VectorMathNode", "name": "Vector Math", "outputs": [{"type": "VECTOR", "name": "Vector"}, {"type": "VALUE", "name": "Value"}]}, {"buttons": [{"default_value": 0, "data": ["Linear", "Sine", "Quad", "Cubic", "Quart", "Quint", "Expo", "Circ", "Back"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["In", "Out", "InOut"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "VALUE", "name": "Factor"}, {"type": "VECTOR", "name": "Vector1"}, {"type": "VECTOR", "name": "Vector2"}], "type": "VectorMixNode", "name": "Vector Mix", "outputs": [{"type": "VECTOR", "name": "Vector"}]}, {"buttons": [], "inputs": [], "type": "WindowInfoNode", "name": "Window Info", "outputs": [{"type": "INTEGER", "name": "Width"}, {"type": "INTEGER", "name": "Height"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Vector"}], "type": "WorldToScreenSpaceNode", "name": "World To Screen Space", "outputs": [{"type": "VECTOR", "name": "Vector"}]}], "name": "Value"}, {"nodes": [{"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "AnimationStateNode", "name": "Animation State", "outputs": [{"type": "BOOL", "name": "Is Playing"}, {"type": "STRING", "name": "Action"}, {"type": "INTEGER", "name": "Frame"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Marker"}], "type": "OnActionMarkerNode", "name": "On Action Marker", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}], "type": "PauseActionNode", "name": "Pause Action", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}], "type": "PauseTilesheetNode", "name": "Pause Tilesheet", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "ANIMACTION", "name": "Action"}, {"type": "VALUE", "name": "Blend"}], "type": "PlayActionNode", "name": "Play Action", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "ACTION", "name": "Done"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Action"}], "type": "PlayTilesheetNode", "name": "Play Tilesheet", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "ACTION", "name": "Done"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}], "type": "ResumeActionNode", "name": "Resume Action", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}], "type": "ResumeTilesheetNode", "name": "Resume Tilesheet", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VALUE", "name": "Speed"}], "type": "SetActionSpeedNode", "name": "Set Action Speed", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Animation"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}, {"type": "SHADER", "name": "Value"}], "type": "ArrayAddNode", "name": "Array Add", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}, {"type": "SHADER", "name": "Value"}], "type": "ArrayAddUniqueNode", "name": "Array Add Unique", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Index"}], "type": "ArrayGetNode", "name": "Array Get", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ARRAY", "name": "Array"}], "type": "ArrayLengthNode", "name": "Array Length", "outputs": [{"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [{"type": "ARRAY", "name": "Array"}], "type": "ArrayPopNode", "name": "Array Pop", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Index"}], "type": "ArrayRemoveNode", "name": "Array Remove", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}, {"type": "SHADER", "name": "Value"}], "type": "ArrayRemoveValueNode", "name": "Array Remove Value", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Index"}, {"type": "SHADER", "name": "Value"}], "type": "ArraySetNode", "name": "Array Set", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ARRAY", "name": "Array"}], "type": "ArrayShiftNode", "name": "Array Shift", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Index"}, {"type": "INTEGER", "name": "End"}], "type": "ArraySliceNode", "name": "Array Slice", "outputs": [{"type": "ARRAY", "name": "Array"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Index"}, {"type": "INTEGER", "name": "Length"}], "type": "ArraySpliceNode", "name": "Array Splice", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [], "type": "ArrayNode", "name": "Array", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayBooleanNode", "name": "Array (Boolean)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayColorNode", "name": "Array (Color)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayFloatNode", "name": "Array (Float)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayIntegerNode", "name": "Array (Integer)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayObjectNode", "name": "Array (Object)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayStringNode", "name": "Array (String)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}, {"buttons": [], "inputs": [], "type": "ArrayVectorNode", "name": "Array (Vector)", "outputs": [{"type": "ARRAY", "name": "Array"}, {"type": "INTEGER", "name": "Length"}]}], "name": "Array"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Element"}, {"type": "STRING", "name": "Text"}], "type": "CanvasSetTextNode", "name": "Canvas Set Text", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Canvas"}, {"nodes": [{"buttons": [], "inputs": [], "type": "OnEventNode", "name": "On Event", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [], "type": "OnInitNode", "name": "On Init", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "Duration"}, {"type": "BOOL", "name": "Repeat"}], "type": "OnTimerNode", "name": "On Timer", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [], "type": "OnUpdateNode", "name": "On Update", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [{"default_value": 0, "data": ["Enter", "Leave", "Overlap"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "OBJECT", "name": "Volume"}], "type": "OnVolumeTriggerNode", "name": "On Volume Trigger", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Event"}, {"nodes": [{"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released", "Moved Left", "Moved Right"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["cross", "circle", "square", "triangle", "l1", "r1", "l2", "r2", "share", "options", "l3", "r3", "up", "down", "left", "right", "home", "touchpad"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "INTEGER", "name": "Gamepad"}], "type": "GamepadNode", "name": "Gamepad State", "outputs": [{"type": "VALUE", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "INTEGER", "name": "Gamepad"}], "type": "GamepadCoordsNode", "name": "Gamepad Coords", "outputs": [{"type": "VECTOR", "name": "Left Stick"}, {"type": "VECTOR", "name": "Right Stick"}, {"type": "VECTOR", "name": "Left Movement"}, {"type": "VECTOR", "name": "Right Movement"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", ",", "space", "backspace", "tab", "return", "shift", "control", "alt", "escape", "delete", "back", "up", "right", "left", "down"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "KeyboardNode", "name": "Keyboard State", "outputs": [{"type": "BOOL", "name": "State"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released", "Moved"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["left", "right", "middle"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "MouseNode", "name": "Mouse State", "outputs": [{"type": "BOOL", "name": "State"}]}, {"buttons": [], "inputs": [], "type": "MouseCoordsNode", "name": "Mouse Coords", "outputs": [{"type": "VECTOR", "name": "Coords"}, {"type": "VECTOR", "name": "Movement"}, {"type": "INTEGER", "name": "Wheel"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released", "Moved Left", "Moved Right"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["cross", "circle", "square", "triangle", "l1", "r1", "l2", "r2", "share", "options", "l3", "r3", "up", "down", "left", "right", "home", "touchpad"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "INTEGER", "name": "Gamepad"}], "type": "OnGamepadNode", "name": "On Gamepad", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", ",", "space", "backspace", "tab", "return", "shift", "control", "alt", "escape", "delete", "back", "up", "right", "left", "down"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "OnKeyboardNode", "name": "On Keyboard", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released", "Moved"], "type": "ENUM", "name": "property("}, {"default_value": 0, "data": ["left", "right", "middle"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "OnMouseNode", "name": "On Mouse", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [{"default_value": 0, "data": ["Touched", "Started", "Released", "Moved"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "OnSurfaceNode", "name": "On Surface", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "OnVirtualButtonNode", "name": "On Virtual Button", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [], "type": "SensorCoordsNode", "name": "Sensor Coords", "outputs": [{"type": "VECTOR", "name": "Coords"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "BOOL", "name": "Lock"}], "type": "SetMouseLockNode", "name": "Set Mouse Lock", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "BOOL", "name": "Show"}], "type": "ShowMouseNode", "name": "Show Mouse", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [{"default_value": 0, "data": ["Touched", "Started", "Released", "Moved"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "SurfaceNode", "name": "Surface State", "outputs": [{"type": "BOOL", "name": "State"}]}, {"buttons": [], "inputs": [], "type": "SurfaceCoordsNode", "name": "Surface Coords", "outputs": [{"type": "VECTOR", "name": "Coords"}, {"type": "VECTOR", "name": "Movement"}]}, {"buttons": [{"default_value": 0, "data": ["Down", "Started", "Released"], "type": "ENUM", "name": "property("}], "inputs": [], "type": "VirtualButtonNode", "name": "Virtual Button", "outputs": [{"type": "BOOL", "name": "State"}]}], "name": "Input"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "AlternateNode", "name": "Alternate", "outputs": [{"type": "ACTION", "name": "0"}, {"type": "ACTION", "name": "1"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}], "type": "ArrayLoopNode", "name": "Array Loop", "outputs": [{"type": "ACTION", "name": "Loop"}, {"type": "INTEGER", "name": "Value"}, {"type": "ACTION", "name": "Done"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "BOOL", "name": "Bool"}], "type": "BranchNode", "name": "Branch", "outputs": [{"type": "ACTION", "name": "True"}, {"type": "ACTION", "name": "False"}]}, {"buttons": [{"default_value": 0, "data": ["Equal", "Almost Equal", "Greater", "Greater Equal", "Less", "Less Equal", "Or", "And", ""], "type": "ENUM", "name": "property("}], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Value"}, {"type": "SHADER", "name": "Value"}], "type": "GateNode", "name": "Gate", "outputs": [{"type": "ACTION", "name": "True"}, {"type": "ACTION", "name": "False"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "InverseNode", "name": "Inverse", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "BOOL", "name": "Value"}], "type": "IsFalseNode", "name": "Is False", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Value"}], "type": "IsNoneNode", "name": "Is None", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "SHADER", "name": "Value"}], "type": "IsNotNoneNode", "name": "Is Not None", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "BOOL", "name": "Value"}], "type": "IsTrueNode", "name": "Is True", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "INTEGER", "name": "From"}, {"type": "INTEGER", "name": "To"}], "type": "LoopNode", "name": "Loop", "outputs": [{"type": "ACTION", "name": "Loop"}, {"type": "INTEGER", "name": "Index"}, {"type": "ACTION", "name": "Done"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "LoopBreakNode", "name": "Loop Break", "outputs": []}, {"buttons": [], "inputs": [], "type": "MergeNode", "name": "Merge", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "BOOL", "name": "Value"}], "type": "NotNode", "name": "Not", "outputs": [{"type": "BOOL", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "SequenceNode", "name": "Sequence", "outputs": []}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "ToBoolNode", "name": "To Bool", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "BOOL", "name": "Condition"}], "type": "WhileNode", "name": "While", "outputs": [{"type": "ACTION", "name": "Loop"}, {"type": "ACTION", "name": "Done"}]}], "name": "Logic"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Function"}], "type": "CallFunctionNode", "name": "Call Function", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "SHADER", "name": "Result"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Function"}], "type": "CallStaticFunctionNode", "name": "Call Static Function", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "SHADER", "name": "Result"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "ExpressionNode", "name": "Expression", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "SHADER", "name": "Result"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Property"}], "type": "GetNativePropertyNode", "name": "Get Native Property", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "STRING", "name": "Class"}, {"type": "STRING", "name": "Property"}], "type": "GetStaticPropertyNode", "name": "Get Static Property", "outputs": [{"type": "SHADER", "name": "Value"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "ARRAY", "name": "Array"}], "type": "ScriptNode", "name": "Script", "outputs": [{"type": "ACTION", "name": "Out"}, {"type": "SHADER", "name": "Result"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "STRING", "name": "Property"}, {"type": "SHADER", "name": "Value"}], "type": "SetNativePropertyNode", "name": "Set Native Property", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "STRING", "name": "Class"}, {"type": "STRING", "name": "Property"}, {"type": "SHADER", "name": "Value"}], "type": "SetStaticPropertyNode", "name": "Set Static Property", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "ShutdownNode", "name": "Shutdown", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Native"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "SHADER", "name": "Location"}], "type": "GoToLocationNode", "name": "Go To Location", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [], "type": "NavigableLocationNode", "name": "Navigable Location", "outputs": [{"type": "SHADER", "name": "Location"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Navmesh"}, {"type": "VECTOR", "name": "Screen Coords"}], "type": "PickLocationNode", "name": "Pick Location", "outputs": [{"type": "VECTOR", "name": "Location"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}], "type": "StopAgentNode", "name": "Stop Agent", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Navmesh"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Force"}], "type": "ApplyForceNode", "name": "Apply Force", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Force"}, {"type": "VECTOR", "name": "Location"}], "type": "ApplyForceAtLocationNode", "name": "Apply Force At Location", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Impulse"}], "type": "ApplyImpulseNode", "name": "Apply Impulse", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Impulse"}, {"type": "VECTOR", "name": "Location"}], "type": "ApplyImpulseAtLocationNode", "name": "Apply Impulse At Location", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "From"}, {"type": "VECTOR", "name": "To"}], "type": "CastPhysicsRayNode", "name": "Cast Physics Ray", "outputs": [{"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Hit"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetContactsNode", "name": "Get Contacts", "outputs": [{"type": "ARRAY", "name": "Array"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetFirstContactNode", "name": "Get First Contact", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Gravity"}], "type": "GetGravityNode", "name": "Get Gravity", "outputs": []}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "GetVelocityNode", "name": "Get Velocity", "outputs": [{"type": "VECTOR", "name": "Linear"}, {"type": "VECTOR", "name": "Angular"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object 1"}, {"type": "OBJECT", "name": "Object 2"}], "type": "HasContactNode", "name": "Has Contact", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [{"default_value": 0, "data": ["Begin", "End", "Overlap"], "type": "ENUM", "name": "property("}], "inputs": [{"type": "OBJECT", "name": "Object 1"}, {"type": "OBJECT", "name": "Object 2"}], "type": "OnContactNode", "name": "On Contact", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Screen Coords"}], "type": "PickObjectNode", "name": "Pick Object", "outputs": [{"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Hit"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "VECTOR", "name": "Gravity"}], "type": "SetGravityNode", "name": "Set Gravity", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Object"}, {"type": "VECTOR", "name": "Linear"}, {"type": "VECTOR", "name": "Linear Factor"}, {"type": "VECTOR", "name": "Angular"}, {"type": "VECTOR", "name": "Angular Factor"}], "type": "SetVelocityNode", "name": "Set Velocity", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Physics"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Speaker"}], "type": "PauseSoundNode", "name": "Pause Speaker", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}], "type": "PlaySoundRawNode", "name": "Play Sound", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Speaker"}], "type": "PlaySoundNode", "name": "Play Speaker", "outputs": [{"type": "ACTION", "name": "Out"}]}, {"buttons": [], "inputs": [{"type": "ACTION", "name": "In"}, {"type": "OBJECT", "name": "Speaker"}], "type": "StopSoundNode", "name": "Stop Speaker", "outputs": [{"type": "ACTION", "name": "Out"}]}], "name": "Sound"}, {"nodes": [{"buttons": [], "inputs": [{"type": "ANIMACTION", "name": "Action"}], "type": "AnimActionNode", "name": "Action", "outputs": [{"type": "ANIMACTION", "name": "Action"}]}, {"buttons": [], "inputs": [{"type": "BOOL", "name": "Value"}], "type": "BooleanNode", "name": "Boolean", "outputs": [{"type": "BOOL", "name": "Bool"}]}, {"buttons": [], "inputs": [{"type": "RGBA", "name": "Color"}], "type": "ColorNode", "name": "Color", "outputs": [{"type": "RGBA", "name": "Color"}]}, {"buttons": [], "inputs": [], "type": "DynamicNode", "name": "Dynamic", "outputs": [{"type": "SHADER", "name": "Dynamic"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "Value"}], "type": "FloatNode", "name": "Float", "outputs": [{"type": "VALUE", "name": "Float"}]}, {"buttons": [], "inputs": [], "type": "GlobalObjectNode", "name": "Global Object", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [], "type": "GroupNode", "name": "Group", "outputs": [{"type": "ARRAY", "name": "Array"}]}, {"buttons": [], "inputs": [{"type": "INTEGER", "name": "Value"}], "type": "IntegerNode", "name": "Integer", "outputs": [{"type": "INTEGER", "name": "Int"}]}, {"buttons": [], "inputs": [], "type": "MaterialNode", "name": "Material", "outputs": [{"type": "SHADER", "name": "Material"}]}, {"buttons": [], "inputs": [], "type": "MeshNode", "name": "Mesh", "outputs": [{"type": "SHADER", "name": "Mesh"}]}, {"buttons": [], "inputs": [{"type": "OBJECT", "name": "Object"}], "type": "ObjectNode", "name": "Object", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "X"}, {"type": "VALUE", "name": "Y"}, {"type": "VALUE", "name": "Z"}, {"type": "VALUE", "name": "W"}], "type": "QuaternionNode", "name": "Quaternion", "outputs": [{"type": "VECTOR", "name": "Quaternion"}]}, {"buttons": [], "inputs": [], "type": "SceneNode", "name": "Scene", "outputs": [{"type": "SHADER", "name": "Scene"}]}, {"buttons": [], "inputs": [], "type": "SceneRootNode", "name": "Scene Root", "outputs": [{"type": "OBJECT", "name": "Object"}]}, {"buttons": [], "inputs": [{"type": "STRING", "name": "Value"}], "type": "StringNode", "name": "String", "outputs": [{"type": "STRING", "name": "String"}]}, {"buttons": [], "inputs": [], "type": "TraitNode", "name": "Trait", "outputs": [{"type": "SHADER", "name": "Trait"}]}, {"buttons": [], "inputs": [{"type": "VECTOR", "name": "Location"}, {"type": "VECTOR", "name": "Rotation"}, {"type": "VECTOR", "name": "Scale"}], "type": "TransformNode", "name": "Transform", "outputs": [{"type": "SHADER", "name": "Transform"}]}, {"buttons": [], "inputs": [{"type": "VALUE", "name": "X"}, {"type": "VALUE", "name": "Y"}, {"type": "VALUE", "name": "Z"}], "type": "VectorNode", "name": "Vector", "outputs": [{"type": "VECTOR", "name": "Vector"}]}], "name": "Variable"}]} \ No newline at end of file diff --git a/Sources/arm/App.hx b/Sources/arm/App.hx index 9fac760a..4d239ab2 100644 --- a/Sources/arm/App.hx +++ b/Sources/arm/App.hx @@ -151,7 +151,6 @@ class App extends iron.Trait { else if (Format.checkTextureFormat(fileArg)) { UITrait.inst.show2DView(1); } - // fileArg = ""; } }); }); diff --git a/Sources/arm/Config.hx b/Sources/arm/Config.hx index 5598bf8d..127a6030 100644 --- a/Sources/arm/Config.hx +++ b/Sources/arm/Config.hx @@ -18,7 +18,6 @@ class Config { C.rp_supersample = 1.0; } - // if (C.version == null) C.version = 1; if (C.ui_layout == null) C.ui_layout = 0; if (C.undo_steps == null) C.undo_steps = 4; // Max steps to keep if (C.keymap == null) { diff --git a/Sources/arm/Importer.hx b/Sources/arm/Importer.hx index d5d80d9b..d51f48a3 100644 --- a/Sources/arm/Importer.hx +++ b/Sources/arm/Importer.hx @@ -998,9 +998,6 @@ class Importer { g.vertexBufferMap.remove("pos"); } - // Face camera - // UITrait.inst.paintObject.transform.setRotation(Math.PI / 2, 0, 0); - UITrait.inst.paintObjects = [UITrait.inst.paintObject]; } diff --git a/Sources/arm/MaterialBuilder.hx b/Sources/arm/MaterialBuilder.hx index bfe967da..d744f904 100644 --- a/Sources/arm/MaterialBuilder.hx +++ b/Sources/arm/MaterialBuilder.hx @@ -781,36 +781,6 @@ class MaterialBuilder { return con_mesh; } - // public static function make_depth(data:CyclesShaderData, matcon:TMaterialContext):CyclesShaderContext { - // var context_id = 'depth'; - // var con_depth:CyclesShaderContext = data.add_context({ - // name: context_id, - // depth_write: true, - // compare_mode: 'less', - // cull_mode: 'clockwise', - // color_writes_red: [false], - // color_writes_green: [false], - // color_writes_blue: [false], - // color_writes_alpha: [false], - // vertex_elements: [{name: "pos", data: 'short4norm'}] - // }); - - // var vert = con_depth.make_vert(); - // var frag = con_depth.make_frag(); - - // frag.ins = vert.outs; - - // vert.add_uniform('mat4 WVP', '_worldViewProjectionMatrix'); - // vert.write('gl_Position = mul(vec4(pos.xyz, 1.0), WVP);'); - - // // Cycles.finalize(con_depth); - // con_depth.data.shader_from_source = true; - // con_depth.data.vertex_shader = vert.get(); - // con_depth.data.fragment_shader = frag.get(); - - // return con_depth; - // } - public static function make_particle(data:CyclesShaderData):CyclesShaderContext { var context_id = 'mesh'; var con_part:CyclesShaderContext = data.add_context({ diff --git a/Sources/arm/MaterialParser.hx b/Sources/arm/MaterialParser.hx index 50ce5849..abd4eee0 100644 --- a/Sources/arm/MaterialParser.hx +++ b/Sources/arm/MaterialParser.hx @@ -179,19 +179,6 @@ class MaterialParser { _materialcontext = self; m.contexts.push(self); }); - - // var dcon = MaterialBuilder.make_depth(_sd, _matcon); - // var dcdata = dcon.data; - // // from_source is synchronous.. - // var dsc = new ShaderContext(dcdata, function(sc:ShaderContext){}); - // m.shader.contexts.push(dsc); - // var dmatcon:TMaterialContext = { - // name: "depth" - // } - // m.raw.contexts.push(dmatcon); - // new MaterialContext(dmatcon, function(self:MaterialContext) { - // m.contexts.push(self); - // }); // }); } @@ -199,12 +186,4 @@ class MaterialParser { armory.system.Logic.packageName = "arm.brushnode"; var tree = armory.system.Logic.parse(UINodes.inst.canvasBrush, false); } - - // public static function parseLogic() { - // if (lastT != null) UITrait.inst.selectedObject.removeTrait(lastT); - // armory.system.Logic.packageName = "armory.logicnode"; - // var t = armory.system.Logic.parse(UINodes.inst.canvasLogic); - // lastT = t; - // UITrait.inst.selectedObject.addTrait(t); - // } } diff --git a/Sources/arm/Project.hx b/Sources/arm/Project.hx index 15d65a19..b094827d 100644 --- a/Sources/arm/Project.hx +++ b/Sources/arm/Project.hx @@ -199,8 +199,6 @@ class Project { UITrait.inst.paintObject.transform.buildMatrix(); UITrait.inst.paintObject.name = n; UITrait.inst.paintObjects = [UITrait.inst.paintObject]; - // UITrait.inst.maskHandle.position = 0; - // UITrait.inst.materials = [new MaterialSlot()]; iron.data.Data.getMaterial("Scene", "Material", function(m:iron.data.MaterialData) { UITrait.inst.materials = [new MaterialSlot(m)]; }); diff --git a/Sources/arm/Uniforms.hx b/Sources/arm/Uniforms.hx index a39fd569..36d17652 100644 --- a/Sources/arm/Uniforms.hx +++ b/Sources/arm/Uniforms.hx @@ -72,10 +72,6 @@ class Uniforms { var gbuffer2 = RenderPath.active.renderTargets.get("gbuffer2"); vec2.set(gbuffer2.image.width, gbuffer2.image.height, 0); return vec2; - // Check equality at init - // trace(RenderPath.active.renderTargets.get("gbuffer2").image.width); - // trace(iron.App.w()); - // var f = armory.renderpath.Inc.getSuperSampling(); } else if (link == '_cloneDelta') { vec2.set(UITrait.inst.cloneDeltaX, UITrait.inst.cloneDeltaY, 0); diff --git a/Sources/arm/creator/NodeCreatorLogic.hx b/Sources/arm/creator/NodeCreatorLogic.hx deleted file mode 100644 index 142c1aa2..00000000 --- a/Sources/arm/creator/NodeCreatorLogic.hx +++ /dev/null @@ -1,181 +0,0 @@ -package arm.creator; - -import armory.system.CyclesFormat; -import arm.ui.UINodes; - -typedef TNodeList = { - var categories: Array; -} - -typedef TCat = { - var name: String; - var nodes: Array; -} - -typedef TCatNode = { - var name: String; - var type: String; - var inputs: Array; - var outputs: Array; - var buttons: Array; -} - -typedef TCatSocket = { - var name: String; - var type: String; -} - -typedef TCatButton = { - var name: String; - var type: String; - var default_value: Dynamic; - var data: Array; -} - -class NodeCreatorLogic { - - public static var categories = ["Action", "Animation", "Array", "Canvas", "Event", "Input", "Logic", "Native", "Navmesh", "Physics", "Sound", "Value", "Variable"]; - - public static var list:TNodeList; - - static function nodeColor(type:String):Int { - switch(type) { - case 'Logic': - return 0xffb34f5a; - case 'Event': - return 0xffb34f5a; - case 'Action': - return 0xffb34f5a; - case 'Value': - return 0xffb34f5a; - case 'Variable': - return 0xffb34f5a; - case 'Input': - return 0xffb34f5a; - case 'Animation': - return 0xffb34f5a; - case 'Physics': - return 0xffb34f5a; - case 'Sound': - return 0xffb34f5a; - case 'Navmesh': - return 0xffb34f5a; - case 'Native': - return 0xffb34f5a; - } - return 0xffb34f5a; - } - - static function socketColor(type:String):Int { - switch(type) { - case 'ACTION': - return 0xffcc4c4c; - case 'OBJECT': - return 0xff268cbf; - // case 'ARRAY': - // case 'ANIMACTION': - case 'SHADER': - return 0xff4982a0; - case 'INTEGER': - return 0xff63c763; - case 'VALUE': - return 0xff63c763; - case 'VECTOR': - return 0xff63c763; - case 'RGBA': - return 0xff63c763; - case 'STRING': - return 0xffffffff; - case 'BOOL': - return 0xff63c763; - } - return 0xffb34f5a; - } - - static function socketDefault(type:String):Dynamic { - switch(type) { - case 'ACTION': - return 0; - case 'OBJECT': - return 0; - // case 'ARRAY': - // case 'ANIMACTION': - case 'SHADER': - return 0; - case 'INTEGER': - return 0; - case 'VALUE': - return 0.0; - case 'VECTOR': - return [0.0, 0.0, 0.0]; - case 'RGBA': - return [0.0, 0.0, 0.0, 0.0]; - case 'STRING': - return ''; - case 'BOOL': - return false; - } - return 0; - } - - public static function draw(cat:Int) { - var ui = UINodes.inst.ui; - var getNodeX = UINodes.inst.getNodeX; - var getNodeY = UINodes.inst.getNodeY; - var nodes = UINodes.inst.nodes; - var canvas = UINodes.inst.canvasLogic; - - var c:TCat = list.categories[cat]; - for (cnode in c.nodes) { - if (ui.button(cnode.name, Left)) { - var node_id = nodes.getNodeId(canvas.nodes); - var n:TNode = { - id: node_id, - name: cnode.name, - type: cnode.type, - x: getNodeX(), - y: getNodeY(), - color: nodeColor(cnode.type), - inputs: [], - outputs: [], - buttons: [] - }; - for (cinp in cnode.inputs) { - var soc:TNodeSocket = { - id: nodes.getSocketId(canvas.nodes), - node_id: node_id, - name: cinp.name, - type: cinp.type, - color: socketColor(cinp.type), - default_value: socketDefault(cinp.type) - }; - n.inputs.push(soc); - } - for (cout in cnode.outputs) { - var soc:TNodeSocket = { - id: nodes.getSocketId(canvas.nodes), - node_id: node_id, - name: cout.name, - type: cout.type, - color: socketColor(cout.type), - default_value: socketDefault(cout.type) - }; - n.outputs.push(soc); - } - for (cbut in cnode.buttons) { - var but:TNodeButton = { - name: cbut.name, - type: cbut.type, - output: 0, - default_value: cbut.default_value, - data: cbut.data - }; - n.buttons.push(but); - } - canvas.nodes.push(n); - nodes.nodesDrag = true; - nodes.nodesSelected = [n]; - } - } - } -} diff --git a/Sources/arm/renderpath/RenderPathPreview.hx b/Sources/arm/renderpath/RenderPathPreview.hx index ce9dee08..c447dbd2 100644 --- a/Sources/arm/renderpath/RenderPathPreview.hx +++ b/Sources/arm/renderpath/RenderPathPreview.hx @@ -69,31 +69,6 @@ class RenderPathPreview { path.setTarget("texpreview_icon"); path.bindTarget("texpreview", "tex"); path.drawShader("shader_datas/supersample_resolve/supersample_resolve"); - - // #if ((rp_antialiasing == "SMAA") || (rp_antialiasing == "TAA")) - // { - // path.setTarget("mbufa"); - // path.clearTarget(0x00000000); - // path.bindTarget("mbuf", "colorTex"); - // path.drawShader("shader_datas/smaa_edge_detect/smaa_edge_detect"); - - // path.setTarget("mbufb"); - // path.clearTarget(0x00000000); - // path.bindTarget("mbufa", "edgesTex"); - // path.drawShader("shader_datas/smaa_blend_weight/smaa_blend_weight"); - - // path.setTarget(framebuffer); - - // path.bindTarget("mbuf", "colorTex"); - // path.bindTarget("mbufb", "blendTex"); - // #if (rp_antialiasing == "TAA") - // { - // path.bindTarget("mgbuffer2", "sveloc"); - // } - // #end - // path.drawShader("shader_datas/smaa_neighborhood_blend/smaa_neighborhood_blend"); - // } - // #end } @:access(iron.RenderPath) @@ -154,30 +129,5 @@ class RenderPathPreview { } #end path.drawShader("shader_datas/compositor_pass/compositor_pass"); - - // #if ((rp_antialiasing == "SMAA") || (rp_antialiasing == "TAA")) - // { - // path.setTarget("bufa"); - // path.clearTarget(0x00000000); - // path.bindTarget("buf", "colorTex"); - // path.drawShader("shader_datas/smaa_edge_detect/smaa_edge_detect"); - - // path.setTarget("bufb"); - // path.clearTarget(0x00000000); - // path.bindTarget("bufa", "edgesTex"); - // path.drawShader("shader_datas/smaa_blend_weight/smaa_blend_weight"); - - // path.setTarget(framebuffer); - - // path.bindTarget("buf", "colorTex"); - // path.bindTarget("bufb", "blendTex"); - // #if (rp_antialiasing == "TAA") - // { - // path.bindTarget("gbuffer2", "sveloc"); - // } - // #end - // path.drawShader("shader_datas/smaa_neighborhood_blend/smaa_neighborhood_blend"); - // } - // #end } -} \ No newline at end of file +} diff --git a/Sources/arm/ui/UIFiles.hx b/Sources/arm/ui/UIFiles.hx index 0df12529..0a4cc22e 100644 --- a/Sources/arm/ui/UIFiles.hx +++ b/Sources/arm/ui/UIFiles.hx @@ -10,8 +10,6 @@ class UIFiles { @:access(zui.Zui) public static function render(g:kha.graphics2.Graphics) { - var uibox = App.uibox; - // Krom with native file dialogs #if kha_krom if (untyped Krom.openDialog != null) { @@ -31,67 +29,8 @@ class UIFiles { App.filesDone(App.path); } releaseKeys(); - return; } #end - - UIBox.modalW = Std.int(625 * uibox.SCALE); - UIBox.modalH = Std.int(545 * uibox.SCALE); - - var appw = kha.System.windowWidth(); - var apph = kha.System.windowHeight(); - var left = Std.int(appw / 2 - UIBox.modalW / 2); - var right = Std.int(appw / 2 + UIBox.modalW / 2); - var top = Std.int(apph / 2 - UIBox.modalH / 2); - var bottom = Std.int(apph / 2 + UIBox.modalH / 2); - - // g.color = 0x44000000; - // g.fillRect(0, 0, appw, apph); - - g.color = uibox.t.SEPARATOR_COL; - g.fillRect(left, top, UIBox.modalW, UIBox.modalH); - - g.end(); - uibox.begin(g); - var pathHandle = Id.handle(); - if (uibox.window(App.whandle, left, top, UIBox.modalW, UIBox.modalH - 50)) { - pathHandle.text = uibox.textInput(pathHandle, "Path"); - if (App.showFilename) uibox.textInput(App.filenameHandle, "File"); - App.path = zui.Ext.fileBrowser(uibox, pathHandle, App.foldersOnly); - } - uibox.end(false); - g.begin(false); - - if (Format.checkTextureFormat(App.path) || Format.checkMeshFormat(App.path) || Format.checkProjectFormat(App.path)) { - App.showFiles = false; - App.filesDone(App.path); - #if krom_windows - var sep = "\\"; - #else - var sep = "/"; - #end - pathHandle.text = pathHandle.text.substr(0, pathHandle.text.lastIndexOf(sep)); - App.whandle.redraws = 2; - UITrait.inst.ddirty = 2; - } - - g.end(); - uibox.beginLayout(g, right - Std.int(uibox.ELEMENT_W()), bottom - Std.int(uibox.ELEMENT_H() * 1.2), Std.int(uibox.ELEMENT_W())); - if (uibox.button("OK")) { - App.showFiles = false; - App.filesDone(App.path); - UITrait.inst.ddirty = 2; - } - uibox.endLayout(false); - - uibox.beginLayout(g, right - Std.int(uibox.ELEMENT_W() * 2), bottom - Std.int(uibox.ELEMENT_H() * 1.2), Std.int(uibox.ELEMENT_W())); - if (uibox.button("Cancel")) { - App.showFiles = false; - UITrait.inst.ddirty = 2; - } - uibox.endLayout(); - - g.begin(false); } static function releaseKeys() { diff --git a/Sources/arm/ui/UIMenu.hx b/Sources/arm/ui/UIMenu.hx index 350c9913..e5a83007 100644 --- a/Sources/arm/ui/UIMenu.hx +++ b/Sources/arm/ui/UIMenu.hx @@ -94,7 +94,6 @@ class UIMenu { } // ui.button("Show Envmap", Left); - // ui.button("Show Grid", Left); // ui.button("Wireframe", Left); } else if (menuCategory == 3) { diff --git a/Sources/arm/ui/UINodes.hx b/Sources/arm/ui/UINodes.hx index 5f7d2002..c86b4376 100644 --- a/Sources/arm/ui/UINodes.hx +++ b/Sources/arm/ui/UINodes.hx @@ -5,7 +5,6 @@ import zui.Id; import zui.Nodes; import arm.creator.NodeCreator; import arm.creator.NodeCreatorBrush; -// import arm.creator.NodeCreatorLogic; import arm.util.RenderUtil; import arm.ui.UITrait; import arm.Tool; @@ -41,11 +40,7 @@ class UINodes extends iron.Trait { public var canvasBrushMap:Map = null; var canvasBrushBlob:String; - // public var canvasLogic:TNodeCanvas = null; - // public var canvasLogicMap:Map = null; - // var canvasLogicBlob:String; - - public var canvasType = 0; // material, brush, logic + public var canvasType = 0; // material, brush var mdown = false; var mreleased = false; @@ -65,32 +60,22 @@ class UINodes extends iron.Trait { inst = this; Nodes.excludeRemove.push("OUTPUT_MATERIAL_PBR"); - // Cycles.arm_export_tangents = false; iron.data.Data.getBlob('defaults/default_material.json', function(b1:kha.Blob) { iron.data.Data.getBlob('defaults/default_brush.json', function(b2:kha.Blob) { - // iron.data.Data.getBlob('defaults/default_logic.json', function(b3:kha.Blob) { - // iron.data.Data.getBlob('logic_nodes.json', function(bnodes:kha.Blob) { + canvasBlob = b1.toString(); + canvasBrushBlob = b2.toString(); + canvas = haxe.Json.parse(canvasBlob); + canvasBrush = haxe.Json.parse(canvasBrushBlob); + MaterialParser.parseBrush(); - canvasBlob = b1.toString(); - canvasBrushBlob = b2.toString(); - canvas = haxe.Json.parse(canvasBlob); - canvasBrush = haxe.Json.parse(canvasBrushBlob); - MaterialParser.parseBrush(); - // canvasLogicBlob = b3.toString(); - // canvasLogic = haxe.Json.parse(canvasLogicBlob); - - // NodeCreatorLogic.list = haxe.Json.parse(bnodes.toString()); - - var t = Reflect.copy(arm.App.theme); - t.ELEMENT_H = 18; - t.BUTTON_H = 16; - var scale = armory.data.Config.raw.window_scale; - ui = new Zui({font: arm.App.font, theme: t, color_wheel: arm.App.color_wheel, scaleFactor: scale}); - ui.scrollEnabled = false; - // }); - // }); + var t = Reflect.copy(arm.App.theme); + t.ELEMENT_H = 18; + t.BUTTON_H = 16; + var scale = armory.data.Config.raw.window_scale; + ui = new Zui({font: arm.App.font, theme: t, color_wheel: arm.App.color_wheel, scaleFactor: scale}); + ui.scrollEnabled = false; }); }); } @@ -139,31 +124,14 @@ class UINodes extends iron.Trait { } } - // public function updateCanvasLogicMap() { - // if (UITrait.inst.selectedLogic != null) { - // if (canvasLogicMap == null) canvasLogicMap = new Map(); - // var c = canvasLogicMap.get(UITrait.inst.selectedLogic); - // if (c == null) { - // c = haxe.Json.parse(canvasLogicBlob); - // canvasLogicMap.set(UITrait.inst.selectedLogic, c); - // canvasLogic = c; - // } - // else canvasLogic = c; - - // if (canvasType == 2) nodes = UITrait.inst.selectedLogic.nodes; - // } - // } - function getCanvas() { if (canvasType == 0) return canvas; else return canvasBrush; - // else if (canvasType == 2) return canvasLogic; } function update() { updateCanvasMap(); updateCanvasBrushMap(); - // updateCanvasLogicMap(); var mouse = iron.system.Input.getMouse(); mreleased = mouse.released(); @@ -174,7 +142,6 @@ class UINodes extends iron.Trait { mchanged = true; if (!mdown) changed = true; if (canvasType == 1) MaterialParser.parseBrush(); - // else if (canvasType == 2) MaterialParser.parseLogic(); } if ((mreleased && mchanged) || changed) { mchanged = changed = false; @@ -220,13 +187,6 @@ class UINodes extends iron.Trait { hideMenu = true; } - // if (keyboard.started("p")) { - // var c = getCanvas(); - // var str = haxe.Json.stringify(c); - // trace(str.substr(0, 1023)); - // trace(str.substr(1023, 2047)); - // } - if (nodes.nodesSelected.length > 0) { if (keyboard.started("left")) for (n in nodes.nodesSelected) n.x -= 1; else if (keyboard.started("right")) for (n in nodes.nodesSelected) n.x += 1; @@ -449,7 +409,6 @@ class UINodes extends iron.Trait { var list = canvasType == 0 ? NodeCreator.list : NodeCreatorBrush.list; var canvas = canvasType == 0 ? canvas : canvasBrush; var numNodes = list[menuCategory].length; - // if (canvasType == 2) numNodes = NodeCreatorLogic.list.categories[menuCategory].nodes.length; var ph = numNodes * 20 * ui.SCALE; var py = popupY; diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx index 7ddd5ce7..75a73fda 100644 --- a/Sources/arm/ui/UITrait.hx +++ b/Sources/arm/ui/UITrait.hx @@ -124,7 +124,6 @@ class UITrait extends iron.Trait { public var selectedTexture:TAsset = null; public var brushes:Array = null; public var selectedBrush:BrushSlot; - public var selectedLogic:BrushSlot; public var layers:Array = null; public var undoLayers:Array = null; public var selectedLayer:LayerSlot; @@ -165,7 +164,6 @@ class UITrait extends iron.Trait { public var gizmoX:Object = null; public var gizmoY:Object = null; public var gizmoZ:Object = null; - public var grid:Object = null; public var axisX = false; public var axisY = false; public var axisZ = false; @@ -199,7 +197,6 @@ class UITrait extends iron.Trait { public var symX = false; public var symY = false; public var symZ = false; - public var showGrid = false; public var showCompass = true; public var fillTypeHandle = new Handle(); public var resHandle = new Handle({position: 1}); // 2048 @@ -395,7 +392,6 @@ class UITrait extends iron.Trait { function done() { if (ui.SCALE > 1) setIconScale(); // - // grid = iron.Scene.active.getChild(".Grid"); gizmo = iron.Scene.active.getChild(".GizmoTranslate"); gizmo.transform.scale.set(0.5, 0.5, 0.5); gizmo.transform.buildMatrix(); @@ -799,11 +795,6 @@ class UITrait extends iron.Trait { if (kha.System.windowWidth() == 0 || kha.System.windowHeight() == 0) return; renderUI(g); - - // var ready = showFiles || dirty; - // TODO: Texture params get overwritten - // if (ready) for (t in UINodes.inst._matcon.bind_textures) t.params_set = null; - // if (UINodes.inst._matcon != null) for (t in UINodes.inst._matcon.bind_textures) t.params_set = null; } function renderCursor(g:kha.graphics2.Graphics) { @@ -876,20 +867,6 @@ class UITrait extends iron.Trait { } } } - - if (showGrid) { - // Separator line - var x1 = iron.App.x() + iron.App.w() / 3; - var x2 = iron.App.x() + iron.App.w() / 3 * 2; - var y1 = iron.App.y() + iron.App.h() / 3; - var y2 = iron.App.y() + iron.App.h() / 3 * 2; - g.color = 0x66ffffff; - g.fillRect(x1 - 1, iron.App.y(), 2, iron.App.h()); - g.fillRect(x2 - 1, iron.App.y(), 2, iron.App.h()); - g.fillRect(iron.App.x(), y1 - 1, iron.App.x() + iron.App.w(), 2); - g.fillRect(iron.App.x(), y2 - 1, iron.App.x() + iron.App.w(), 2); - g.color = 0xffffffff; - } } function showMaterialNodes() { @@ -910,15 +887,6 @@ class UITrait extends iron.Trait { arm.App.resize(); } - // function showLogicNodes() { - // // Clear input state as ui receives input events even when not drawn - // @:privateAccess UINodes.inst.ui.endInput(); - - // if (UINodes.inst.show && UINodes.inst.canvasType == 2) UINodes.inst.show = false; - // else { UINodes.inst.show = true; UINodes.inst.canvasType = 2; } - // arm.App.resize(); - // } - // function showParticleNodes() {} public function show2DView(type = 0) { @@ -1002,8 +970,6 @@ class UITrait extends iron.Trait { return paintObjects[0]; } - // var cursorImg:kha.Image = null; - function renderUI(g:kha.graphics2.Graphics) { if (!arm.App.uienabled && ui.inputRegistered) ui.unregisterInput(); @@ -1014,7 +980,6 @@ class UITrait extends iron.Trait { g.end(); ui.begin(g); - // ui.t.FILL_WINDOW_BG = false; var panelx = (iron.App.x() - toolbarw); if (App.C.ui_layout == 1 && (UINodes.inst.show || UIView2D.inst.show)) panelx = panelx - App.w() - toolbarw; if (ui.window(toolbarHandle, panelx, headerh, toolbarw, kha.System.windowHeight())) { @@ -1048,7 +1013,6 @@ class UITrait extends iron.Trait { ui.imageScrollAlign = true; } - // ui.t.FILL_WINDOW_BG = true; var panelx = iron.App.x() - toolbarw; if (App.C.ui_layout == 1 && (UINodes.inst.show || UIView2D.inst.show)) panelx = panelx - App.w() - toolbarw; @@ -1092,7 +1056,6 @@ class UITrait extends iron.Trait { if (worktab.position == SpaceScene) { selectTool(ToolGizmo); - // RenderUtil.makeMaterialPreview(); } MaterialParser.parseMeshMaterial(); @@ -1291,7 +1254,6 @@ class UITrait extends iron.Trait { tabx = App.C.ui_layout == 0 ? kha.System.windowWidth() - windowW : 0; tabh = Std.int(kha.System.windowHeight() / 3); gizmo.visible = false; - // grid.visible = false; if (worktab.position == SpacePaint) { if (ui.window(hwnd, tabx, 0, windowW, tabh)) { @@ -1315,7 +1277,6 @@ class UITrait extends iron.Trait { } else if (worktab.position == SpaceScene) { gizmo.visible = true; - // grid.visible = true; if (ui.window(hwnd, tabx, 0, windowW, tabh)) { tabOutliner(); tabPlugins(); @@ -1477,21 +1438,6 @@ class UITrait extends iron.Trait { selectTime = iron.system.Time.time(); } - // if (l.material_mask != null) { - // var img = l.material_mask.imageIcon; - // var w = img.width / 2; - // var x = ui._x - w * 1.13; - // var y = ui._y + w * 0.63; - // ui.g.color = 0xff000000; - // ui.g.fillRect(x, y, w, w); - // ui.g.color = 0xffffffff; - // #if kha_direct3d11 - // ui.g.drawScaledImage(img, x, y, w, w); - // #else - // ui.g.drawScaledImage(img, x, y + w, w, -w); - // #end - // } - if (l.texpaint_mask != null) { ui._y += 3; var state = ui.image(l.texpaint_mask_preview); @@ -2201,24 +2147,9 @@ class UITrait extends iron.Trait { parseTransform = ui.check(Id.handle({selected: parseTransform}), "Parse Transforms"); if (ui.panel(Id.handle({selected: false}), "Scene", 0, true)) { - var i = 0; - function drawList(h:Handle, o:MeshObject) { - // if (paintObject == o) { - // ui.fill(0, 0, ui._windowW, ui.t.ELEMENT_H, 0xff205d9c); - // } - // ui.row([1/10, 9/10]); - // var h = Id.handle().nest(i, {selected: o.visible}); - // o.visible = ui.check(h, ""); - // if (h.changed) ddirty = 2; - ui.text(o.name); - // if (ui.isReleased) { - // selectPaintObject(o); - // } - i++; - } ui.indent(); - for (c in paintObjects) { - drawList(Id.handle(), c); + for (o in paintObjects) { + ui.text(o.name); } ui.unindent(); } @@ -2421,9 +2352,10 @@ class UITrait extends iron.Trait { ui.g.begin(false); MaterialParser.parseMeshMaterial(); } - showGrid = ui.check(Id.handle({selected: showGrid}), "Grid"); + var compassHandle = Id.handle({selected: showCompass}); + showCompass = ui.check(compassHandle, "Compass"); + if (compassHandle.changed) ddirty = 2; - ui.row([1/2, 1/2]); showEnvmap = ui.check(showEnvmapHandle, "Envmap"); if (showEnvmapHandle.changed) { var world = iron.Scene.active.world; @@ -2431,9 +2363,6 @@ class UITrait extends iron.Trait { savedEnvmap = world.envmap; ddirty = 2; } - var compassHandle = Id.handle({selected: showCompass}); - showCompass = ui.check(compassHandle, "Compass"); - if (compassHandle.changed) ddirty = 2; if (showEnvmap) { showEnvmapBlur = ui.check(showEnvmapBlurHandle, "Blurred"); @@ -2590,10 +2519,7 @@ class UITrait extends iron.Trait { selectedObject.transform.dirty = true; if (selectedObject.name == "Scene") { - // ui.image(envThumb); var p = iron.Scene.active.world.probe; - // ui.row([1/2, 1/2]); - // var envType = ui.combo(Id.handle({position: 0}), ["Outdoor"], "Map"); var envHandle = Id.handle({value: p.raw.strength}); p.raw.strength = ui.slider(envHandle, "Strength", 0.0, 5.0, true); if (envHandle.changed) { @@ -2621,8 +2547,6 @@ class UITrait extends iron.Trait { } } } - - // if (ui.button("LNodes")) showLogicNodes(); } } diff --git a/Sources/arm/util/Path.hx b/Sources/arm/util/Path.hx index 3622588c..f9dcdd45 100644 --- a/Sources/arm/util/Path.hx +++ b/Sources/arm/util/Path.hx @@ -22,7 +22,6 @@ class Path { path = haxe.io.Path.normalize(path); var base = path.substr(0, path.lastIndexOf("/") + 1); #if krom_windows - // base = StringTools.replace(base, "/", "\\"); base = base.substr(0, 2) + "\\" + base.substr(3); #end return base; diff --git a/Sources/arm/util/UVUtil.hx b/Sources/arm/util/UVUtil.hx index 18f7c674..5b1211b7 100644 --- a/Sources/arm/util/UVUtil.hx +++ b/Sources/arm/util/UVUtil.hx @@ -19,7 +19,6 @@ class UVUtil { uvmapCached = true; var merged = UITrait.inst.mergedObject != null ? UITrait.inst.mergedObject.data.raw : UITrait.inst.paintObject.data.raw; - // var mesh = UITrait.inst.maskHandle.position == 0 ? merged : UITrait.inst.paintObject.data.raw; var mesh = merged; var texa = mesh.vertex_arrays[2].values; var inda = mesh.index_arrays[0].values; @@ -51,7 +50,6 @@ class UVUtil { trianglemapCached = true; var merged = UITrait.inst.mergedObject != null ? UITrait.inst.mergedObject.data.raw : UITrait.inst.paintObject.data.raw; - // var mesh = UITrait.inst.maskHandle.position == 0 ? merged : UITrait.inst.paintObject.data.raw; var mesh = merged; var texa = mesh.vertex_arrays[2].values; var inda = mesh.index_arrays[0].values;