diff --git a/addons/godot_rl_agents/controller/ai_controller.gd b/addons/godot_rl_agents/controller/ai_controller.gd new file mode 100644 index 0000000000000000000000000000000000000000..7a809efc8b43e461aa0d3dd0ce7d971cfd5d245a --- /dev/null +++ b/addons/godot_rl_agents/controller/ai_controller.gd @@ -0,0 +1,77 @@ +extends Node +class_name AIController + +# ------------------ Godot RL Agents Logic ------------------------------------# +@export var reset_after := 1000 + +var heuristic := "human" +var done := false +var reward := 0.0 +var n_steps := 0 + +var needs_reset := false + +func _ready(): + add_to_group("AGENT") + +#-- Methods that need implementing using the "extend script" option in Godot --# +func get_obs() -> Dictionary: + assert(false, "the get_obs method is not implemented when extending from ai_controller") + return {"obs":[]} + +func get_reward() -> float: + assert(false, "the get_reward method is not implemented when extending from ai_controller") + return 0.0 + +func get_action_space() -> Dictionary: + assert(false, "the get get_action_space method is not implemented when extending from ai_controller") + return { + "example_actions_continous" : { + "size": 2, + "action_type": "continuous" + }, + "example_actions_discrete" : { + "size": 2, + "action_type": "discrete" + }, + } + +func set_action(action) -> void: + assert(false, "the get set_action method is not implemented when extending from ai_controller") +# -----------------------------------------------------------------------------# + +func _physics_process(delta): + n_steps += 1 + if n_steps > reset_after: + needs_reset = true + +func get_obs_space(): + # may need overriding if the obs space is complex + var obs = get_obs() + return { + "obs": { + "size": [len(obs["obs"])], + "space": "box" + }, + } + +func reset(): + n_steps = 0 + needs_reset = false + +func reset_if_done(): + if done: + reset() + +func set_heuristic(h): + # sets the heuristic from "human" or "model" nothing to change here + heuristic = h + +func get_done(): + return done + +func set_done_false(): + done = false + +func zero_reward(): + reward = 0.0 diff --git a/addons/godot_rl_agents/controller/ai_controller_2d.gd b/addons/godot_rl_agents/controller/ai_controller_2d.gd new file mode 100644 index 0000000000000000000000000000000000000000..687f5b03cc731fbfad7cc7a602d523305a947237 --- /dev/null +++ b/addons/godot_rl_agents/controller/ai_controller_2d.gd @@ -0,0 +1,8 @@ +extends AIController +class_name AIController2D + +# ------------------ Godot RL Agents Logic ------------------------------------# +var _player: Node2D + +func init(player: Node2D): + _player = player diff --git a/addons/godot_rl_agents/controller/ai_controller_3d.gd b/addons/godot_rl_agents/controller/ai_controller_3d.gd new file mode 100644 index 0000000000000000000000000000000000000000..dcbc2e010c3556f6343ddced55ff40bdda1240df --- /dev/null +++ b/addons/godot_rl_agents/controller/ai_controller_3d.gd @@ -0,0 +1,8 @@ +extends AIController +class_name AIController3D + +# ------------------ Godot RL Agents Logic ------------------------------------# +var _player: Node3D + +func init(player: Node3D): + _player = player diff --git a/addons/godot_rl_agents/icon.png.import b/addons/godot_rl_agents/icon.png.import index 6c33bd296f474632713c07abf48826f3aabc8407..7baa499fee2a19540b993c8b328d78d32e7bd450 100644 --- a/addons/godot_rl_agents/icon.png.import +++ b/addons/godot_rl_agents/icon.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b7lwg3uk8v3pr" +uid="uid://dn7mfntm1bfv4" path="res://.godot/imported/icon.png-45a871b53434e556222f5901d598ab34.ctex" metadata={ "vram_texture": false @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.png-45a871b53434e556222f5901d598ab34.cte [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/addons/godot_rl_agents/onnx/csharp/ONNXInference.cs b/addons/godot_rl_agents/onnx/csharp/ONNXInference.cs new file mode 100644 index 0000000000000000000000000000000000000000..936abca5edbc35fd57a67933cd6ee72167cd0cd4 --- /dev/null +++ b/addons/godot_rl_agents/onnx/csharp/ONNXInference.cs @@ -0,0 +1,93 @@ +using Godot; +using System.Collections.Generic; +using System.Linq; +using Microsoft.ML.OnnxRuntime; +using Microsoft.ML.OnnxRuntime.Tensors; + +namespace GodotONNX{ + /// + public partial class ONNXInference : Node +{ + + private InferenceSession session; + /// + /// Path to the ONNX model. Use Initialize to change it. + /// + private string modelPath; + private int batchSize; + + private SessionOptions SessionOpt; + + //init function +/// + public void Initialize(string Path, int BatchSize) + { + modelPath = Path; + batchSize = BatchSize; + SessionConfigurator.SystemCheck(); + SessionOpt = SessionConfigurator.GetSessionOptions(); + session = LoadModel(modelPath); + + } +/// + public Godot.Collections.Dictionary> RunInference(Godot.Collections.Array obs, int state_ins) + { + //Current model: Any (Godot Rl Agents) + //Expects a tensor of shape [batch_size, input_size] type float named obs and a tensor of shape [batch_size] type float named state_ins + + //Fill the input tensors + // create span from inputSize + var span = new float[obs.Count]; //There's probably a better way to do this + for (int i = 0; i < obs.Count; i++) + { + span[i] = obs[i]; + } + + IReadOnlyCollection inputs = new List + { + NamedOnnxValue.CreateFromTensor("obs", new DenseTensor(span, new int[] { batchSize, obs.Count })), + NamedOnnxValue.CreateFromTensor("state_ins", new DenseTensor(new float[] { state_ins }, new int[] { batchSize })) + }; + IReadOnlyCollection outputNames = new List { "output", "state_outs" }; //ONNX is sensible to these names, as well as the input names + + IDisposableReadOnlyCollection results; + + try{ + results = session.Run(inputs, outputNames); + } + catch (OnnxRuntimeException e) { + //This error usually means that the model is not compatible with the input, beacause of the input shape (size) + GD.Print("Error at inference: ", e); + return null; + } + //Can't convert IEnumerable to Variant, so we have to convert it to an array or something + Godot.Collections.Dictionary> output = new Godot.Collections.Dictionary>(); + DisposableNamedOnnxValue output1 = results.First(); + DisposableNamedOnnxValue output2 = results.Last(); + Godot.Collections.Array output1Array = new Godot.Collections.Array(); + Godot.Collections.Array output2Array = new Godot.Collections.Array(); + + foreach (float f in output1.AsEnumerable()) { + output1Array.Add(f); + } + + foreach (float f in output2.AsEnumerable()) { + output2Array.Add(f); + } + + output.Add(output1.Name, output1Array); + output.Add(output2.Name, output2Array); + + //Output is a dictionary of arrays, ex: { "output" : [0.1, 0.2, 0.3, 0.4, ...], "state_outs" : [0.5, ...]} + return output; + } +/// + public InferenceSession LoadModel(string Path) + { + Godot.FileAccess file = FileAccess.Open(Path, Godot.FileAccess.ModeFlags.Read); + byte[] model = file.GetBuffer((int)file.GetLength()); + file.Close(); + return new InferenceSession(model, SessionOpt); //Load the model + } + } +} diff --git a/addons/godot_rl_agents/onnx/csharp/SessionConfigurator.cs b/addons/godot_rl_agents/onnx/csharp/SessionConfigurator.cs new file mode 100644 index 0000000000000000000000000000000000000000..d83950fa9d7b8970a0c1be690aa546bdfd8e86f3 --- /dev/null +++ b/addons/godot_rl_agents/onnx/csharp/SessionConfigurator.cs @@ -0,0 +1,106 @@ +using Godot; +using Microsoft.ML.OnnxRuntime; + +namespace GodotONNX{ +/// + + public static class SessionConfigurator { + + private static SessionOptions options = new SessionOptions(); + +/// + public static SessionOptions GetSessionOptions() { + options = new SessionOptions(); + options.LogSeverityLevel = OrtLoggingLevel.ORT_LOGGING_LEVEL_WARNING; + // see warnings + SystemCheck(); + return options; + } +/// + +static public void SystemCheck() + { + //Most code for this function is verbose only, the only reason it exists is to track + //implementation progress of the different compute APIs. + + //December 2022: CUDA is not working. + + string OSName = OS.GetName(); //Get OS Name + int ComputeAPIID = ComputeCheck(); //Get Compute API + //TODO: Get CPU architecture + + //Linux can use OpenVINO (C#) on x64 and ROCm on x86 (GDNative/C++) + //Windows can use OpenVINO (C#) on x64 + //TODO: try TensorRT instead of CUDA + //TODO: Use OpenVINO for Intel Graphics + + string [] ComputeNames = {"CUDA", "DirectML/ROCm", "DirectML", "CoreML", "CPU"}; + //match OS and Compute API + options.AppendExecutionProvider_CPU(0); // Always use CPU + GD.Print("OS: " + OSName, " | Compute API: " + ComputeNames[ComputeAPIID]); + + switch (OSName) + { + case "Windows": //Can use CUDA, DirectML + if (ComputeAPIID == 0) + { + //CUDA + //options.AppendExecutionProvider_CUDA(0); + options.AppendExecutionProvider_DML(0); + } + else if (ComputeAPIID == 1) + { + //DirectML + options.AppendExecutionProvider_DML(0); + } + break; + case "X11": //Can use CUDA, ROCm + if (ComputeAPIID == 0) + { + //CUDA + //options.AppendExecutionProvider_CUDA(0); + } + if (ComputeAPIID == 1) + { + //ROCm, only works on x86 + //Research indicates that this has to be compiled as a GDNative plugin + GD.Print("ROCm not supported yet, using CPU."); + options.AppendExecutionProvider_CPU(0); + } + + break; + case "OSX": //Can use CoreML + if (ComputeAPIID == 0) { //CoreML + //TODO: Needs testing + options.AppendExecutionProvider_CoreML(0); + //CoreML on ARM64, out of the box, on x64 needs .tar file from GitHub + } + break; + default: + GD.Print("OS not Supported."); + break; + } + } +/// + + public static int ComputeCheck() + { + string adapterName = Godot.RenderingServer.GetVideoAdapterName(); + //string adapterVendor = Godot.RenderingServer.GetVideoAdapterVendor(); + adapterName = adapterName.ToUpper(new System.Globalization.CultureInfo("")); + //TODO: GPU vendors for MacOS, what do they even use these days? + if (adapterName.Contains("INTEL")) { + //Return 2, should use DirectML only + return 2;} + if (adapterName.Contains("AMD")) { + //Return 1, should use DirectML, check later for ROCm + return 1;} + if (adapterName.Contains("NVIDIA")){ + //Return 0, should use CUDA + return 0;} + + GD.Print("Graphics Card not recognized."); //Return -1, should use CPU + return -1; + } + } +} diff --git a/addons/godot_rl_agents/onnx/csharp/docs/ONNXInference.xml b/addons/godot_rl_agents/onnx/csharp/docs/ONNXInference.xml new file mode 100644 index 0000000000000000000000000000000000000000..91b07d607dc89f11e957e13758d8c0ee4fb72be8 --- /dev/null +++ b/addons/godot_rl_agents/onnx/csharp/docs/ONNXInference.xml @@ -0,0 +1,31 @@ + + + + + The main ONNXInference Class that handles the inference process. + + + + + Starts the inference process. + + Path to the ONNX model, expects a path inside resources. + How many observations will the model recieve. + + + + Runs the given input through the model and returns the output. + + Dictionary containing all observations. + How many different agents are creating these observations. + A Dictionary of arrays, containing instructions based on the observations. + + + + Loads the given model into the inference process, using the best Execution provider available. + + Path to the ONNX model, expects a path inside resources. + InferenceSession ready to run. + + + \ No newline at end of file diff --git a/addons/godot_rl_agents/onnx/csharp/docs/SessionConfigurator.xml b/addons/godot_rl_agents/onnx/csharp/docs/SessionConfigurator.xml new file mode 100644 index 0000000000000000000000000000000000000000..f160c02f0d4cab92e10f799b6f4c5a71d4d6c0f2 --- /dev/null +++ b/addons/godot_rl_agents/onnx/csharp/docs/SessionConfigurator.xml @@ -0,0 +1,29 @@ + + + + + The main SessionConfigurator Class that handles the execution options and providers for the inference process. + + + + + Creates a SessionOptions with all available execution providers. + + SessionOptions with all available execution providers. + + + + Appends any execution provider available in the current system. + + + This function is mainly verbose for tracking implementation progress of different compute APIs. + + + + + Checks for available GPUs. + + An integer identifier for each compute platform. + + + \ No newline at end of file diff --git a/addons/godot_rl_agents/onnx/wrapper/ONNX_wrapper.gd b/addons/godot_rl_agents/onnx/wrapper/ONNX_wrapper.gd new file mode 100644 index 0000000000000000000000000000000000000000..54b317ebeb94aa89e0684117ae144c38908ee57d --- /dev/null +++ b/addons/godot_rl_agents/onnx/wrapper/ONNX_wrapper.gd @@ -0,0 +1,19 @@ +extends Node +class_name ONNXModel +var inferencer_script = load("res://addons/godot_rl_agents/onnx/csharp/ONNXInference.cs") + +var inferencer = null + +# Must provide the path to the model and the batch size +func _init(model_path, batch_size): + inferencer = inferencer_script.new() + inferencer.Initialize(model_path, batch_size) + +# This function is the one that will be called from the game, +# requires the observation as an array and the state_ins as an int +# returns an Array containing the action the model takes. +func run_inference(obs : Array, state_ins : int) -> Dictionary: + if inferencer == null: + printerr("Inferencer not initialized") + return {} + return inferencer.RunInference(obs, state_ins) diff --git a/addons/godot_rl_agents/sensors/sensors_2d/ExampleRaycastSensor2D.tscn b/addons/godot_rl_agents/sensors/sensors_2d/ExampleRaycastSensor2D.tscn index 1cbc7e81569cb8805a57b464ec128de57362035d..66be9285d15d0559f7816f900ab6a57f8c88e980 100644 --- a/addons/godot_rl_agents/sensors/sensors_2d/ExampleRaycastSensor2D.tscn +++ b/addons/godot_rl_agents/sensors/sensors_2d/ExampleRaycastSensor2D.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=5 format=3 uid="uid://ddeq7mn1ealyc"] -[ext_resource path="res://sensors/sensors_2d/RaycastSensor2D.gd" type="Script" id=1] +[ext_resource type="Script" path="res://sensors/sensors_2d/RaycastSensor2D.gd" id="1"] -[sub_resource type="GDScript" id=2] +[sub_resource type="GDScript" id="2"] script/source = "extends Node2D @@ -12,7 +12,7 @@ func _physics_process(delta: float) -> void: " -[sub_resource type="GDScript" id=1] +[sub_resource type="GDScript" id="1"] script/source = "extends RayCast2D var steps = 1 @@ -26,23 +26,23 @@ func _physics_process(delta: float) -> void: print(is_colliding()) " -[sub_resource type="CircleShape2D" id=3] +[sub_resource type="CircleShape2D" id="3"] [node name="ExampleRaycastSensor2D" type="Node2D"] -script = SubResource( 2 ) +script = SubResource("2") [node name="ExampleAgent" type="Node2D" parent="."] -position = Vector2( 573, 314 ) +position = Vector2(573, 314) rotation = 0.286234 [node name="RaycastSensor2D" type="Node2D" parent="ExampleAgent"] -script = ExtResource( 1 ) +script = ExtResource("1") [node name="TestRayCast2D" type="RayCast2D" parent="."] -script = SubResource( 1 ) +script = SubResource("1") [node name="StaticBody2D" type="StaticBody2D" parent="."] -position = Vector2( 1, 52 ) +position = Vector2(1, 52) [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] -shape = SubResource( 3 ) +shape = SubResource("3") diff --git a/addons/godot_rl_agents/sensors/sensors_2d/ISensor2D.gd b/addons/godot_rl_agents/sensors/sensors_2d/ISensor2D.gd index fcdfa8d5d2f664a5e0155eb8e71b45fedc8ce7fc..ec20f08a8d37cf1232fc12d8ee4f23b5ba845602 100644 --- a/addons/godot_rl_agents/sensors/sensors_2d/ISensor2D.gd +++ b/addons/godot_rl_agents/sensors/sensors_2d/ISensor2D.gd @@ -1,7 +1,7 @@ extends Node2D class_name ISensor2D -var _obs : Array +var _obs : Array = [] var _active := false func get_observation(): diff --git a/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.gd b/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.gd index 25855ffd2ea44d9d8ad384fd8462f0f070ef96e8..09363c409f59b0ef1d68131b77c0a2cba71805d8 100644 --- a/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.gd +++ b/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.gd @@ -1,6 +1,24 @@ +@tool extends ISensor2D class_name RaycastSensor2D -@tool + +@export_flags_2d_physics var collision_mask := 1: + get: return collision_mask + set(value): + collision_mask = value + _update() + +@export var collide_with_areas := false: + get: return collide_with_areas + set(value): + collide_with_areas = value + _update() + +@export var collide_with_bodies := true: + get: return collide_with_bodies + set(value): + collide_with_bodies = value + _update() @export var n_rays := 16.0: get: return n_rays @@ -8,18 +26,18 @@ class_name RaycastSensor2D n_rays = value _update() -@export var ray_length := 200:# (float,5,200,5.0) +@export_range(5,200,5.0) var ray_length := 200: get: return ray_length set(value): ray_length = value _update() -@export var cone_width := 360.0:# (float,5,360,5.0) +@export_range(5,360,5.0) var cone_width := 360.0: get: return cone_width set(value): cone_width = value _update() -@export var debug_draw := false : +@export var debug_draw := true : get: return debug_draw set(value): debug_draw = value @@ -31,12 +49,16 @@ var rays := [] func _update(): if Engine.is_editor_hint(): - _spawn_nodes() + if debug_draw: + _spawn_nodes() + else: + for ray in get_children(): + if ray is RayCast2D: + remove_child(ray) func _ready() -> void: _spawn_nodes() - func _spawn_nodes(): for ray in rays: ray.queue_free() @@ -55,7 +77,9 @@ func _spawn_nodes(): )) ray.set_name("node_"+str(i)) ray.enabled = true - ray.collide_with_areas = true + ray.collide_with_areas = collide_with_areas + ray.collide_with_bodies = collide_with_bodies + ray.collision_mask = collision_mask add_child(ray) rays.append(ray) diff --git a/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.tscn b/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.tscn index e4818d542146f1060303e130dc47d0856036423c..5ca402c08305efedbfc6afd0a1893a0ca2e11cfd 100644 --- a/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.tscn +++ b/addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=2 format=3 uid="uid://drvfihk5esgmv"] -[ext_resource path="res://addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.gd" type="Script" id=1] +[ext_resource type="Script" path="res://addons/godot_rl_agents/sensors/sensors_2d/RaycastSensor2D.gd" id="1"] [node name="RaycastSensor2D" type="Node2D"] -script = ExtResource( 1 ) +script = ExtResource("1") +n_rays = 17.0 diff --git a/addons/godot_rl_agents/sensors/sensors_3d/ISensor3D.gd b/addons/godot_rl_agents/sensors/sensors_3d/ISensor3D.gd index ce361b192d1f6073a0c324118d4896cc26dc1cbc..d57503b5006e9384c4a9ce7de348d74a5b58d322 100644 --- a/addons/godot_rl_agents/sensors/sensors_3d/ISensor3D.gd +++ b/addons/godot_rl_agents/sensors/sensors_3d/ISensor3D.gd @@ -1,7 +1,7 @@ extends Node3D class_name ISensor3D -var _obs : Array +var _obs : Array = [] var _active := false func get_observation(): diff --git a/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.gd b/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.gd index 69049a535c9314b3332392bc1cc8474510ae240c..1f36193ae7aeb4431032425669a6d01e2825a9d0 100644 --- a/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.gd +++ b/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.gd @@ -1,6 +1,6 @@ +@tool extends ISensor3D class_name RayCastSensor3D -@tool @export_flags_3d_physics var collision_mask = 1: get: return collision_mask set(value): @@ -10,7 +10,7 @@ class_name RayCastSensor3D get: return boolean_class_mask set(value): boolean_class_mask = value - _update() + _update() @export var n_rays_width := 6.0: get: return n_rays_width @@ -42,18 +42,18 @@ class_name RayCastSensor3D cone_height = value _update() -@export var collide_with_bodies := true: - get: return collide_with_bodies - set(value): - collide_with_bodies = value - _update() - @export var collide_with_areas := false: get: return collide_with_areas set(value): collide_with_areas = value _update() +@export var collide_with_bodies := true: + get: return collide_with_bodies + set(value): + collide_with_bodies = value + _update() + @export var class_sensor := false var rays := [] diff --git a/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.tscn b/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.tscn index af81ce143500c606c30ecce6d127d0fbbdd4963f..39aa7c645d3a093cdd02408a62cfac507949ded7 100644 --- a/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.tscn +++ b/addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.tscn @@ -1,49 +1,33 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=2 format=3 uid="uid://b803cbh1fmy66"] -[ext_resource path="res://addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.gd" type="Script" id=1] +[ext_resource type="Script" path="res://addons/godot_rl_agents/sensors/sensors_3d/RaycastSensor3D.gd" id="1"] [node name="RaycastSensor3D" type="Node3D"] -script = ExtResource( 1 ) +script = ExtResource("1") n_rays_width = 4.0 n_rays_height = 2.0 ray_length = 11.0 -[node name="node_0 2" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( -4.06608, -2.84701, 9.81639 ) -collide_with_areas = true - -[node name="node_0 3" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( -4.06608, 2.84701, 9.81639 ) -collide_with_areas = true - -[node name="node_1 0" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( -1.38686, -2.84701, 10.5343 ) -collide_with_areas = true - -[node name="node_1 1" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( -1.38686, 2.84701, 10.5343 ) -collide_with_areas = true - -[node name="node_2 0" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( 1.38686, -2.84701, 10.5343 ) -collide_with_areas = true - -[node name="node_2 1" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( 1.38686, 2.84701, 10.5343 ) -collide_with_areas = true - -[node name="node_3 0" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( 4.06608, -2.84701, 9.81639 ) -collide_with_areas = true - -[node name="node_3 1" type="RayCast3D" parent="."] -enabled = true -cast_to = Vector3( 4.06608, 2.84701, 9.81639 ) -collide_with_areas = true +[node name="@node_0 0@18991" type="RayCast3D" parent="."] +target_position = Vector3(-4.06608, -2.84701, 9.81639) + +[node name="node_0 1" type="RayCast3D" parent="."] +target_position = Vector3(-4.06608, 2.84701, 9.81639) + +[node name="@node_1 0@18992" type="RayCast3D" parent="."] +target_position = Vector3(-1.38686, -2.84701, 10.5343) + +[node name="@node_1 1@18993" type="RayCast3D" parent="."] +target_position = Vector3(-1.38686, 2.84701, 10.5343) + +[node name="@node_2 0@18994" type="RayCast3D" parent="."] +target_position = Vector3(1.38686, -2.84701, 10.5343) + +[node name="@node_2 1@18995" type="RayCast3D" parent="."] +target_position = Vector3(1.38686, 2.84701, 10.5343) + +[node name="@node_3 0@18996" type="RayCast3D" parent="."] +target_position = Vector3(4.06608, -2.84701, 9.81639) + +[node name="@node_3 1@18997" type="RayCast3D" parent="."] +target_position = Vector3(4.06608, 2.84701, 9.81639) diff --git a/addons/godot_rl_agents/sync.gd b/addons/godot_rl_agents/sync.gd index cd4f268f80fd3ad45cef902e4fa3fcd57484db47..a497894631d7d38f1544a5b2aa04991db0cbf50b 100644 --- a/addons/godot_rl_agents/sync.gd +++ b/addons/godot_rl_agents/sync.gd @@ -2,7 +2,9 @@ extends Node # --fixed-fps 2000 --disable-render-loop @export var action_repeat := 8 @export var speed_up = 1 -var n_action_steps = 0 +@export var onnx_model_path := "" + +@onready var start_time = Time.get_ticks_msec() const MAJOR_VERSION := "0" const MINOR_VERSION := "3" @@ -16,21 +18,122 @@ var should_connect = true var agents var need_to_send_obs = false var args = null -@onready var start_time = Time.get_ticks_msec() var initialized = false var just_reset = false +var onnx_model = null +var n_action_steps = 0 +var _action_space : Dictionary +var _obs_space : Dictionary # Called when the node enters the scene tree for the first time. func _ready(): - await get_tree().root.ready get_tree().set_pause(true) _initialize() await get_tree().create_timer(1.0).timeout get_tree().set_pause(false) + +func _initialize(): + _get_agents() + _obs_space = agents[0].get_obs_space() + _action_space = agents[0].get_action_space() + args = _get_args() + Engine.physics_ticks_per_second = _get_speedup() * 60 # Replace with function body. + Engine.time_scale = _get_speedup() * 1.0 + prints("physics ticks", Engine.physics_ticks_per_second, Engine.time_scale, _get_speedup(), speed_up) + + + connected = connect_to_server() + if connected: + _set_heuristic("model") + _handshake() + _send_env_info() + elif onnx_model_path != "": + onnx_model = ONNXModel.new(onnx_model_path, 1) + _set_heuristic("model") + else: + _set_heuristic("human") + + _set_seed() + _set_action_repeat() + initialized = true + +func _physics_process(delta): + # two modes, human control, agent control + # pause tree, send obs, get actions, set actions, unpause tree + if n_action_steps % action_repeat != 0: + n_action_steps += 1 + return + + n_action_steps += 1 + + if connected: + get_tree().set_pause(true) + + if just_reset: + just_reset = false + var obs = _get_obs_from_agents() + + var reply = { + "type": "reset", + "obs": obs + } + _send_dict_as_json_message(reply) + # this should go straight to getting the action and setting it checked the agent, no need to perform one phyics tick + get_tree().set_pause(false) + return + + if need_to_send_obs: + need_to_send_obs = false + var reward = _get_reward_from_agents() + var done = _get_done_from_agents() + #_reset_agents_if_done() # this ensures the new observation is from the next env instance : NEEDS REFACTOR + + var obs = _get_obs_from_agents() + + var reply = { + "type": "step", + "obs": obs, + "reward": reward, + "done": done + } + _send_dict_as_json_message(reply) + + var handled = handle_message() + + elif onnx_model != null: + var obs : Array = _get_obs_from_agents() + + var actions = [] + for o in obs: + var action = onnx_model.run_inference(o["obs"], 1.0) + action["output"] = clamp_array(action["output"], -1.0, 1.0) + var action_dict = _extract_action_dict(action["output"]) + actions.append(action_dict) + + _set_agent_actions(actions) + need_to_send_obs = true + get_tree().set_pause(false) + _reset_agents_if_done() + else: + _reset_agents_if_done() + +func _extract_action_dict(action_array: Array): + var index = 0 + var result = {} + for key in _action_space.keys(): + var size = _action_space[key]["size"] + if _action_space[key]["action_type"] == "discrete": + result[key] = round(action_array[index]) + else: + result[key] = action_array.slice(index,index+size) + index += size + + return result + func _get_agents(): agents = get_tree().get_nodes_in_group("AGENT") @@ -75,17 +178,16 @@ func _send_dict_as_json_message(dict): func _send_env_info(): var json_dict = _get_dict_json_message() assert(json_dict["type"] == "env_info") - + + var message = { "type" : "env_info", - #"obs_size": agents[0].get_obs_size(), - "observation_space": agents[0].get_obs_space(), - "action_space":agents[0].get_action_space(), + "observation_space": _obs_space, + "action_space":_action_space, "n_agents": len(agents) } _send_dict_as_json_message(message) - func connect_to_server(): print("Waiting for one second to allow server to start") OS.delay_msec(1000) @@ -98,17 +200,13 @@ func connect_to_server(): var connect = stream.connect_to_host(ip, port) stream.set_no_delay(true) # TODO check if this improves performance or not stream.poll() + # Fetch the status until it is either connected (2) or failed to connect (3) + while stream.get_status() < 2: + stream.poll() return stream.get_status() == 2 func _get_args(): print("getting command line arguments") -# var arguments = {} -# for argument in OS.get_cmdline_args(): -# # Parse valid command-line arguments into a dictionary -# if argument.find("=") > -1: -# var key_value = argument.split("=") -# arguments[key_value[0].lstrip("--")] = key_value[1] - var arguments = {} for argument in OS.get_cmdline_args(): print(argument) @@ -139,70 +237,7 @@ func _set_action_repeat(): func disconnect_from_server(): stream.disconnect_from_host() -func _initialize(): - _get_agents() - - args = _get_args() - Engine.physics_ticks_per_second = _get_speedup() * 60 # Replace with function body. - Engine.time_scale = _get_speedup() * 1.0 - prints("physics ticks", Engine.physics_ticks_per_second, Engine.time_scale, _get_speedup(), speed_up) - - connected = connect_to_server() - if connected: - _set_heuristic("model") - _handshake() - _send_env_info() - else: - _set_heuristic("human") - - _set_seed() - _set_action_repeat() - initialized = true - -func _physics_process(delta): - # two modes, human control, agent control - # pause tree, send obs, get actions, set actions, unpause tree - if n_action_steps % action_repeat != 0: - n_action_steps += 1 - return - n_action_steps += 1 - - if connected: - get_tree().set_pause(true) - - if just_reset: - just_reset = false - var obs = _get_obs_from_agents() - - var reply = { - "type": "reset", - "obs": obs - } - _send_dict_as_json_message(reply) - # this should go straight to getting the action and setting it checked the agent, no need to perform one phyics tick - get_tree().set_pause(false) - return - - if need_to_send_obs: - need_to_send_obs = false - var reward = _get_reward_from_agents() - var done = _get_done_from_agents() - #_reset_agents_if_done() # this ensures the new observation is from the next env instance : NEEDS REFACTOR - - var obs = _get_obs_from_agents() - - var reply = { - "type": "step", - "obs": obs, - "reward": reward, - "done": done - } - _send_dict_as_json_message(reply) - - var handled = handle_message() - else: - _reset_agents_if_done() func handle_message() -> bool: # get json message: reset, step, close @@ -272,6 +307,7 @@ func _get_obs_from_agents(): var obs = [] for agent in agents: obs.append(agent.get_obs()) + return obs func _get_reward_from_agents(): @@ -293,3 +329,8 @@ func _set_agent_actions(actions): for i in range(len(actions)): agents[i].set_action(actions[i]) +func clamp_array(arr : Array, min:float, max:float): + var output : Array = [] + for a in arr: + output.append(clamp(a, min, max)) + return output diff --git a/assets/prototype_textures/PNG/Dark/texture_01.png.import b/assets/prototype_textures/PNG/Dark/texture_01.png.import index cb5c555bd08a38443dff4357e9753d5813f0ada0..f388e532ba000722d19f80e1ec333f8265b9c851 100644 --- a/assets/prototype_textures/PNG/Dark/texture_01.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_01.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://c780rrvs38fx4" path.s3tc="res://.godot/imported/texture_01.png-9288b996c66c7a4aa795297ca1c38041.s3tc.ctex" -path.etc2="res://.godot/imported/texture_01.png-9288b996c66c7a4aa795297ca1c38041.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Dark/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-9288b996c66c7a4aa795297ca1c38041.s3tc.ctex", "res://.godot/imported/texture_01.png-9288b996c66c7a4aa795297ca1c38041.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-9288b996c66c7a4aa795297ca1c38041.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Dark/texture_02.png.import b/assets/prototype_textures/PNG/Dark/texture_02.png.import index 3ece2ac31b1153704c032b930bd5159269e65fea..3a992b3d15ce543f8e049a84f1f439982de22391 100644 --- a/assets/prototype_textures/PNG/Dark/texture_02.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_02.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://cfbeqr5564bfi" path.s3tc="res://.godot/imported/texture_02.png-961fb5d1929755d100a63670dcfaa728.s3tc.ctex" -path.etc2="res://.godot/imported/texture_02.png-961fb5d1929755d100a63670dcfaa728.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Dark/texture_02.png" -dest_files=["res://.godot/imported/texture_02.png-961fb5d1929755d100a63670dcfaa728.s3tc.ctex", "res://.godot/imported/texture_02.png-961fb5d1929755d100a63670dcfaa728.etc2.ctex"] +dest_files=["res://.godot/imported/texture_02.png-961fb5d1929755d100a63670dcfaa728.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Dark/texture_03.png.import b/assets/prototype_textures/PNG/Dark/texture_03.png.import index f94c3c7c99a5b1281528178248bf84db2948241c..2e4b40ed56518452516873e4ee03b1401d9a8c53 100644 --- a/assets/prototype_textures/PNG/Dark/texture_03.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_03.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_03.png-4eec8b1f1b5b0eef9e5344a9ae1ebe [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_04.png.import b/assets/prototype_textures/PNG/Dark/texture_04.png.import index b3247c0f33f8c98ade00837c9ec57e13e5e7ca92..427e772a50b5e1f2cb815b5c310bc33486d20fc2 100644 --- a/assets/prototype_textures/PNG/Dark/texture_04.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_04.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_04.png-641cce467f86396907d64ffc921e65 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_05.png.import b/assets/prototype_textures/PNG/Dark/texture_05.png.import index f8d35234b1d77b4a98aff514f664318402b34354..b872b79b043cb41237b076fc2816e0f5d500dec2 100644 --- a/assets/prototype_textures/PNG/Dark/texture_05.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_05.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_05.png-ef9f5c1ac4f27bc83c1de514266cda [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_06.png.import b/assets/prototype_textures/PNG/Dark/texture_06.png.import index 78fcc7aa6f0417d53dfdfadd4fa817a5c05183e0..42c64a6abc2a316331af88f65c865e9078430f37 100644 --- a/assets/prototype_textures/PNG/Dark/texture_06.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_06.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_06.png-99de5370a7f84ba435294d2ef658ae [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_07.png.import b/assets/prototype_textures/PNG/Dark/texture_07.png.import index 657b82203eac0e649bea39ca842e762c6c677a6d..cc53cccf767c49e3d387a5d630c02ad6fde7c9a6 100644 --- a/assets/prototype_textures/PNG/Dark/texture_07.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_07.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_07.png-87ecaa7ce09469412121f2c52b35ef [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_08.png.import b/assets/prototype_textures/PNG/Dark/texture_08.png.import index 2b4253bdae49663525c66c8e692249837a09e0be..769bbad504dcdda6784b1a5693e46d19a610780e 100644 --- a/assets/prototype_textures/PNG/Dark/texture_08.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_08.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_08.png-29d5a5cba9c94188ffb6996cb6658e [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_09.png.import b/assets/prototype_textures/PNG/Dark/texture_09.png.import index e6ed2ef99183f6eef84489cab7d06c85cf29d806..a566ed674ed46c7341f40d5c9843f0da759fbf26 100644 --- a/assets/prototype_textures/PNG/Dark/texture_09.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_09.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_09.png-6618fe840779bed9268ec394b38302 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_10.png.import b/assets/prototype_textures/PNG/Dark/texture_10.png.import index 1bd2b6e03a87287782097ea025a4bc0d5f3ca331..a8c672269c1b2b2fefa8ca382f104fd9f065f208 100644 --- a/assets/prototype_textures/PNG/Dark/texture_10.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_10.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_10.png-fd177dc9044d62d6a75fcbaf19a7ed [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_11.png.import b/assets/prototype_textures/PNG/Dark/texture_11.png.import index e525ad312665011b053569437bd22fe1821af38b..a2e41687a8f364c4df9c3d8b4bcb14f1c7d4f716 100644 --- a/assets/prototype_textures/PNG/Dark/texture_11.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_11.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_11.png-476f05cb21864def34565afc133e06 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_12.png.import b/assets/prototype_textures/PNG/Dark/texture_12.png.import index 1c6ac3c360e60ab666b8b710e69df17145611deb..26b5b3e881f0e8d4b18a6cdede4bcad692bfbdf4 100644 --- a/assets/prototype_textures/PNG/Dark/texture_12.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_12.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_12.png-7564079f33873d0e5ac53c6e1339ea [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Dark/texture_13.png.import b/assets/prototype_textures/PNG/Dark/texture_13.png.import index e51a0af3f0fa235ef741a88f835fa189bf9fdb3f..9e3a51213f2d252d0c963561587c66dc2ae0fd8e 100644 --- a/assets/prototype_textures/PNG/Dark/texture_13.png.import +++ b/assets/prototype_textures/PNG/Dark/texture_13.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://di5jhcrlhabm5" path.s3tc="res://.godot/imported/texture_13.png-ec42b6c8f97231221149893e21ac3c8a.s3tc.ctex" -path.etc2="res://.godot/imported/texture_13.png-ec42b6c8f97231221149893e21ac3c8a.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Dark/texture_13.png" -dest_files=["res://.godot/imported/texture_13.png-ec42b6c8f97231221149893e21ac3c8a.s3tc.ctex", "res://.godot/imported/texture_13.png-ec42b6c8f97231221149893e21ac3c8a.etc2.ctex"] +dest_files=["res://.godot/imported/texture_13.png-ec42b6c8f97231221149893e21ac3c8a.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Green/texture_01.png.import b/assets/prototype_textures/PNG/Green/texture_01.png.import index 701bfb626219ff3e7057bb91a243098c6b4d0366..8b91fa39683738f3daf7c982c8d49702e7cf6caf 100644 --- a/assets/prototype_textures/PNG/Green/texture_01.png.import +++ b/assets/prototype_textures/PNG/Green/texture_01.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://c2n22yubjk0do" path.s3tc="res://.godot/imported/texture_01.png-580d3f0b89ba3a32c34aa87a192138b5.s3tc.ctex" -path.etc2="res://.godot/imported/texture_01.png-580d3f0b89ba3a32c34aa87a192138b5.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Green/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-580d3f0b89ba3a32c34aa87a192138b5.s3tc.ctex", "res://.godot/imported/texture_01.png-580d3f0b89ba3a32c34aa87a192138b5.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-580d3f0b89ba3a32c34aa87a192138b5.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Green/texture_02.png.import b/assets/prototype_textures/PNG/Green/texture_02.png.import index ebd55e62c018c8ac4ee435ced6696e3c00f03ebc..e0a50bc5b049e7c460be401af89c5d483730b82e 100644 --- a/assets/prototype_textures/PNG/Green/texture_02.png.import +++ b/assets/prototype_textures/PNG/Green/texture_02.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_02.png-c3f518cbd68ae8ee877d386e82e237 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_03.png.import b/assets/prototype_textures/PNG/Green/texture_03.png.import index 066c12d029b608328a6141fb41886c9f9fd5b9ab..6ddc751904f0601c4f3fdf57dbe637770523f2fa 100644 --- a/assets/prototype_textures/PNG/Green/texture_03.png.import +++ b/assets/prototype_textures/PNG/Green/texture_03.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_03.png-c9d5aac27db0085aebd0b06588ecba [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_04.png.import b/assets/prototype_textures/PNG/Green/texture_04.png.import index fa3dc351e61267c38a0d7800ec2657e1e6ddd7fd..1223d0537866bb2f084610bc41990d5ab517e17d 100644 --- a/assets/prototype_textures/PNG/Green/texture_04.png.import +++ b/assets/prototype_textures/PNG/Green/texture_04.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_04.png-0bffb5625279b7207b1b9387fb19cb [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_05.png.import b/assets/prototype_textures/PNG/Green/texture_05.png.import index ef9150f8f1ce2a932748e66253488fce143975e8..732335a1a68476faea03c4a02d93afc2e6726cc3 100644 --- a/assets/prototype_textures/PNG/Green/texture_05.png.import +++ b/assets/prototype_textures/PNG/Green/texture_05.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_05.png-0b1f89637a9eaa77f4ca7db33e4d0a [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_06.png.import b/assets/prototype_textures/PNG/Green/texture_06.png.import index 34ff66dfa88b9d7d1ed9073f99cac15e513ca4b2..732e747a4d6786280367af0e717b147cc9a0bfca 100644 --- a/assets/prototype_textures/PNG/Green/texture_06.png.import +++ b/assets/prototype_textures/PNG/Green/texture_06.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_06.png-4a6dbd54ffdb1d9e1af91c8dbaf64d [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_07.png.import b/assets/prototype_textures/PNG/Green/texture_07.png.import index 8dee7445b817fd7af2f6add13f64768265b51ba3..2d63109696fa583908b5507037ada1c4923b29c3 100644 --- a/assets/prototype_textures/PNG/Green/texture_07.png.import +++ b/assets/prototype_textures/PNG/Green/texture_07.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_07.png-0aa54fd8f5c7d51d0bd463efae7f9e [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_08.png.import b/assets/prototype_textures/PNG/Green/texture_08.png.import index 7208502c379b34889ec72bfcde24a7f9dc0e87de..09c8cf56fdaa39d276756c0f21d9a66852918cab 100644 --- a/assets/prototype_textures/PNG/Green/texture_08.png.import +++ b/assets/prototype_textures/PNG/Green/texture_08.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_08.png-0e8744f3dafd43131ecd8fdb3b2866 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_09.png.import b/assets/prototype_textures/PNG/Green/texture_09.png.import index b946db8fe4c3f3903b913132755f9c508d9db121..adffcc4bc38285b0692859c372265cd9f3d4d44b 100644 --- a/assets/prototype_textures/PNG/Green/texture_09.png.import +++ b/assets/prototype_textures/PNG/Green/texture_09.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_09.png-3b8647f7ad0a12046a0a2d2796a7bb [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_10.png.import b/assets/prototype_textures/PNG/Green/texture_10.png.import index a429a14e80e857623d0b12cf8fa1d2217e5e3cd0..c3bed3cf285ebebbf638ec770a2d8f4f53b97cf1 100644 --- a/assets/prototype_textures/PNG/Green/texture_10.png.import +++ b/assets/prototype_textures/PNG/Green/texture_10.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_10.png-7d88f1cfbe1b76e56aec818c6010b3 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_11.png.import b/assets/prototype_textures/PNG/Green/texture_11.png.import index 50ba14f5809d06e26c3c3259a4d867cf499f4544..fb43787dbe63b36bafd9364db571be9812db4773 100644 --- a/assets/prototype_textures/PNG/Green/texture_11.png.import +++ b/assets/prototype_textures/PNG/Green/texture_11.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_11.png-c018ffd8fe74492c99a0bac077def6 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_12.png.import b/assets/prototype_textures/PNG/Green/texture_12.png.import index ddd1095fe6f138a3948c4e74c7f9d40117ac1e01..3fcae6c83d3b3233c719e6aa3f62d125589bfa7b 100644 --- a/assets/prototype_textures/PNG/Green/texture_12.png.import +++ b/assets/prototype_textures/PNG/Green/texture_12.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_12.png-f72840c034a9939c3753650010797c [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Green/texture_13.png.import b/assets/prototype_textures/PNG/Green/texture_13.png.import index 0b8be96d1465b85d95e9d206857ed49b23456053..636ed5486bf1ac9583ebb5e77779a8fd5d46f6b0 100644 --- a/assets/prototype_textures/PNG/Green/texture_13.png.import +++ b/assets/prototype_textures/PNG/Green/texture_13.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_13.png-6545624bb133fd60d9babec8bffce8 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_01.png.import b/assets/prototype_textures/PNG/Light/texture_01.png.import index 27c4d16a408ec11f83749e46c56cdc7163a0bcba..cfb9ce659f26b4e64e9dab74750fcbf62a032fa2 100644 --- a/assets/prototype_textures/PNG/Light/texture_01.png.import +++ b/assets/prototype_textures/PNG/Light/texture_01.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_01.png-ca4f3565f7b25d8f31ee3b3862f0df [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_02.png.import b/assets/prototype_textures/PNG/Light/texture_02.png.import index cd11d6667d3d756b1801db20f18eb5fb2015586a..128949b784c066547988117863cb1172de579851 100644 --- a/assets/prototype_textures/PNG/Light/texture_02.png.import +++ b/assets/prototype_textures/PNG/Light/texture_02.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_02.png-5fde245e9b00fae35e7c7fc572fdcb [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_03.png.import b/assets/prototype_textures/PNG/Light/texture_03.png.import index 5fa0fa5eaca24555b2f3d64a7b8b76834e063ffa..426e66a89969b7a9e9e6f7d2573c92cab0751d7b 100644 --- a/assets/prototype_textures/PNG/Light/texture_03.png.import +++ b/assets/prototype_textures/PNG/Light/texture_03.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_03.png-1db2fe44c6237c63fc8323098f4e88 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_04.png.import b/assets/prototype_textures/PNG/Light/texture_04.png.import index 94341f3e7f033aceaddd5febf4f4d0f888f8be10..06443e39de69f761632df320816ef5b4c2fd58fc 100644 --- a/assets/prototype_textures/PNG/Light/texture_04.png.import +++ b/assets/prototype_textures/PNG/Light/texture_04.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_04.png-4257daf5f6b6554af28095e2896d91 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_05.png.import b/assets/prototype_textures/PNG/Light/texture_05.png.import index ee280b6abcc00541f510437a4acb81c1064a3a01..907dc20def565ebdf4104fdfa60012b7f3f6729d 100644 --- a/assets/prototype_textures/PNG/Light/texture_05.png.import +++ b/assets/prototype_textures/PNG/Light/texture_05.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_05.png-76b41a3755d0083471bb0b0be49905 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_06.png.import b/assets/prototype_textures/PNG/Light/texture_06.png.import index 13403ffcac56e79b4098df8fbfe7a04704000b92..6874521d72ec86e1962b497a677f40d29db12e66 100644 --- a/assets/prototype_textures/PNG/Light/texture_06.png.import +++ b/assets/prototype_textures/PNG/Light/texture_06.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_06.png-ff3cf2fe834b7690f96be9f3e401ca [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_07.png.import b/assets/prototype_textures/PNG/Light/texture_07.png.import index aebb0b32149b0808b9b98b59c49193c62826a049..40c2c0e20f5c30202b5ad208c331edeee7b44ade 100644 --- a/assets/prototype_textures/PNG/Light/texture_07.png.import +++ b/assets/prototype_textures/PNG/Light/texture_07.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_07.png-c967ab6dcf74d4b80247b388e7c411 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_08.png.import b/assets/prototype_textures/PNG/Light/texture_08.png.import index e2e756b4b24a6970b09620b5e2d3f5a830ce28c8..546e6fa5a98ffdc7ccbaec1ae0df2cec3e24ae21 100644 --- a/assets/prototype_textures/PNG/Light/texture_08.png.import +++ b/assets/prototype_textures/PNG/Light/texture_08.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_08.png-e8fb4a795c2f853a9f4be287e5f290 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_09.png.import b/assets/prototype_textures/PNG/Light/texture_09.png.import index 51a2d759683567ef8058985e178698ac20e79f37..186c15297d8385bf0e88d5f404455d40c731dd31 100644 --- a/assets/prototype_textures/PNG/Light/texture_09.png.import +++ b/assets/prototype_textures/PNG/Light/texture_09.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_09.png-5367169d1626aafc085efbea467e09 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_10.png.import b/assets/prototype_textures/PNG/Light/texture_10.png.import index 700c4916aa43dacc7973470429ce0204e47a7f7c..83c2040c4142eb4bc6bb98b3c6c0dce026173c2d 100644 --- a/assets/prototype_textures/PNG/Light/texture_10.png.import +++ b/assets/prototype_textures/PNG/Light/texture_10.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_10.png-cdd31bdfa94c4ee80427e4ab17d1df [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_11.png.import b/assets/prototype_textures/PNG/Light/texture_11.png.import index 690650456a133052c88fb997f85ea55dfe3f7929..bf3aa26244d9cb7260f2781a8fc9c2038ed1d46d 100644 --- a/assets/prototype_textures/PNG/Light/texture_11.png.import +++ b/assets/prototype_textures/PNG/Light/texture_11.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_11.png-33b1d1dbfcd6a28bd1d3074ba513d0 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_12.png.import b/assets/prototype_textures/PNG/Light/texture_12.png.import index 6e2ed6ca6a5585ccad1edef5bde7c6f72f5b71e4..058ff203a5c3c62a3713ed94e4323cb298081592 100644 --- a/assets/prototype_textures/PNG/Light/texture_12.png.import +++ b/assets/prototype_textures/PNG/Light/texture_12.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_12.png-b94e1ed5f54d5cad7a2240a5b678ee [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Light/texture_13.png.import b/assets/prototype_textures/PNG/Light/texture_13.png.import index de176860565d1f02ebd3d203363821ba8a3206f2..8750e7938b2681450d3ee9241c49effbca46d022 100644 --- a/assets/prototype_textures/PNG/Light/texture_13.png.import +++ b/assets/prototype_textures/PNG/Light/texture_13.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_13.png-b58fd5a32286b1d293a010a2b62e4e [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_01.png.import b/assets/prototype_textures/PNG/Orange/texture_01.png.import index c1cbdc19556779d62a85fe0bcc46b1196df99c46..f7516657773fa955c3501fdab6a6ed8ae749c3de 100644 --- a/assets/prototype_textures/PNG/Orange/texture_01.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_01.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://svxprogaj6er" path.s3tc="res://.godot/imported/texture_01.png-8d1c4c97e06a5e4c95b70df527280925.s3tc.ctex" -path.etc2="res://.godot/imported/texture_01.png-8d1c4c97e06a5e4c95b70df527280925.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Orange/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-8d1c4c97e06a5e4c95b70df527280925.s3tc.ctex", "res://.godot/imported/texture_01.png-8d1c4c97e06a5e4c95b70df527280925.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-8d1c4c97e06a5e4c95b70df527280925.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Orange/texture_02.png.import b/assets/prototype_textures/PNG/Orange/texture_02.png.import index cc723be03090aa32d4473d9428f32dea2e9d715d..b874663df3bbb0bd5dee4eb3aa74a0857a1bcddf 100644 --- a/assets/prototype_textures/PNG/Orange/texture_02.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_02.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_02.png-093c377ec303adda9d21979cbbf198 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_03.png.import b/assets/prototype_textures/PNG/Orange/texture_03.png.import index 512291b7cc0b07e8682f5040ce70a01a9cb82e95..7a2bf771862b31acd3f1a158f7a80f4cd2a8ab88 100644 --- a/assets/prototype_textures/PNG/Orange/texture_03.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_03.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_03.png-ef3932d16dcf3bbd8ef495ad26ceb6 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_04.png.import b/assets/prototype_textures/PNG/Orange/texture_04.png.import index cd63343994628e47b176fc3f58f1b28b8470c789..e547d1e7c6f7bb8dfbb77a310062c2cbd857ee45 100644 --- a/assets/prototype_textures/PNG/Orange/texture_04.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_04.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_04.png-9d12285a5926c01014298f654a4526 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_05.png.import b/assets/prototype_textures/PNG/Orange/texture_05.png.import index de1d178ef4d39bd3a9de0f7af57e57bbd7967ebd..55dc751bfee4f314b41dda2ed82c453cc3ffcfd7 100644 --- a/assets/prototype_textures/PNG/Orange/texture_05.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_05.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_05.png-bc9ccd6e8b54683e50ad527ae1e34d [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_06.png.import b/assets/prototype_textures/PNG/Orange/texture_06.png.import index 3e7cdaa12108b0cf1ae2361b4e3a13a9edf71478..67e87e2fdc249fcd12e545bf69494c56b50dcade 100644 --- a/assets/prototype_textures/PNG/Orange/texture_06.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_06.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_06.png-d2a26ae8ae7dc4937b92dce274dae7 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_07.png.import b/assets/prototype_textures/PNG/Orange/texture_07.png.import index 06b0dadd83ff67e818683da3a5ab468303b60d18..7db8209a6e5baea5c585fba246914851c0cc0c1a 100644 --- a/assets/prototype_textures/PNG/Orange/texture_07.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_07.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_07.png-a788072ace4e089ee949c8a611f2aa [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_08.png.import b/assets/prototype_textures/PNG/Orange/texture_08.png.import index 3f4f738eb52ec542014d9bdde61e518d886abe16..6200189591d7233678ae177d86d9327c6bb238cc 100644 --- a/assets/prototype_textures/PNG/Orange/texture_08.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_08.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_08.png-24887fe9e080a7b327eabe589baa06 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_09.png.import b/assets/prototype_textures/PNG/Orange/texture_09.png.import index 7a3e716205d2e2aec1a98baa9703872edfccd599..88112f60a9473a2bdf201532227d5f6d3c9ce2d0 100644 --- a/assets/prototype_textures/PNG/Orange/texture_09.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_09.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_09.png-e15a08e2f442f5a9826fa5a93c5bfc [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_10.png.import b/assets/prototype_textures/PNG/Orange/texture_10.png.import index a6c7b2a3429335aabcdbeb58f6777fb866985850..e6aadffa489d84155071a510e6512a87f0a6ff31 100644 --- a/assets/prototype_textures/PNG/Orange/texture_10.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_10.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_10.png-bf6cd0463af44065aeb08452503477 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_11.png.import b/assets/prototype_textures/PNG/Orange/texture_11.png.import index 6c533119c8ed8daae2ff10fb125e04d08e0e8a3a..4b4cdd3eb3a1c1de95e25ef54781b6e2e7c45913 100644 --- a/assets/prototype_textures/PNG/Orange/texture_11.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_11.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_11.png-11edaf6932788422fda56c01910ee3 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_12.png.import b/assets/prototype_textures/PNG/Orange/texture_12.png.import index 36192211b204a66c7747fe6c45f1d7ae6223bb81..c0581fb1c13843881f66bddb451fa900db701585 100644 --- a/assets/prototype_textures/PNG/Orange/texture_12.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_12.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_12.png-7f044103750949ce8a32fae83e3cfa [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Orange/texture_13.png.import b/assets/prototype_textures/PNG/Orange/texture_13.png.import index cbb9138cc00e8aafa4fba29ba6a18af1df809ea8..72e68f56e931191208930741b3ddd576e185f960 100644 --- a/assets/prototype_textures/PNG/Orange/texture_13.png.import +++ b/assets/prototype_textures/PNG/Orange/texture_13.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_13.png-c0d4f780ae0abfb515af254ba03591 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_01.png.import b/assets/prototype_textures/PNG/Purple/texture_01.png.import index 7e60169af28b5bbd9392d47ad36693e90dcc6f15..25564131d4e97635f350dd58fbf4f18ea9ef36ce 100644 --- a/assets/prototype_textures/PNG/Purple/texture_01.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_01.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://l4h6lydg5yh1" path.s3tc="res://.godot/imported/texture_01.png-9e5014c8ce86b704e370f0edb6fbd6e3.s3tc.ctex" -path.etc2="res://.godot/imported/texture_01.png-9e5014c8ce86b704e370f0edb6fbd6e3.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Purple/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-9e5014c8ce86b704e370f0edb6fbd6e3.s3tc.ctex", "res://.godot/imported/texture_01.png-9e5014c8ce86b704e370f0edb6fbd6e3.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-9e5014c8ce86b704e370f0edb6fbd6e3.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Purple/texture_02.png.import b/assets/prototype_textures/PNG/Purple/texture_02.png.import index 27407fe417bde2c18b33baea66072dc7cf1f200f..4f496f58e4e60b7b4a1d8061f853e5608cefc2b1 100644 --- a/assets/prototype_textures/PNG/Purple/texture_02.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_02.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_02.png-1ec00f34096f6fb9282381078f70c9 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_03.png.import b/assets/prototype_textures/PNG/Purple/texture_03.png.import index f4c986a5a785fae906b975e99711f567a02edda3..feb912f6ca54c7f9b083919fdb095e2318691abc 100644 --- a/assets/prototype_textures/PNG/Purple/texture_03.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_03.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_03.png-c00b342bbba149ff87660e97de3209 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_04.png.import b/assets/prototype_textures/PNG/Purple/texture_04.png.import index 4731931df2c9a896c2e0704127c3f1e97ed192a3..44576ed3a0b571effb130aa2466fc0369e157350 100644 --- a/assets/prototype_textures/PNG/Purple/texture_04.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_04.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_04.png-1837610b5acafd5443fbb2cb9dc578 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_05.png.import b/assets/prototype_textures/PNG/Purple/texture_05.png.import index 99b4e63a4df8687e640961b3e9d252daadf0b392..44d2009295a1f51389eb72a010d1b65c133cb4b2 100644 --- a/assets/prototype_textures/PNG/Purple/texture_05.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_05.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_05.png-7bcaad0566ee105fee8a9a9da67f85 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_06.png.import b/assets/prototype_textures/PNG/Purple/texture_06.png.import index 50324eebc65421c0b8cbf8e4a2505d3fd4cebacf..89cd9d934e9dd51590574a0c09f4c1c6b2dc9cb8 100644 --- a/assets/prototype_textures/PNG/Purple/texture_06.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_06.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_06.png-c6e2b714955fa66d4d8f1ac1acf576 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_07.png.import b/assets/prototype_textures/PNG/Purple/texture_07.png.import index 5ccd553356436f79980cfd70189bbdf6074baf13..2c34c92b8913cbba69b41414a84cb08edab4c55b 100644 --- a/assets/prototype_textures/PNG/Purple/texture_07.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_07.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_07.png-b270420f0f512adcd989ca18906ad1 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_08.png.import b/assets/prototype_textures/PNG/Purple/texture_08.png.import index 9fc7adbf8a777aca59ad9eaa395103c31fc8966b..5a42bed845ce68aa61f029831020fe94eed822f5 100644 --- a/assets/prototype_textures/PNG/Purple/texture_08.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_08.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_08.png-b592e74401fe69181348e84dd6c82b [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_09.png.import b/assets/prototype_textures/PNG/Purple/texture_09.png.import index 84fe9fca8fd7e8586d7d84a1c2e8e93c775cbeaa..4d1eb53ab6e0da3643036f253d3f49925f2a79d2 100644 --- a/assets/prototype_textures/PNG/Purple/texture_09.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_09.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_09.png-60fd7c599101be80739ca17483462a [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_10.png.import b/assets/prototype_textures/PNG/Purple/texture_10.png.import index b37ecdb012359247308683408cac5b88ea22cb74..a9a1973c3f8d4270059c9566999a0a3382adad53 100644 --- a/assets/prototype_textures/PNG/Purple/texture_10.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_10.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_10.png-bd4bc8c4c478fd3e0859529da8fb3f [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_11.png.import b/assets/prototype_textures/PNG/Purple/texture_11.png.import index 167695f1b9829fcafecedc6077ddef249946c30e..33a0d6eb7596e81f348a775bce92f77c3d78e16a 100644 --- a/assets/prototype_textures/PNG/Purple/texture_11.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_11.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_11.png-17ea11dd3092e25c171a347746beef [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_12.png.import b/assets/prototype_textures/PNG/Purple/texture_12.png.import index 23d381b120dc340e56aea852cd464a74dfcbe24d..4768c8fd95a66e7a20d00cdaf21ab9bd2be6d308 100644 --- a/assets/prototype_textures/PNG/Purple/texture_12.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_12.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_12.png-31988d583966b7b58377d025db2982 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Purple/texture_13.png.import b/assets/prototype_textures/PNG/Purple/texture_13.png.import index 37cc3640908840433698d32980a727a8666b9380..d9ef0e9def8ebd149b688a2a72043fe433e7de4c 100644 --- a/assets/prototype_textures/PNG/Purple/texture_13.png.import +++ b/assets/prototype_textures/PNG/Purple/texture_13.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_13.png-407f5f386ee7d9aa112409870c1c0f [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_01.png.import b/assets/prototype_textures/PNG/Red/texture_01.png.import index 5b3a7c64277719f4e00e12f6fcd7f0bf89fbe16c..ff47d1d06dae2fa05cdd5a0a3864293a4c5a8056 100644 --- a/assets/prototype_textures/PNG/Red/texture_01.png.import +++ b/assets/prototype_textures/PNG/Red/texture_01.png.import @@ -4,23 +4,22 @@ importer="texture" type="CompressedTexture2D" uid="uid://ppc4io0fafm1" path.s3tc="res://.godot/imported/texture_01.png-af609ab659beb7d697a344061f03ca8d.s3tc.ctex" -path.etc2="res://.godot/imported/texture_01.png-af609ab659beb7d697a344061f03ca8d.etc2.ctex" metadata={ -"imported_formats": ["s3tc", "etc2"], +"imported_formats": ["s3tc_bptc"], "vram_texture": true } [deps] source_file="res://assets/prototype_textures/PNG/Red/texture_01.png" -dest_files=["res://.godot/imported/texture_01.png-af609ab659beb7d697a344061f03ca8d.s3tc.ctex", "res://.godot/imported/texture_01.png-af609ab659beb7d697a344061f03ca8d.etc2.ctex"] +dest_files=["res://.godot/imported/texture_01.png-af609ab659beb7d697a344061f03ca8d.s3tc.ctex"] [params] compress/mode=2 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=true diff --git a/assets/prototype_textures/PNG/Red/texture_02.png.import b/assets/prototype_textures/PNG/Red/texture_02.png.import index f2e1f59d032ae46981389c816478368ee77ea927..4f21cf84d5a516a1c041eaf9430f5a68a4cce0fd 100644 --- a/assets/prototype_textures/PNG/Red/texture_02.png.import +++ b/assets/prototype_textures/PNG/Red/texture_02.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_02.png-bb9c3de5409d039789427327fd2d31 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_03.png.import b/assets/prototype_textures/PNG/Red/texture_03.png.import index 3d59f110e86517e75dc03c3ad2f3b71dc8569183..59ff069befc1577ad28de43c4dc13db5d70a1ffa 100644 --- a/assets/prototype_textures/PNG/Red/texture_03.png.import +++ b/assets/prototype_textures/PNG/Red/texture_03.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_03.png-99d0738140d773e111b10a11ab6be8 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_04.png.import b/assets/prototype_textures/PNG/Red/texture_04.png.import index 1d95e7681b54c04f3663ec234e715a8f084eabeb..80f7dfa02bee32cdced2e5e66145c5194eca0dad 100644 --- a/assets/prototype_textures/PNG/Red/texture_04.png.import +++ b/assets/prototype_textures/PNG/Red/texture_04.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_04.png-760e724bdd349025b3c3db6a988208 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_05.png.import b/assets/prototype_textures/PNG/Red/texture_05.png.import index 1801a0afcf3a1f763bc08364c33b2b3270167680..1c8a2b5fd183ab537d3ab4071b121c8cde354d73 100644 --- a/assets/prototype_textures/PNG/Red/texture_05.png.import +++ b/assets/prototype_textures/PNG/Red/texture_05.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_05.png-4c29161d3a0bfc61f78cb6b358263a [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_06.png.import b/assets/prototype_textures/PNG/Red/texture_06.png.import index 8c3e45ff87f38c9440e1a32c3c55430c34e50fc5..29b9a68ec76731988e722c882c2447bb31c66cab 100644 --- a/assets/prototype_textures/PNG/Red/texture_06.png.import +++ b/assets/prototype_textures/PNG/Red/texture_06.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_06.png-614995eef97b906419bc801c9b3f5d [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_07.png.import b/assets/prototype_textures/PNG/Red/texture_07.png.import index 48d7c48f95bab6adaa39a92bed4d70b36801353e..e469873daeef3cf98f5c4d05c23b3d7a7eff9e1b 100644 --- a/assets/prototype_textures/PNG/Red/texture_07.png.import +++ b/assets/prototype_textures/PNG/Red/texture_07.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_07.png-e7cddea6d760f9886162672447c362 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_08.png.import b/assets/prototype_textures/PNG/Red/texture_08.png.import index bedc98c1626f3bcdb4afc316fc3c8b8205e70192..b5d8172b6f5f7dc7c55b9c1d5d6e4068caeb7ed5 100644 --- a/assets/prototype_textures/PNG/Red/texture_08.png.import +++ b/assets/prototype_textures/PNG/Red/texture_08.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_08.png-a0f9094607cd1d67fc7ef8cfd8fdd8 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_09.png.import b/assets/prototype_textures/PNG/Red/texture_09.png.import index adfdd78934bb8507f492f958c6443afab41d9934..9bde34671196903983c41ad67fa0a700f97ae671 100644 --- a/assets/prototype_textures/PNG/Red/texture_09.png.import +++ b/assets/prototype_textures/PNG/Red/texture_09.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_09.png-e7ee19ce1b3daae273509dcb84d921 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_10.png.import b/assets/prototype_textures/PNG/Red/texture_10.png.import index d583d05d7fbd37ccb229aff80c21f788133685bd..6e3cb473d1625e6c45395187ef481c69220eea5d 100644 --- a/assets/prototype_textures/PNG/Red/texture_10.png.import +++ b/assets/prototype_textures/PNG/Red/texture_10.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_10.png-627bdd11c6faba350160f4f3953fbe [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_11.png.import b/assets/prototype_textures/PNG/Red/texture_11.png.import index 4d042eb49091341f4c5c14f9a5d97832e9ba3384..7820a64395ec60dce73aec55ac081e13a892e472 100644 --- a/assets/prototype_textures/PNG/Red/texture_11.png.import +++ b/assets/prototype_textures/PNG/Red/texture_11.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_11.png-9f0e2dc9c16c121be28fbfc6876cdd [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_12.png.import b/assets/prototype_textures/PNG/Red/texture_12.png.import index 7457039f0829feb44f3e818b9c5047881028b05c..13a452f61a49344f779f93b0bf9ab307f33aa6f4 100644 --- a/assets/prototype_textures/PNG/Red/texture_12.png.import +++ b/assets/prototype_textures/PNG/Red/texture_12.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_12.png-4fbde52c5edd7f40a6c692680314c2 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/assets/prototype_textures/PNG/Red/texture_13.png.import b/assets/prototype_textures/PNG/Red/texture_13.png.import index f611e19dc678a8881c370cf3d606f814e35a08d2..9b0163713d2a1eae6d5933eb93ca4f73123a79af 100644 --- a/assets/prototype_textures/PNG/Red/texture_13.png.import +++ b/assets/prototype_textures/PNG/Red/texture_13.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/texture_13.png-19063b350484689c8c1503524df78d [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/bin/FPS.console.exe b/bin/FPS.console.exe new file mode 100644 index 0000000000000000000000000000000000000000..129f9b7a74e59340a5ae2f0b7ca247b940af60fb Binary files /dev/null and b/bin/FPS.console.exe differ diff --git a/bin/FPS.exe b/bin/FPS.exe index 0df6a5ab75c5a55232be5405d01de5fa08134ab1..d06380a59bd46151a5a10cf7c5689ee9a664e867 100644 --- a/bin/FPS.exe +++ b/bin/FPS.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1a76bed716a2260c203ed726bd1762ca25b8d25c49b868828f6a74f0ad42457 -size 63622656 +oid sha256:784e2e3b2022a9421df07c764fc394ff0576147b16d186b9ed17fb725e96d4d4 +size 68805120 diff --git a/bin/FPS.pck b/bin/FPS.pck index 564c41a1ba2bbb8e1ff311e90c4ff3db725787d7..fb42a3dbfb16692b3e594f56c30496500ee20ea9 100644 --- a/bin/FPS.pck +++ b/bin/FPS.pck @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fe59eb48813ab586f05eb64959e148fee2ae8f834e1e1cfe3c8281a7a23fc38 -size 23244000 +oid sha256:bf12d44543b7168a70b6d7071eea09d172944a877ec790f7a518dff15bb89d25 +size 22345984 diff --git a/bin/FPS.sh b/bin/FPS.sh new file mode 100644 index 0000000000000000000000000000000000000000..155321091fa64e79d3adfb6c27c2db3323e1ce97 --- /dev/null +++ b/bin/FPS.sh @@ -0,0 +1,4 @@ +#!/bin/sh +echo -ne '\033c\033]0;FPS\a' +base_path="$(dirname "$(realpath "$0")")" +"$base_path/FPS.x86_64" "$@" diff --git a/bin/FPS.x86_64 b/bin/FPS.x86_64 index 66dfca4a03ce78e7e9a5bc4e242a0368d3bc1992..2e5a23c5eccdacc2dd1d161e3b8b4029645fed92 100644 --- a/bin/FPS.x86_64 +++ b/bin/FPS.x86_64 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed68d749a5bc6e3e78fdf5764fcbf5493e8b9ebdb629f470be3c64c1f205b58f -size 64865512 +oid sha256:dda38dcc9dacc4e8d58d79f88a109bd36a30d97af1400a46b9d9d4e24278dbfe +size 70085064 diff --git a/export_presets.cfg b/export_presets.cfg index e6b088de20b4ec60295eba28a6e121c56ee0d074..d699dd1497beca2e7fd8f49a3d0ba7d4ece5c771 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -3,16 +3,16 @@ name="Linux/X11" platform="Linux/X11" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../../godot_rl_agents/examples/builds/FPS_team/fps_team.x86_64" +export_path="" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_export_mode=1 script_encryption_key="" [preset.0.options] @@ -21,18 +21,30 @@ custom_template/debug="" custom_template/release="" debug/export_console_script=1 binary_format/embed_pck=false -texture_format/bptc=false +texture_format/bptc=true texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false -texture_format/no_bptc_fallbacks=true binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" [preset.1] name="Windows Desktop" platform="Windows Desktop" runnable=true +dedicated_server=false custom_features="" export_filter="all_resources" include_filter="" @@ -42,7 +54,6 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_export_mode=1 script_encryption_key="" [preset.1.options] @@ -51,11 +62,10 @@ custom_template/debug="" custom_template/release="" debug/export_console_script=1 binary_format/embed_pck=false -texture_format/bptc=false +texture_format/bptc=true texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false -texture_format/no_bptc_fallbacks=true binary_format/architecture="x86_64" codesign/enable=false codesign/identity_type=0 @@ -68,6 +78,8 @@ codesign/description="" codesign/custom_options=PackedStringArray() application/modify_resources=true application/icon="" +application/console_wrapper_icon="" +application/icon_interpolation=4 application/file_version="" application/product_version="" application/company_name="" @@ -75,3 +87,20 @@ application/product_name="" application/file_description="" application/copyright="" application/trademarks="" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}' +$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}' +$trigger = New-ScheduledTaskTrigger -Once -At 00:00 +$settings = New-ScheduledTaskSettingsSet +$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings +Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true +Start-ScheduledTask -TaskName godot_remote_debug +while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 } +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue" +ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue +Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue +Remove-Item -Recurse -Force '{temp_dir}'" diff --git a/icon.svg.import b/icon.svg.import index f84507b7828b4c5db8708029e83cb748c16d24b7..f4aff4db8f1f9c183b88c470d843c9f7bf07b9e0 100644 --- a/icon.svg.import +++ b/icon.svg.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.cte [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/project.godot b/project.godot index 4303fd52990f4ce0f1190ebbd2b438a7e53be283..15ba163479bbcba29e139c04718b09638ef75581 100644 --- a/project.godot +++ b/project.godot @@ -8,76 +8,6 @@ config_version=5 -_global_script_classes=[{ -"base": "Node3D", -"class": &"AIController", -"language": &"GDScript", -"path": "res://AIController.gd" -}, { -"base": "Node3D", -"class": &"CharacterModel", -"language": &"GDScript", -"path": "res://tbot_model.gd" -}, { -"base": "Node2D", -"class": &"ISensor2D", -"language": &"GDScript", -"path": "res://addons/godot_rl_agents/sensors/sensors_2d/ISensor2D.gd" -}, { -"base": "Node3D", -"class": &"ISensor3D", -"language": &"GDScript", -"path": "res://addons/godot_rl_agents/sensors/sensors_3d/ISensor3D.gd" -}, { -"base": "CharacterBody3D", -"class": &"Player", -"language": &"GDScript", -"path": "res://player.gd" -}, { -"base": "Area3D", -"class": &"PlayerHitBox", -"language": &"GDScript", -"path": "res://PlayerHitBox.gd" -}, { -"base": "State", -"class": &"PlayerState", -"language": &"GDScript", -"path": "res://state_machine/player_state.gd" -}, { -"base": "Node3D", -"class": &"Projectile", -"language": &"GDScript", -"path": "res://projectile.gd" -}, { -"base": "Node3D", -"class": &"RGBCameraSensor3D", -"language": &"GDScript", -"path": "res://addons/godot_rl_agents/sensors/sensors_3d/RGBCameraSensor3D.gd" -}, { -"base": "Node", -"class": &"State", -"language": &"GDScript", -"path": "res://state_machine/state.gd" -}, { -"base": "Node", -"class": &"StateMachine", -"language": &"GDScript", -"path": "res://state_machine/state_machine.gd" -}] -_global_script_class_icons={ -"AIController": "", -"CharacterModel": "", -"ISensor2D": "", -"ISensor3D": "", -"Player": "", -"PlayerHitBox": "", -"PlayerState": "", -"Projectile": "", -"RGBCameraSensor3D": "", -"State": "", -"StateMachine": "" -} - [application] config/name="FPS" @@ -90,6 +20,10 @@ config/icon="res://icon.svg" CameraManager="*res://managers/camera_manager.gd" GameManager="*res://managers/game_manager.gd" +[dotnet] + +project/assembly_name="FPS" + [editor_plugins] enabled=PackedStringArray() @@ -98,27 +32,27 @@ enabled=PackedStringArray() move_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_forward={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":0,"echo":false,"script":null) ] } move_backward={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":0,"echo":false,"script":null) ] } jump={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"echo":false,"script":null) ] } shoot={ @@ -128,47 +62,47 @@ shoot={ } toggle_next_player={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) ] } toggle_previous_player={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) ] } toggle_first_person_camera={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) ] } toggle_third_person_camera={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) ] } toggle_flycam={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":0,"echo":false,"script":null) ] } cam_down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194326,"key_label":0,"unicode":0,"echo":false,"script":null) ] } cam_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":0,"echo":false,"script":null) ] } human_control={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":72,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":72,"key_label":0,"unicode":0,"echo":false,"script":null) ] } toggle_orbitcam={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":79,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":79,"key_label":0,"unicode":0,"echo":false,"script":null) ] }