diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..f28239b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +root = true + +[*] +charset = utf-8 diff --git a/ActionBehaviour/ActionBehaviourResource.gd.uid b/ActionBehaviour/ActionBehaviourResource.gd.uid new file mode 100644 index 0000000..4908960 --- /dev/null +++ b/ActionBehaviour/ActionBehaviourResource.gd.uid @@ -0,0 +1 @@ +uid://hu56oq6sbwvv diff --git a/ActionBehaviour/Prefabs/ActionBehaviourMosquito.gd.uid b/ActionBehaviour/Prefabs/ActionBehaviourMosquito.gd.uid new file mode 100644 index 0000000..6eb3d3c --- /dev/null +++ b/ActionBehaviour/Prefabs/ActionBehaviourMosquito.gd.uid @@ -0,0 +1 @@ +uid://coi3nbnsw8bwb diff --git a/ActionBehaviour/Prefabs/ActionBehaviourPillbug.gd.uid b/ActionBehaviour/Prefabs/ActionBehaviourPillbug.gd.uid new file mode 100644 index 0000000..d58bf15 --- /dev/null +++ b/ActionBehaviour/Prefabs/ActionBehaviourPillbug.gd.uid @@ -0,0 +1 @@ +uid://byn6frgu2evpo diff --git a/CameraPivot.gd.uid b/CameraPivot.gd.uid new file mode 100644 index 0000000..0b46d7c --- /dev/null +++ b/CameraPivot.gd.uid @@ -0,0 +1 @@ +uid://dkiy6njslvsud diff --git a/DisconnectInfo.gd.uid b/DisconnectInfo.gd.uid new file mode 100644 index 0000000..fa2e8f5 --- /dev/null +++ b/DisconnectInfo.gd.uid @@ -0,0 +1 @@ +uid://ckbcjqlo333jm diff --git a/DrawInfo.gd.uid b/DrawInfo.gd.uid new file mode 100644 index 0000000..29d3745 --- /dev/null +++ b/DrawInfo.gd.uid @@ -0,0 +1 @@ +uid://cmx00rywwt47c diff --git a/Game.gd.uid b/Game.gd.uid new file mode 100644 index 0000000..de67b7c --- /dev/null +++ b/Game.gd.uid @@ -0,0 +1 @@ +uid://cu2lheqsdppkp diff --git a/Game.tscn b/Game.tscn index 5ae99d4..57ebb6b 100644 --- a/Game.tscn +++ b/Game.tscn @@ -1,24 +1,25 @@ -[gd_scene load_steps=30 format=3 uid="uid://bx0bbrwdr0h40"] +[gd_scene load_steps=32 format=3 uid="uid://bx0bbrwdr0h40"] -[ext_resource type="Script" path="res://Game.gd" id="1_dgt1j"] -[ext_resource type="Script" path="res://CameraPivot.gd" id="2_71xp1"] -[ext_resource type="Script" path="res://HexGrid3D/HexGrid3D.gd" id="2_suxca"] -[ext_resource type="Script" path="res://GameEndChecker.gd" id="2_ufkw3"] +[ext_resource type="Script" uid="uid://cu2lheqsdppkp" path="res://Game.gd" id="1_dgt1j"] +[ext_resource type="Script" uid="uid://dkiy6njslvsud" path="res://CameraPivot.gd" id="2_71xp1"] +[ext_resource type="Script" uid="uid://3bcjk4gegklv" path="res://HexGrid3D/HexGrid3D.gd" id="2_suxca"] +[ext_resource type="Script" uid="uid://dpnbbkfuama6p" path="res://GameEndChecker.gd" id="2_ufkw3"] [ext_resource type="Material" uid="uid://dv2oo7hlc5nyy" path="res://Testbed/Table.tres" id="5_u4p4p"] -[ext_resource type="Script" path="res://WebLightChecker.gd" id="6_41m5i"] -[ext_resource type="Script" path="res://UI/BuildMenu.gd" id="7_1oc55"] -[ext_resource type="Script" path="res://WorldEnvSettings.gd" id="7_w8wx1"] -[ext_resource type="Script" path="res://Table.gd" id="8_ys5y3"] +[ext_resource type="Script" uid="uid://dc6l065gaaifu" path="res://WebLightChecker.gd" id="6_41m5i"] +[ext_resource type="Script" uid="uid://dyikyqxr4bflg" path="res://UI/BuildMenu.gd" id="7_1oc55"] +[ext_resource type="Script" uid="uid://ehiq0b0tlcgu" path="res://WorldEnvSettings.gd" id="7_w8wx1"] +[ext_resource type="Script" uid="uid://cm0d6ct61nn30" path="res://Table.gd" id="8_ys5y3"] [ext_resource type="Texture2D" uid="uid://d2i5vboeyq8qx" path="res://UI/hex_white.svg" id="11_cl0he"] -[ext_resource type="Script" path="res://GameOverMenu.gd" id="11_ffmss"] -[ext_resource type="Script" path="res://MenuButtons.gd" id="11_urihv"] -[ext_resource type="Script" path="res://TurnTexture.gd" id="12_kjwp8"] -[ext_resource type="Script" path="res://UI/InputInfo.gd" id="13_6sp26"] -[ext_resource type="Script" path="res://addons/awesome_input_icons/classes/InputIconTextureRect.gd" id="13_mbmni"] +[ext_resource type="Script" uid="uid://yev2hctcnbt4" path="res://GameOverMenu.gd" id="11_ffmss"] +[ext_resource type="Script" uid="uid://b14cpuqs6g86t" path="res://MenuButtons.gd" id="11_urihv"] +[ext_resource type="Script" uid="uid://cwmuu385b53nw" path="res://TurnTexture.gd" id="12_kjwp8"] +[ext_resource type="Script" uid="uid://damrrrph3vfwm" path="res://UI/InputInfo.gd" id="13_6sp26"] +[ext_resource type="Script" uid="uid://go64dt8gl8gy" path="res://addons/awesome_input_icons/classes/InputIconTextureRect.gd" id="13_mbmni"] [ext_resource type="Texture2D" uid="uid://20wqrthwoqr0" path="res://addons/awesome_input_icons/assets/keyboard and mouse vector/mouse_move.svg" id="14_t8b21"] -[ext_resource type="Script" path="res://UI/ActionMoveMenu.gd" id="15_gc6p8"] -[ext_resource type="Script" path="res://DrawInfo.gd" id="16_enu5g"] -[ext_resource type="Script" path="res://UI/GameSettings.gd" id="16_uww8u"] +[ext_resource type="Script" uid="uid://1qbrnymtbat1" path="res://UI/ActionMoveMenu.gd" id="15_gc6p8"] +[ext_resource type="Script" uid="uid://cmx00rywwt47c" path="res://DrawInfo.gd" id="16_enu5g"] +[ext_resource type="Script" uid="uid://dv3e8l0ecyyke" path="res://UI/GameSettings.gd" id="16_uww8u"] +[ext_resource type="Shader" uid="uid://dlplsrexke1rc" path="res://Testbed/FilmGrain.gdshader" id="20_7ywci"] [sub_resource type="PlaneMesh" id="PlaneMesh_cu5ir"] material = ExtResource("5_u4p4p") @@ -43,6 +44,12 @@ fog_density = 0.3 dof_blur_far_distance = 15.0 dof_blur_far_transition = 10.0 +[sub_resource type="ShaderMaterial" id="ShaderMaterial_haxul"] +shader = ExtResource("20_7ywci") +shader_parameter/grain_amount = 0.11 +shader_parameter/grain_size = 1.0 +shader_parameter/animate = true + [sub_resource type="Gradient" id="Gradient_pctcs"] interpolation_mode = 2 offsets = PackedFloat32Array(0, 0.839465) @@ -106,6 +113,15 @@ transform = Transform3D(0.843961, -0.46784, 0.262404, -0.0775016, 0.377705, 0.92 shadow_enabled = true script = ExtResource("6_41m5i") +[node name="ColorRect" type="ColorRect" parent="."] +visible = false +material = SubResource("ShaderMaterial_haxul") +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + [node name="BuildMenu" type="Control" parent="."] layout_mode = 3 anchors_preset = 12 @@ -668,9 +684,9 @@ text = "Host color" [node name="HostColorOption" type="OptionButton" parent="GameSettings/GameSettings/PanelContainer/VBoxContainer/HBoxContainer"] layout_mode = 2 -item_count = 3 selected = 0 allow_reselect = true +item_count = 3 popup/item_0/text = "White" popup/item_0/id = 0 popup/item_1/text = "Black" diff --git a/GameEndChecker.gd.uid b/GameEndChecker.gd.uid new file mode 100644 index 0000000..33b73e4 --- /dev/null +++ b/GameEndChecker.gd.uid @@ -0,0 +1 @@ +uid://dpnbbkfuama6p diff --git a/GameOverMenu.gd.uid b/GameOverMenu.gd.uid new file mode 100644 index 0000000..9967bf0 --- /dev/null +++ b/GameOverMenu.gd.uid @@ -0,0 +1 @@ +uid://yev2hctcnbt4 diff --git a/Globals/GameData.gd.uid b/Globals/GameData.gd.uid new file mode 100644 index 0000000..993bbfc --- /dev/null +++ b/Globals/GameData.gd.uid @@ -0,0 +1 @@ +uid://co5w1mw0xy4of diff --git a/Globals/GameEvents.gd.uid b/Globals/GameEvents.gd.uid new file mode 100644 index 0000000..e55b65f --- /dev/null +++ b/Globals/GameEvents.gd.uid @@ -0,0 +1 @@ +uid://1an3sh1yafh3 diff --git a/Globals/GameSettings.gd.uid b/Globals/GameSettings.gd.uid new file mode 100644 index 0000000..984e6ef --- /dev/null +++ b/Globals/GameSettings.gd.uid @@ -0,0 +1 @@ +uid://cvu5uapg7v70p diff --git a/HexGrid3D/HexGrid3D.gd.uid b/HexGrid3D/HexGrid3D.gd.uid new file mode 100644 index 0000000..46eb4f3 --- /dev/null +++ b/HexGrid3D/HexGrid3D.gd.uid @@ -0,0 +1 @@ +uid://3bcjk4gegklv diff --git a/HexOutline.gd.uid b/HexOutline.gd.uid new file mode 100644 index 0000000..14a673d --- /dev/null +++ b/HexOutline.gd.uid @@ -0,0 +1 @@ +uid://rbug8ibnb87v diff --git a/InGameMenu.gd.uid b/InGameMenu.gd.uid new file mode 100644 index 0000000..806ee53 --- /dev/null +++ b/InGameMenu.gd.uid @@ -0,0 +1 @@ +uid://bf3gjwp46h4qu diff --git a/InsectButton.gd.uid b/InsectButton.gd.uid new file mode 100644 index 0000000..8651331 --- /dev/null +++ b/InsectButton.gd.uid @@ -0,0 +1 @@ +uid://dwyqwo4tl2gcm diff --git a/InsectTiles/BuildGhost.gd.uid b/InsectTiles/BuildGhost.gd.uid new file mode 100644 index 0000000..6dae01d --- /dev/null +++ b/InsectTiles/BuildGhost.gd.uid @@ -0,0 +1 @@ +uid://bnjgde0w63vjr diff --git a/InsectTiles/HoverShader.gdshader b/InsectTiles/HoverShader.gdshader index 47357d6..452cff6 100644 --- a/InsectTiles/HoverShader.gdshader +++ b/InsectTiles/HoverShader.gdshader @@ -5,7 +5,7 @@ shader_type spatial; render_mode unshaded;//depth_test_disable; uniform vec4 albedo : source_color; uniform vec4 emission_color : source_color; -uniform float emission_amount: hint_range(0.0, 16.0) = 5.0f; +uniform float emission_amount: hint_range(0.0, 16.0) = 5.0f; uniform float rim_steepness : hint_range(0.0f, 16.0f) = 3.0f; //higher values mean a smaller rim. diff --git a/InsectTiles/HoverShader.gdshader.uid b/InsectTiles/HoverShader.gdshader.uid new file mode 100644 index 0000000..6d2b42c --- /dev/null +++ b/InsectTiles/HoverShader.gdshader.uid @@ -0,0 +1 @@ +uid://g035kui0yqjh diff --git a/InsectTiles/HoverShader.tres b/InsectTiles/HoverShader.tres index f49de4d..b4e07af 100644 --- a/InsectTiles/HoverShader.tres +++ b/InsectTiles/HoverShader.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://v74ro6pmr4hw"] -[ext_resource type="Shader" path="res://InsectTiles/HoverShader.gdshader" id="1_pk3ok"] +[ext_resource type="Shader" uid="uid://g035kui0yqjh" path="res://InsectTiles/HoverShader.gdshader" id="1_pk3ok"] [resource] render_priority = 0 diff --git a/InsectTiles/InsectTile.tscn b/InsectTiles/InsectTile.tscn index 3e38482..1244834 100644 --- a/InsectTiles/InsectTile.tscn +++ b/InsectTiles/InsectTile.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://dxwngv0xmk3vy"] -[ext_resource type="Script" path="res://Tile/Tile.gd" id="1_b68ym"] +[ext_resource type="Script" uid="uid://cxyrai6as7y1l" path="res://Tile/Tile.gd" id="1_b68ym"] [ext_resource type="ArrayMesh" uid="uid://dsbshu53k588h" path="res://hexagon_small.res" id="2_vm00h"] [ext_resource type="Resource" uid="uid://b70uxn2ofij8y" path="res://Tile/Prefabs/Bee.tres" id="2_xu8wf"] [ext_resource type="Texture2D" uid="uid://bp5lbofkicsqq" path="res://InsectTiles/Assets/Textures/ant_black.png" id="3_r51ol"] diff --git a/LANConnectMenu.gd.uid b/LANConnectMenu.gd.uid new file mode 100644 index 0000000..63c6e43 --- /dev/null +++ b/LANConnectMenu.gd.uid @@ -0,0 +1 @@ +uid://dfdf0iosyvyc7 diff --git a/MenuButtons.gd.uid b/MenuButtons.gd.uid new file mode 100644 index 0000000..b1236d5 --- /dev/null +++ b/MenuButtons.gd.uid @@ -0,0 +1 @@ +uid://b14cpuqs6g86t diff --git a/MeshBreather.gd.uid b/MeshBreather.gd.uid new file mode 100644 index 0000000..6d2c427 --- /dev/null +++ b/MeshBreather.gd.uid @@ -0,0 +1 @@ +uid://btn30al6m0cfa diff --git a/Misc/RTSCamera3D.gd.uid b/Misc/RTSCamera3D.gd.uid new file mode 100644 index 0000000..d4a44c9 --- /dev/null +++ b/Misc/RTSCamera3D.gd.uid @@ -0,0 +1 @@ +uid://rmnkki3bv1pw diff --git a/MovementBehaviour/MovementBehaviourResource.gd.uid b/MovementBehaviour/MovementBehaviourResource.gd.uid new file mode 100644 index 0000000..b2c75f0 --- /dev/null +++ b/MovementBehaviour/MovementBehaviourResource.gd.uid @@ -0,0 +1 @@ +uid://divh522cgw5wo diff --git a/MovementBehaviour/Prefabs/MovementBehaviourAnt.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourAnt.gd.uid new file mode 100644 index 0000000..57fee94 --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourAnt.gd.uid @@ -0,0 +1 @@ +uid://2ya4abv3mp0 diff --git a/MovementBehaviour/Prefabs/MovementBehaviourBee.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourBee.gd.uid new file mode 100644 index 0000000..02d631d --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourBee.gd.uid @@ -0,0 +1 @@ +uid://digwn1f4kkcw diff --git a/MovementBehaviour/Prefabs/MovementBehaviourBeetle.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourBeetle.gd.uid new file mode 100644 index 0000000..ff35efb --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourBeetle.gd.uid @@ -0,0 +1 @@ +uid://cdikwbqk1igh6 diff --git a/MovementBehaviour/Prefabs/MovementBehaviourGrasshopper.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourGrasshopper.gd.uid new file mode 100644 index 0000000..2a9d986 --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourGrasshopper.gd.uid @@ -0,0 +1 @@ +uid://ehkjfv3db0ri diff --git a/MovementBehaviour/Prefabs/MovementBehaviourLadybug.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourLadybug.gd.uid new file mode 100644 index 0000000..822314c --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourLadybug.gd.uid @@ -0,0 +1 @@ +uid://d3645pthvj5g3 diff --git a/MovementBehaviour/Prefabs/MovementBehaviourMosquito.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourMosquito.gd.uid new file mode 100644 index 0000000..916fee2 --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourMosquito.gd.uid @@ -0,0 +1 @@ +uid://dsfx5mx8dyktg diff --git a/MovementBehaviour/Prefabs/MovementBehaviourPillbug.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourPillbug.gd.uid new file mode 100644 index 0000000..01dbf88 --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourPillbug.gd.uid @@ -0,0 +1 @@ +uid://jwtlsoh3v1j0 diff --git a/MovementBehaviour/Prefabs/MovementBehaviourSpider.gd.uid b/MovementBehaviour/Prefabs/MovementBehaviourSpider.gd.uid new file mode 100644 index 0000000..6f1154e --- /dev/null +++ b/MovementBehaviour/Prefabs/MovementBehaviourSpider.gd.uid @@ -0,0 +1 @@ +uid://dd003v8tihs6 diff --git a/Multiplayer/LobbyInfo.gd.uid b/Multiplayer/LobbyInfo.gd.uid new file mode 100644 index 0000000..083c4bd --- /dev/null +++ b/Multiplayer/LobbyInfo.gd.uid @@ -0,0 +1 @@ +uid://nfjyotyuuf8f diff --git a/Multiplayer/Multiplayer.gd.uid b/Multiplayer/Multiplayer.gd.uid new file mode 100644 index 0000000..e32ca7e --- /dev/null +++ b/Multiplayer/Multiplayer.gd.uid @@ -0,0 +1 @@ +uid://dqxcwiyx83dkk diff --git a/Multiplayer/Multiplayer.tscn b/Multiplayer/Multiplayer.tscn index 17329d9..e5564d5 100644 --- a/Multiplayer/Multiplayer.tscn +++ b/Multiplayer/Multiplayer.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bh31hq1uwqdts"] -[ext_resource type="Script" path="res://Multiplayer/Multiplayer.gd" id="1_0n82x"] -[ext_resource type="Script" path="res://Multiplayer/LobbyInfo.gd" id="2_wf1xe"] +[ext_resource type="Script" uid="uid://dqxcwiyx83dkk" path="res://Multiplayer/Multiplayer.gd" id="1_0n82x"] +[ext_resource type="Script" uid="uid://nfjyotyuuf8f" path="res://Multiplayer/LobbyInfo.gd" id="2_wf1xe"] [node name="Multiplayer" type="Node"] script = ExtResource("1_0n82x") diff --git a/Networking/Networking.gd b/Networking/Networking.gd index 4cd3ea4..f52cccb 100644 --- a/Networking/Networking.gd +++ b/Networking/Networking.gd @@ -7,11 +7,11 @@ func create_enet_server(port: int) -> void: peer.create_server(port, 1) multiplayer.multiplayer_peer = peer + func close_enet_server() -> void: if multiplayer.multiplayer_peer is ENetMultiplayerPeer: multiplayer.multiplayer_peer.close() - func disconnect_all() -> void: #close_enet_server() close_enet_client() diff --git a/Networking/Networking.gd.uid b/Networking/Networking.gd.uid new file mode 100644 index 0000000..d81c610 --- /dev/null +++ b/Networking/Networking.gd.uid @@ -0,0 +1 @@ +uid://bpsu0nnl8sel3 diff --git a/Networking/Networking.tscn b/Networking/Networking.tscn index 82d9d4f..358e83a 100644 --- a/Networking/Networking.tscn +++ b/Networking/Networking.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://cigm5ol2f8b4b"] -[ext_resource type="Script" path="res://Networking/Networking.gd" id="1_y8syy"] +[ext_resource type="Script" uid="uid://bpsu0nnl8sel3" path="res://Networking/Networking.gd" id="1_y8syy"] [ext_resource type="PackedScene" uid="uid://dfxg65sfuvegd" path="res://Networking/ws_client.tscn" id="2_0nqq0"] [node name="Networking" type="Node"] diff --git a/Networking/WSClient/multiplayer_client.gd.uid b/Networking/WSClient/multiplayer_client.gd.uid new file mode 100644 index 0000000..faf122b --- /dev/null +++ b/Networking/WSClient/multiplayer_client.gd.uid @@ -0,0 +1 @@ +uid://dh778mxhwy2k2 diff --git a/Networking/WSClient/ws_webrtc_client.gd b/Networking/WSClient/ws_webrtc_client.gd index e0e8dbf..51269bd 100644 --- a/Networking/WSClient/ws_webrtc_client.gd +++ b/Networking/WSClient/ws_webrtc_client.gd @@ -50,13 +50,14 @@ func _process(delta): func _parse_msg(): var parsed = JSON.parse_string(ws.get_packet().get_string_from_utf8()) + print(parsed) if typeof(parsed) != TYPE_DICTIONARY or not parsed.has("type") or not parsed.has("id") or \ typeof(parsed.get("data")) != TYPE_STRING: return false var msg := parsed as Dictionary - if not str(msg.type).is_valid_int() or not str(msg.id).is_valid_int(): - return false + #if not str(msg.type).is_valid_int() or not str(msg.id).is_valid_int(): + #return false var type := str(msg.type).to_int() var src_id := str(msg.id).to_int() diff --git a/Networking/WSClient/ws_webrtc_client.gd.uid b/Networking/WSClient/ws_webrtc_client.gd.uid new file mode 100644 index 0000000..8c54230 --- /dev/null +++ b/Networking/WSClient/ws_webrtc_client.gd.uid @@ -0,0 +1 @@ +uid://d1w1mgnqtbt7c diff --git a/PlayerInventory.gd.uid b/PlayerInventory.gd.uid new file mode 100644 index 0000000..39678c8 --- /dev/null +++ b/PlayerInventory.gd.uid @@ -0,0 +1 @@ +uid://bi7xee67gsgcs diff --git a/Table.gd.uid b/Table.gd.uid new file mode 100644 index 0000000..3862f50 --- /dev/null +++ b/Table.gd.uid @@ -0,0 +1 @@ +uid://cm0d6ct61nn30 diff --git a/TestRot.gd.uid b/TestRot.gd.uid new file mode 100644 index 0000000..228bb62 --- /dev/null +++ b/TestRot.gd.uid @@ -0,0 +1 @@ +uid://drmsctx1dselj diff --git a/TestUI.gd.uid b/TestUI.gd.uid new file mode 100644 index 0000000..8e1438f --- /dev/null +++ b/TestUI.gd.uid @@ -0,0 +1 @@ +uid://0dap6vv0a2bt diff --git a/Testbed/DistanceFaceWorld.gdshader.uid b/Testbed/DistanceFaceWorld.gdshader.uid new file mode 100644 index 0000000..1f02a20 --- /dev/null +++ b/Testbed/DistanceFaceWorld.gdshader.uid @@ -0,0 +1 @@ +uid://boiay83j4p11x diff --git a/Testbed/FilmGrain.gdshader b/Testbed/FilmGrain.gdshader new file mode 100644 index 0000000..16fad26 --- /dev/null +++ b/Testbed/FilmGrain.gdshader @@ -0,0 +1,108 @@ +shader_type canvas_item; + +uniform sampler2D screen_texture : hint_screen_texture; +uniform float grain_amount : hint_range(0.0, 1.0) = 0.05; // Adjust the amount of grain +uniform float grain_size : hint_range(0.1, 10.0) = 1.0; // Adjust the size of the grain +uniform bool animate = false; + +//void fragment() { + //// Sample the original screen texture + //vec4 original_color = texture(screen_texture, SCREEN_UV); + // + //float noise = 0.0; + // + //if (animate) { + //// Generate random noise + //noise = (fract(sin(dot(UV * TIME, vec2(12.9898, 78.233))) * 43758.5453) - 0.5) * 2.0; + //} else { + //noise = (fract(sin(dot(UV, vec2(12.9898, 78.233))) * 43758.5453) - 0.5) * 2.0; + //} + //// Add noise to the original color + //original_color.rgb += noise * grain_amount * grain_size; + // + //// Clamp the final color to make sure it stays in the valid range + //COLOR = clamp(original_color, 0.0, 1.0); +//} + + +// Feel free to steal this :^) +// Consider it MIT licensed, you can link to this page if you want to. + +#define SHOW_NOISE 0 +#define SRGB 0 +// 0: Addition, 1: Screen, 2: Overlay, 3: Soft Light, 4: Lighten-Only +#define BLEND_MODE 4 +#define SPEED 1.0 +#define INTENSITY 0.05 +// What gray level noise should tend to. +#define MEAN 0.0 +// Controls the contrast/variance of noise. +#define VARIANCE 0.5 + +vec3 channel_mix(vec3 a, vec3 b, vec3 w) { + return vec3(mix(a.r, b.r, w.r), mix(a.g, b.g, w.g), mix(a.b, b.b, w.b)); +} + +float gaussian(float z, float u, float o) { + return (1.0 / (o * sqrt(2.0 * 3.1415))) * exp(-(((z - u) * (z - u)) / (2.0 * (o * o)))); +} + +vec3 madd(vec3 a, vec3 b, float w) { + return a + a * b * w; +} + +vec3 screen(vec3 a, vec3 b, float w) { + return mix(a, vec3(1.0) - (vec3(1.0) - a) * (vec3(1.0) - b), w); +} + +vec3 overlay(vec3 a, vec3 b, float w) { + return mix(a, channel_mix( + 2.0 * a * b, + vec3(1.0) - 2.0 * (vec3(1.0) - a) * (vec3(1.0) - b), + step(vec3(0.5), a) + ), w); +} + +vec3 soft_light(vec3 a, vec3 b, float w) { + return mix(a, pow(a, pow(vec3(2.0), 2.0 * (vec3(0.5) - b))), w); +} + +void fragment() { + vec2 ps = vec2(1.0) / (1.0 / SCREEN_PIXEL_SIZE).xy; + vec2 uv = SCREEN_UV; //coord * ps; + COLOR = texture(screen_texture, uv); + #if SRGB + color = pow(color, vec4(2.2)); + #endif + + float t = TIME * float(SPEED); + float seed = dot(uv, vec2(12.9898, 78.233)); + float noise = fract(sin(seed) * 43758.5453 + t); + noise = gaussian(noise, float(MEAN), float(VARIANCE) * float(VARIANCE)); + + #if SHOW_NOISE + COLOR = vec4(noise); + #else + // Ignore these mouse stuff if you're porting this + // and just use an arbitrary intensity value. + float w = float(INTENSITY); + + vec3 grain = vec3(noise) * (1.0 - COLOR.rgb); + + #if BLEND_MODE == 0 + COLOR.rgb += grain * w; + #elif BLEND_MODE == 1 + COLOR.rgb = screen(COLOR.rgb, grain, w); + #elif BLEND_MODE == 2 + COLOR.rgb = overlay(COLOR.rgb, grain, w); + #elif BLEND_MODE == 3 + COLOR.rgb = soft_light(COLOR.rgb, grain, w); + #elif BLEND_MODE == 4 + COLOR.rgb = max(COLOR.rgb, grain * w); + #endif + + #if SRGB + COLOR = pow(COLOR, vec4(1.0 / 2.2)); + #endif + #endif +} diff --git a/Testbed/FilmGrain.gdshader.uid b/Testbed/FilmGrain.gdshader.uid new file mode 100644 index 0000000..594d364 --- /dev/null +++ b/Testbed/FilmGrain.gdshader.uid @@ -0,0 +1 @@ +uid://dlplsrexke1rc diff --git a/Testbed/GridTest.gdshader b/Testbed/GridTest.gdshader index cfdd2c6..946daf9 100644 --- a/Testbed/GridTest.gdshader +++ b/Testbed/GridTest.gdshader @@ -15,22 +15,22 @@ float pristineGrid( vec2 uv, vec2 lineWidth) { vec2 ddx = dFdx(uv); vec2 ddy = dFdy(uv); - + vec2 uvDeriv = vec2(length(vec2(ddx.x, ddy.x)), length(vec2(ddx.y, ddy.y))); bvec2 invertLine = bvec2(lineWidth.x > 0.5, lineWidth.y > 0.5); - + vec2 targetWidth = vec2( invertLine.x ? 1.0 - lineWidth.x : lineWidth.x, invertLine.y ? 1.0 - lineWidth.y : lineWidth.y ); - + vec2 drawWidth = clamp(targetWidth, uvDeriv, vec2(0.5)); vec2 lineAA = uvDeriv * 1.5; vec2 gridUV = abs(fract(uv) * 2.0 - 1.0); - + gridUV.x = invertLine.x ? gridUV.x : 1.0 - gridUV.x; gridUV.y = invertLine.y ? gridUV.y : 1.0 - gridUV.y; - + vec2 grid2 = smoothstep(drawWidth + lineAA, drawWidth - lineAA, gridUV); grid2 *= clamp(targetWidth / drawWidth, 0.0, 1.0); @@ -40,18 +40,18 @@ float pristineGrid( vec2 uv, vec2 lineWidth) return mix(grid2.x, 1.0, grid2.y); } -void vertex() +void vertex() { //UV = VERTEX.xz; } -void fragment() +void fragment() { vec3 grid_0 = vec3(pristineGrid(UV * float(scale_0), vec2(line_scale_0))); vec3 grid_1 = vec3(pristineGrid(UV * float(scale_1), vec2(line_scale_1))); - + vec3 grid_3 = mix(grid_1 * color_1.rgb, grid_0 * color_0.rgb, grid_0); - + ALBEDO = grid_3; ALPHA = 1.5; } \ No newline at end of file diff --git a/Testbed/GridTest.gdshader.uid b/Testbed/GridTest.gdshader.uid new file mode 100644 index 0000000..afa9702 --- /dev/null +++ b/Testbed/GridTest.gdshader.uid @@ -0,0 +1 @@ +uid://dw683olkkdkd4 diff --git a/Testbed/Table.tres b/Testbed/Table.tres index 87172d1..40b9410 100644 --- a/Testbed/Table.tres +++ b/Testbed/Table.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=5 format=3 uid="uid://dv2oo7hlc5nyy"] -[ext_resource type="Shader" path="res://Testbed/DistanceFaceWorld.gdshader" id="1_edhah"] +[ext_resource type="Shader" uid="uid://boiay83j4p11x" path="res://Testbed/DistanceFaceWorld.gdshader" id="1_edhah"] [ext_resource type="Texture2D" uid="uid://cilgpyanfb3a8" path="res://Testbed/textures/wood_table_001_diff_4k.jpg" id="2_hb1x7"] [ext_resource type="Texture2D" uid="uid://diamo44e2x4if" path="res://Testbed/textures/wood_table_001_disp_4k.png" id="3_eyslc"] [ext_resource type="Texture2D" uid="uid://b6ejmikbfrprs" path="res://Testbed/textures/wood_table_001_rough_4k.jpg" id="4_r705j"] @@ -9,14 +9,14 @@ render_priority = 0 shader = ExtResource("1_edhah") shader_parameter/albedo = Color(1, 1, 1, 1) +shader_parameter/texture_albedo = ExtResource("2_hb1x7") shader_parameter/distance_fade_min = 0.0 shader_parameter/distance_fade_max = 0.0 shader_parameter/roughness = 0.8 -shader_parameter/metallic_texture_channel = null +shader_parameter/texture_metallic = ExtResource("3_eyslc") +shader_parameter/metallic_texture_channel = Vector4(0, 0, 0, 0) +shader_parameter/texture_roughness = ExtResource("4_r705j") shader_parameter/specular = 0.6 shader_parameter/metallic = 0.5 shader_parameter/uv1_scale = Vector3(1, 1, 1) shader_parameter/uv1_offset = Vector3(0, 0, 0) -shader_parameter/texture_albedo = ExtResource("2_hb1x7") -shader_parameter/texture_metallic = ExtResource("3_eyslc") -shader_parameter/texture_roughness = ExtResource("4_r705j") diff --git a/Testbed/UIBlur.gdshader.uid b/Testbed/UIBlur.gdshader.uid new file mode 100644 index 0000000..5823a1f --- /dev/null +++ b/Testbed/UIBlur.gdshader.uid @@ -0,0 +1 @@ +uid://nkowetasi3ka diff --git a/Tile/Prefabs/Ant.tres b/Tile/Prefabs/Ant.tres index aa4b7de..7008980 100644 --- a/Tile/Prefabs/Ant.tres +++ b/Tile/Prefabs/Ant.tres @@ -2,8 +2,8 @@ [ext_resource type="Material" uid="uid://cxosyb7s454wj" path="res://InsectTiles/Materials/Ant_Black.tres" id="1_yunq4"] [ext_resource type="Material" uid="uid://cq13vo8hnk7k1" path="res://InsectTiles/Materials/Ant_White.tres" id="2_8sds4"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_n4n55"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourAnt.gd" id="3_thq0t"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_n4n55"] +[ext_resource type="Script" uid="uid://2ya4abv3mp0" path="res://MovementBehaviour/Prefabs/MovementBehaviourAnt.gd" id="3_thq0t"] [ext_resource type="Texture2D" uid="uid://0sqfwl6wjdtl" path="res://InsectTiles/Assets/UI/ant.png" id="4_canjv"] [sub_resource type="Resource" id="Resource_m8bed"] diff --git a/Tile/Prefabs/Bee.tres b/Tile/Prefabs/Bee.tres index 102cbaf..16d5b7e 100644 --- a/Tile/Prefabs/Bee.tres +++ b/Tile/Prefabs/Bee.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="TileResource" load_steps=7 format=3 uid="uid://b70uxn2ofij8y"] [ext_resource type="Material" uid="uid://b5rer8wc62ck3" path="res://InsectTiles/Materials/Bee_Black.tres" id="1_0fgqy"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="1_o55be"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="1_o55be"] [ext_resource type="Material" uid="uid://d4hyq81yydmpr" path="res://InsectTiles/Materials/Bee_White.tres" id="2_qr48e"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourBee.gd" id="3_eudvd"] +[ext_resource type="Script" uid="uid://digwn1f4kkcw" path="res://MovementBehaviour/Prefabs/MovementBehaviourBee.gd" id="3_eudvd"] [ext_resource type="Texture2D" uid="uid://dkfybq7qex2og" path="res://InsectTiles/Assets/UI/bee.png" id="4_1he20"] [sub_resource type="Resource" id="Resource_puwjs"] diff --git a/Tile/Prefabs/Beetle.tres b/Tile/Prefabs/Beetle.tres index 5c9adfc..d373758 100644 --- a/Tile/Prefabs/Beetle.tres +++ b/Tile/Prefabs/Beetle.tres @@ -2,8 +2,8 @@ [ext_resource type="Material" uid="uid://bbx3b1qialq3l" path="res://InsectTiles/Materials/Beetle_Black.tres" id="1_cbjw0"] [ext_resource type="Material" uid="uid://cas4k78kf1c0x" path="res://InsectTiles/Materials/Beetle_White.tres" id="2_txjyp"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_g4s7x"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourBeetle.gd" id="3_ik3ft"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_g4s7x"] +[ext_resource type="Script" uid="uid://cdikwbqk1igh6" path="res://MovementBehaviour/Prefabs/MovementBehaviourBeetle.gd" id="3_ik3ft"] [ext_resource type="Texture2D" uid="uid://dwewgsgd0gasi" path="res://InsectTiles/Assets/UI/beetle.png" id="4_iki3w"] [sub_resource type="Resource" id="Resource_lc7ln"] diff --git a/Tile/Prefabs/Grasshopper.tres b/Tile/Prefabs/Grasshopper.tres index 7250797..6a15a95 100644 --- a/Tile/Prefabs/Grasshopper.tres +++ b/Tile/Prefabs/Grasshopper.tres @@ -2,8 +2,8 @@ [ext_resource type="Material" uid="uid://tbfvmxogabnr" path="res://InsectTiles/Materials/Grasshopper_Black.tres" id="1_vut3o"] [ext_resource type="Material" uid="uid://csuox1kvmm78p" path="res://InsectTiles/Materials/Grasshopper_White.tres" id="2_gc341"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_t3kan"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourGrasshopper.gd" id="3_tid3l"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_t3kan"] +[ext_resource type="Script" uid="uid://ehkjfv3db0ri" path="res://MovementBehaviour/Prefabs/MovementBehaviourGrasshopper.gd" id="3_tid3l"] [ext_resource type="Texture2D" uid="uid://dhnrq0gxmv7cr" path="res://InsectTiles/Assets/UI/grasshopper.png" id="4_tpusd"] [sub_resource type="Resource" id="Resource_ynqk8"] diff --git a/Tile/Prefabs/Ladybug.tres b/Tile/Prefabs/Ladybug.tres index 7930d6f..29ff50d 100644 --- a/Tile/Prefabs/Ladybug.tres +++ b/Tile/Prefabs/Ladybug.tres @@ -2,8 +2,8 @@ [ext_resource type="Material" uid="uid://ymfmmwtlmikl" path="res://InsectTiles/Materials/Ladybug_Black.tres" id="1_1577p"] [ext_resource type="Material" uid="uid://c5oxmuvm8ngp6" path="res://InsectTiles/Materials/Ladybug_White.tres" id="2_6ewhc"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourLadybug.gd" id="3_hgd41"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_kco06"] +[ext_resource type="Script" uid="uid://d3645pthvj5g3" path="res://MovementBehaviour/Prefabs/MovementBehaviourLadybug.gd" id="3_hgd41"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_kco06"] [ext_resource type="Texture2D" uid="uid://c8tm1giuiexap" path="res://InsectTiles/Assets/UI/ladybug.png" id="4_ad3wk"] [sub_resource type="Resource" id="Resource_qjpfb"] diff --git a/Tile/Prefabs/Mosquito.tres b/Tile/Prefabs/Mosquito.tres index 1a5a9c3..21bb6d8 100644 --- a/Tile/Prefabs/Mosquito.tres +++ b/Tile/Prefabs/Mosquito.tres @@ -1,10 +1,10 @@ [gd_resource type="Resource" script_class="TileResource" load_steps=9 format=3 uid="uid://5gxoun8c6a2i"] [ext_resource type="Material" uid="uid://c3cgwluy7660h" path="res://InsectTiles/Materials/Mosquito_Black.tres" id="1_lthri"] -[ext_resource type="Script" path="res://ActionBehaviour/Prefabs/ActionBehaviourMosquito.gd" id="1_v5wo0"] +[ext_resource type="Script" uid="uid://coi3nbnsw8bwb" path="res://ActionBehaviour/Prefabs/ActionBehaviourMosquito.gd" id="1_v5wo0"] [ext_resource type="Material" uid="uid://4d8v7sxf1udv" path="res://InsectTiles/Materials/Mosquito_White.tres" id="2_qdl6y"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_5xhnv"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourMosquito.gd" id="3_gkh5p"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_5xhnv"] +[ext_resource type="Script" uid="uid://dsfx5mx8dyktg" path="res://MovementBehaviour/Prefabs/MovementBehaviourMosquito.gd" id="3_gkh5p"] [ext_resource type="Texture2D" uid="uid://sw4ar13a5qxx" path="res://InsectTiles/Assets/UI/mosquito.png" id="4_rp6ff"] [sub_resource type="Resource" id="Resource_sngyg"] diff --git a/Tile/Prefabs/Pillbug.tres b/Tile/Prefabs/Pillbug.tres index d7506a7..f3eca8a 100644 --- a/Tile/Prefabs/Pillbug.tres +++ b/Tile/Prefabs/Pillbug.tres @@ -1,10 +1,10 @@ [gd_resource type="Resource" script_class="TileResource" load_steps=9 format=3 uid="uid://dk0ndwv8i2rsb"] [ext_resource type="Material" uid="uid://4vol6qmah4dx" path="res://InsectTiles/Materials/Pillbug_Black.tres" id="1_45nom"] -[ext_resource type="Script" path="res://ActionBehaviour/Prefabs/ActionBehaviourPillbug.gd" id="1_mp5qe"] +[ext_resource type="Script" uid="uid://byn6frgu2evpo" path="res://ActionBehaviour/Prefabs/ActionBehaviourPillbug.gd" id="1_mp5qe"] [ext_resource type="Material" uid="uid://drmm6ppt50j7s" path="res://InsectTiles/Materials/Pillbug_White.tres" id="2_b3rd8"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourPillbug.gd" id="3_2v3p1"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_j2ho1"] +[ext_resource type="Script" uid="uid://jwtlsoh3v1j0" path="res://MovementBehaviour/Prefabs/MovementBehaviourPillbug.gd" id="3_2v3p1"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_j2ho1"] [ext_resource type="Texture2D" uid="uid://evg5tvmw8ehl" path="res://InsectTiles/Assets/UI/pillbug.png" id="4_dg5at"] [sub_resource type="Resource" id="Resource_4oq6e"] diff --git a/Tile/Prefabs/Spider.tres b/Tile/Prefabs/Spider.tres index 1b7a804..f79f018 100644 --- a/Tile/Prefabs/Spider.tres +++ b/Tile/Prefabs/Spider.tres @@ -2,8 +2,8 @@ [ext_resource type="Material" uid="uid://csjte7l8m4gwp" path="res://InsectTiles/Materials/Spider_Black.tres" id="1_htbqr"] [ext_resource type="Material" uid="uid://dh2ehs3h106sb" path="res://InsectTiles/Materials/Spider_White.tres" id="2_ji24g"] -[ext_resource type="Script" path="res://MovementBehaviour/Prefabs/MovementBehaviourSpider.gd" id="3_8daio"] -[ext_resource type="Script" path="res://Tile/TileResource.gd" id="3_semk6"] +[ext_resource type="Script" uid="uid://dd003v8tihs6" path="res://MovementBehaviour/Prefabs/MovementBehaviourSpider.gd" id="3_8daio"] +[ext_resource type="Script" uid="uid://q777kkb1yoyp" path="res://Tile/TileResource.gd" id="3_semk6"] [ext_resource type="Texture2D" uid="uid://bgyve5fappdn5" path="res://InsectTiles/Assets/UI/spider.png" id="4_e73ch"] [sub_resource type="Resource" id="Resource_pm2yd"] diff --git a/Tile/Tile.gd.uid b/Tile/Tile.gd.uid new file mode 100644 index 0000000..72e3d34 --- /dev/null +++ b/Tile/Tile.gd.uid @@ -0,0 +1 @@ +uid://cxyrai6as7y1l diff --git a/Tile/TileResource.gd.uid b/Tile/TileResource.gd.uid new file mode 100644 index 0000000..0dad8f1 --- /dev/null +++ b/Tile/TileResource.gd.uid @@ -0,0 +1 @@ +uid://q777kkb1yoyp diff --git a/Tile/hex_outline_bottom.glb.import b/Tile/hex_outline_bottom.glb.import index 1e6d7e9..6e16387 100644 --- a/Tile/hex_outline_bottom.glb.import +++ b/Tile/hex_outline_bottom.glb.import @@ -17,6 +17,8 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,6 +30,7 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "meshes": { diff --git a/Tile/hexagon.glb.import b/Tile/hexagon.glb.import index 41ec832..f7ead2b 100644 --- a/Tile/hexagon.glb.import +++ b/Tile/hexagon.glb.import @@ -17,16 +17,20 @@ nodes/root_type="Node3D" nodes/root_name="Scene Root" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "meshes": { @@ -42,4 +46,5 @@ _subresources={ } } } +gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/Tile/hexagon_outline.glb.import b/Tile/hexagon_outline.glb.import index 6bd6729..8c27b42 100644 --- a/Tile/hexagon_outline.glb.import +++ b/Tile/hexagon_outline.glb.import @@ -17,6 +17,8 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,6 +30,7 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "meshes": { diff --git a/Tile/hexagon_small.glb.import b/Tile/hexagon_small.glb.import index ace00df..4516977 100644 --- a/Tile/hexagon_small.glb.import +++ b/Tile/hexagon_small.glb.import @@ -17,6 +17,8 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,6 +30,7 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "meshes": { diff --git a/Tile/hexagon_small_collision.glb.import b/Tile/hexagon_small_collision.glb.import index e110c78..d5a5c24 100644 --- a/Tile/hexagon_small_collision.glb.import +++ b/Tile/hexagon_small_collision.glb.import @@ -17,6 +17,8 @@ nodes/root_type="" nodes/root_name="" nodes/apply_root_scale=true nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -28,6 +30,7 @@ animation/import=true animation/fps=30 animation/trimming=false animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false import_script/path="" _subresources={ "meshes": { diff --git a/TurnEndBehaviour/Prefabs/TurnEndBehaviourBee.gd.uid b/TurnEndBehaviour/Prefabs/TurnEndBehaviourBee.gd.uid new file mode 100644 index 0000000..579dc6a --- /dev/null +++ b/TurnEndBehaviour/Prefabs/TurnEndBehaviourBee.gd.uid @@ -0,0 +1 @@ +uid://dn2wcr1223yfc diff --git a/TurnEndBehaviour/TurnEndBehaviour.gd.uid b/TurnEndBehaviour/TurnEndBehaviour.gd.uid new file mode 100644 index 0000000..a10bf79 --- /dev/null +++ b/TurnEndBehaviour/TurnEndBehaviour.gd.uid @@ -0,0 +1 @@ +uid://bxg61lt1yhhus diff --git a/TurnTexture.gd.uid b/TurnTexture.gd.uid new file mode 100644 index 0000000..a0cf549 --- /dev/null +++ b/TurnTexture.gd.uid @@ -0,0 +1 @@ +uid://cwmuu385b53nw diff --git a/UI/ActionMoveMenu.gd.uid b/UI/ActionMoveMenu.gd.uid new file mode 100644 index 0000000..20931c1 --- /dev/null +++ b/UI/ActionMoveMenu.gd.uid @@ -0,0 +1 @@ +uid://1qbrnymtbat1 diff --git a/UI/BuildMenu.gd.uid b/UI/BuildMenu.gd.uid new file mode 100644 index 0000000..57546b8 --- /dev/null +++ b/UI/BuildMenu.gd.uid @@ -0,0 +1 @@ +uid://dyikyqxr4bflg diff --git a/UI/CreditsPanel.gd.uid b/UI/CreditsPanel.gd.uid new file mode 100644 index 0000000..35d0bbf --- /dev/null +++ b/UI/CreditsPanel.gd.uid @@ -0,0 +1 @@ +uid://bqpi63kgxiohj diff --git a/UI/GameSettings.gd.uid b/UI/GameSettings.gd.uid new file mode 100644 index 0000000..f6a2765 --- /dev/null +++ b/UI/GameSettings.gd.uid @@ -0,0 +1 @@ +uid://dv3e8l0ecyyke diff --git a/UI/InputInfo.gd.uid b/UI/InputInfo.gd.uid new file mode 100644 index 0000000..05ec9d9 --- /dev/null +++ b/UI/InputInfo.gd.uid @@ -0,0 +1 @@ +uid://damrrrph3vfwm diff --git a/UI/Lobby/LANHost.gd.uid b/UI/Lobby/LANHost.gd.uid new file mode 100644 index 0000000..98c2076 --- /dev/null +++ b/UI/Lobby/LANHost.gd.uid @@ -0,0 +1 @@ +uid://coqok7bd13s7 diff --git a/UI/Lobby/LANJoin.gd.uid b/UI/Lobby/LANJoin.gd.uid new file mode 100644 index 0000000..1402538 --- /dev/null +++ b/UI/Lobby/LANJoin.gd.uid @@ -0,0 +1 @@ +uid://ly63r8i4elic diff --git a/UI/Lobby/LANLobby.gd.uid b/UI/Lobby/LANLobby.gd.uid new file mode 100644 index 0000000..9ddfd28 --- /dev/null +++ b/UI/Lobby/LANLobby.gd.uid @@ -0,0 +1 @@ +uid://yof1j4gldmty diff --git a/UI/Lobby/LANLobby.tscn b/UI/Lobby/LANLobby.tscn index 2a483c2..d47a10f 100644 --- a/UI/Lobby/LANLobby.tscn +++ b/UI/Lobby/LANLobby.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://chu7mm2kn613g"] -[ext_resource type="Script" path="res://UI/Lobby/LANLobby.gd" id="1_cuhs7"] -[ext_resource type="Script" path="res://UI/Lobby/LANJoin.gd" id="2_dcv2l"] -[ext_resource type="Script" path="res://UI/Lobby/LANHost.gd" id="2_ioo6d"] +[ext_resource type="Script" uid="uid://yof1j4gldmty" path="res://UI/Lobby/LANLobby.gd" id="1_cuhs7"] +[ext_resource type="Script" uid="uid://ly63r8i4elic" path="res://UI/Lobby/LANJoin.gd" id="2_dcv2l"] +[ext_resource type="Script" uid="uid://coqok7bd13s7" path="res://UI/Lobby/LANHost.gd" id="2_ioo6d"] [node name="LANLobby" type="Control"] layout_mode = 3 @@ -28,6 +28,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="SelectionMenu" type="MarginContainer" parent="PanelContainer"] +visible = false layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 @@ -53,7 +54,6 @@ layout_mode = 2 text = "Back" [node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] -visible = false layout_mode = 2 theme_override_constants/margin_left = 50 theme_override_constants/margin_top = 50 @@ -137,7 +137,6 @@ disabled = true text = "Start Game" [node name="LANJoin" type="VBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer2"] -visible = false layout_mode = 2 script = ExtResource("2_dcv2l") diff --git a/UI/Lobby/LobbyEntry.gd.uid b/UI/Lobby/LobbyEntry.gd.uid new file mode 100644 index 0000000..70011dd --- /dev/null +++ b/UI/Lobby/LobbyEntry.gd.uid @@ -0,0 +1 @@ +uid://vw51tar7gfb7 diff --git a/UI/Lobby/LobbyEntry.tscn b/UI/Lobby/LobbyEntry.tscn index f686162..3430f84 100644 --- a/UI/Lobby/LobbyEntry.tscn +++ b/UI/Lobby/LobbyEntry.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://b6omw0ynhc15i"] -[ext_resource type="Script" path="res://UI/Lobby/LobbyEntry.gd" id="1_bjjj1"] +[ext_resource type="Script" uid="uid://vw51tar7gfb7" path="res://UI/Lobby/LobbyEntry.gd" id="1_bjjj1"] [node name="LobbyEntry" type="HBoxContainer"] size_flags_vertical = 3 diff --git a/UI/Lobby/WebRTCHost.gd.uid b/UI/Lobby/WebRTCHost.gd.uid new file mode 100644 index 0000000..c212093 --- /dev/null +++ b/UI/Lobby/WebRTCHost.gd.uid @@ -0,0 +1 @@ +uid://cw8hkl6v6sji5 diff --git a/UI/Lobby/WebRTCJoin.gd.uid b/UI/Lobby/WebRTCJoin.gd.uid new file mode 100644 index 0000000..5761afd --- /dev/null +++ b/UI/Lobby/WebRTCJoin.gd.uid @@ -0,0 +1 @@ +uid://6q5xnqxeo3f7 diff --git a/UI/Lobby/WebRTCLobby.gd.uid b/UI/Lobby/WebRTCLobby.gd.uid new file mode 100644 index 0000000..3b2bfa7 --- /dev/null +++ b/UI/Lobby/WebRTCLobby.gd.uid @@ -0,0 +1 @@ +uid://t5ue881kic2o diff --git a/UI/Lobby/WebRTCLobby.tscn b/UI/Lobby/WebRTCLobby.tscn index 5d3b86b..de3ba0c 100644 --- a/UI/Lobby/WebRTCLobby.tscn +++ b/UI/Lobby/WebRTCLobby.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://d1yxx75f8ad2e"] -[ext_resource type="Script" path="res://UI/Lobby/WebRTCLobby.gd" id="1_d0ifh"] -[ext_resource type="Script" path="res://UI/Lobby/WebRTCHost.gd" id="2_h54u8"] -[ext_resource type="Script" path="res://UI/Lobby/WebRTCJoin.gd" id="3_yero6"] +[ext_resource type="Script" uid="uid://t5ue881kic2o" path="res://UI/Lobby/WebRTCLobby.gd" id="1_d0ifh"] +[ext_resource type="Script" uid="uid://cw8hkl6v6sji5" path="res://UI/Lobby/WebRTCHost.gd" id="2_h54u8"] +[ext_resource type="Script" uid="uid://6q5xnqxeo3f7" path="res://UI/Lobby/WebRTCJoin.gd" id="3_yero6"] [node name="WebRtcLobby" type="Control"] layout_mode = 3 diff --git a/UI/Rules/Rules.gd.uid b/UI/Rules/Rules.gd.uid new file mode 100644 index 0000000..d9b6f6d --- /dev/null +++ b/UI/Rules/Rules.gd.uid @@ -0,0 +1 @@ +uid://55vnrxjmpong diff --git a/UI/Settings/Settings.gd.uid b/UI/Settings/Settings.gd.uid new file mode 100644 index 0000000..1f2ef66 --- /dev/null +++ b/UI/Settings/Settings.gd.uid @@ -0,0 +1 @@ +uid://bdybn12x7qwk8 diff --git a/UI/Settings/Settings.tscn b/UI/Settings/Settings.tscn index 0343525..aeabbd7 100644 --- a/UI/Settings/Settings.tscn +++ b/UI/Settings/Settings.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://cua6l3r0yh82y"] -[ext_resource type="Script" path="res://UI/Settings/Settings.gd" id="1_bxt58"] -[ext_resource type="Shader" path="res://Testbed/UIBlur.gdshader" id="1_gnf7a"] +[ext_resource type="Script" uid="uid://bdybn12x7qwk8" path="res://UI/Settings/Settings.gd" id="1_bxt58"] +[ext_resource type="Shader" uid="uid://nkowetasi3ka" path="res://Testbed/UIBlur.gdshader" id="1_gnf7a"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_2dtbe"] shader = ExtResource("1_gnf7a") @@ -62,9 +62,11 @@ layout_mode = 2 [node name="TabContainer" type="TabContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 +current_tab = 0 [node name="General" type="PanelContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer/TabContainer"] layout_mode = 2 +metadata/_tab_index = 0 [node name="MarginContainer" type="MarginContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer/TabContainer/General"] layout_mode = 2 @@ -104,6 +106,7 @@ fit_content = true [node name="Graphics" type="PanelContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer/TabContainer"] visible = false layout_mode = 2 +metadata/_tab_index = 1 [node name="MarginContainer" type="MarginContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer/TabContainer/Graphics"] layout_mode = 2 @@ -132,6 +135,7 @@ button_pressed = true [node name="Controls" type="PanelContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer/TabContainer"] visible = false layout_mode = 2 +metadata/_tab_index = 2 [node name="MarginContainer" type="MarginContainer" parent="Pivot/MarginContainer/PanelContainer/MarginContainer/VBoxContainer/TabContainer/Controls"] layout_mode = 2 diff --git a/UI/Table/Table.gd.uid b/UI/Table/Table.gd.uid new file mode 100644 index 0000000..7d375f1 --- /dev/null +++ b/UI/Table/Table.gd.uid @@ -0,0 +1 @@ +uid://c0euixwrxqct6 diff --git a/UI/TestBG/InsectSprite.tscn b/UI/TestBG/InsectSprite.tscn new file mode 100644 index 0000000..5f59070 --- /dev/null +++ b/UI/TestBG/InsectSprite.tscn @@ -0,0 +1,7 @@ +[gd_scene load_steps=2 format=3 uid="uid://b5w6sbmjalthh"] + +[ext_resource type="Script" uid="uid://d7wntyuu1fcl" path="res://UI/TestBG/insect_sprite.gd" id="1_k4jda"] + +[node name="InsectSprite" type="Sprite2D"] +scale = Vector2(0.1, 0.1) +script = ExtResource("1_k4jda") diff --git a/UI/TestBG/insect_sprite.gd b/UI/TestBG/insect_sprite.gd new file mode 100644 index 0000000..f02646b --- /dev/null +++ b/UI/TestBG/insect_sprite.gd @@ -0,0 +1,13 @@ +extends Node2D + +var rotation_speed: float = 0.0 + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + rotation_speed = randf_range(-PI/4.0, PI/4.0) + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + rotation += rotation_speed * 0.01 diff --git a/UI/TestBG/insect_sprite.gd.uid b/UI/TestBG/insect_sprite.gd.uid new file mode 100644 index 0000000..715eaba --- /dev/null +++ b/UI/TestBG/insect_sprite.gd.uid @@ -0,0 +1 @@ +uid://d7wntyuu1fcl diff --git a/UI/join_menu.gd.uid b/UI/join_menu.gd.uid new file mode 100644 index 0000000..74e698d --- /dev/null +++ b/UI/join_menu.gd.uid @@ -0,0 +1 @@ +uid://dvcw45nqsgskd diff --git a/UI/main_menu.gd b/UI/main_menu.gd index 1c85b4e..8fea482 100644 --- a/UI/main_menu.gd +++ b/UI/main_menu.gd @@ -6,8 +6,21 @@ extends Control const SETTINGS = preload("res://UI/Settings/Settings.tscn") const RULES = preload("res://UI/Rules/Rules.tscn") -@onready var credits_panel = $CreditsPanel +const ANT = preload("res://InsectTiles/Assets/UI/ant.png") +const BEE = preload("res://InsectTiles/Assets/UI/bee.png") +const BEETLE = preload("res://InsectTiles/Assets/UI/beetle.png") +const GRASSHOPPER = preload("res://InsectTiles/Assets/UI/grasshopper.png") +const HEX_WHITE = preload("res://InsectTiles/Assets/UI/hex_white.svg") +const LADYBUG = preload("res://InsectTiles/Assets/UI/ladybug.png") +const MOSQUITO = preload("res://InsectTiles/Assets/UI/mosquito.png") +const PILLBUG = preload("res://InsectTiles/Assets/UI/pillbug.png") +const SPIDER = preload("res://InsectTiles/Assets/UI/spider.png") +const INSECTS_UI = [ANT, BEE, BEETLE, GRASSHOPPER, LADYBUG, MOSQUITO, PILLBUG, SPIDER] +@onready var insects: Node2D = $Insects + +@onready var credits_panel = $CreditsPanel +const INSECT_SPRITE = preload("res://UI/TestBG/InsectSprite.tscn") # Called when the node enters the scene tree for the first time. func _ready() -> void: if OS.has_feature("web"): @@ -17,6 +30,31 @@ func _ready() -> void: #WSClient.lobby_joined.connect(_on_lobby_joined) Networking.offline_mode() GameData.reset() + + get_viewport().size_changed.connect(resize) + resize() + +func resize() -> void: + var _size = get_viewport().size + print(_size) + + var center = _size / 2 + _create_insects(center) + +func _create_insects(center: Vector2i) -> void: + # For circle + var circle_position = Vector2i(center.x, center.y) + var circle_radius = max(center.x, center.y) + var points = PoissonDiscSampling.generate_points_for_circle(circle_position, circle_radius, 150, 30) + + for insect in insects.get_children(): + insect.queue_free() + + for point in points: + var sprite = INSECT_SPRITE.instantiate() + insects.add_child(sprite) + sprite.texture = INSECTS_UI.pick_random() + sprite.position = point func _on_lobby_joined(lobby: String) -> void: GameData.lobby_code = lobby diff --git a/UI/main_menu.gd.uid b/UI/main_menu.gd.uid new file mode 100644 index 0000000..b55742a --- /dev/null +++ b/UI/main_menu.gd.uid @@ -0,0 +1 @@ +uid://dwo703usndog7 diff --git a/UI/main_menu.tscn b/UI/main_menu.tscn index a271235..16ef422 100644 --- a/UI/main_menu.tscn +++ b/UI/main_menu.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=6 format=3 uid="uid://dogu37xma5vsp"] +[gd_scene load_steps=7 format=3 uid="uid://dogu37xma5vsp"] -[ext_resource type="Script" path="res://UI/main_menu.gd" id="1_q3q3u"] -[ext_resource type="Script" path="res://DisconnectInfo.gd" id="2_2fkdc"] -[ext_resource type="Script" path="res://UI/CreditsPanel.gd" id="3_16j20"] +[ext_resource type="Script" uid="uid://dwo703usndog7" path="res://UI/main_menu.gd" id="1_q3q3u"] +[ext_resource type="Script" uid="uid://ckbcjqlo333jm" path="res://DisconnectInfo.gd" id="2_2fkdc"] +[ext_resource type="Script" uid="uid://bqpi63kgxiohj" path="res://UI/CreditsPanel.gd" id="3_16j20"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_47fa1"] bg_color = Color(0, 0, 0, 1) @@ -10,6 +10,9 @@ bg_color = Color(0, 0, 0, 1) [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6jy8e"] bg_color = Color(0.25098, 0.25098, 0.25098, 1) +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ah4bq"] +bg_color = Color(0.423529, 0.2, 0.184314, 1) + [node name="MainMenu" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -36,7 +39,7 @@ grow_vertical = 2 [node name="Label" type="Label" parent="VBoxContainer"] layout_mode = 2 theme_override_font_sizes/font_size = 32 -text = "" +text = "Swarm" horizontal_alignment = 1 [node name="PanelContainer" type="PanelContainer" parent="VBoxContainer"] @@ -280,6 +283,21 @@ fit_content = true layout_mode = 2 text = "Close" +[node name="CanvasLayer" type="CanvasLayer" parent="."] +layer = -1 + +[node name="Panel" type="Panel" parent="CanvasLayer"] +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +mouse_filter = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_ah4bq") + +[node name="Insects" type="Node2D" parent="."] +z_index = -1 + [connection signal="pressed" from="VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/HostButton" to="." method="_on_host_button_pressed"] [connection signal="pressed" from="VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/JoinButton" to="." method="_on_join_button_pressed"] [connection signal="pressed" from="VBoxContainer/PanelContainer/MarginContainer/VBoxContainer/SingleplayerButton" to="." method="_on_rules_button_pressed"] diff --git a/WebLightChecker.gd b/WebLightChecker.gd index 346bef0..692ae04 100644 --- a/WebLightChecker.gd +++ b/WebLightChecker.gd @@ -1,12 +1,12 @@ extends DirectionalLight3D -# Called when the node enters the scene tree for the first time. -func _ready(): - if OS.has_feature("web"): - light_color /= PI +## Called when the node enters the scene tree for the first time. +#func _ready(): + #if OS.has_feature("web"): + #light_color /= PI # Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta): - pass +#func _process(delta): + #pass diff --git a/WebLightChecker.gd.uid b/WebLightChecker.gd.uid new file mode 100644 index 0000000..772b7a1 --- /dev/null +++ b/WebLightChecker.gd.uid @@ -0,0 +1 @@ +uid://dc6l065gaaifu diff --git a/WorldEnvSettings.gd.uid b/WorldEnvSettings.gd.uid new file mode 100644 index 0000000..1d2f674 --- /dev/null +++ b/WorldEnvSettings.gd.uid @@ -0,0 +1 @@ +uid://ehiq0b0tlcgu diff --git a/addons/PoissonDiscSampling/Demo/polygon_demo.gd b/addons/PoissonDiscSampling/Demo/polygon_demo.gd new file mode 100644 index 0000000..a75afbd --- /dev/null +++ b/addons/PoissonDiscSampling/Demo/polygon_demo.gd @@ -0,0 +1,30 @@ +extends Node2D + + +@onready var polygon: Array = $Polygon2D.polygon +@onready var n = polygon.size() + +var p_radius: int = 20 +var k: int = 0 +var points := [] + + +func _draw() -> void: + for i in n: + draw_line(polygon[i], polygon[(i+1)%n], Color(1,1,0), 2, 1) + + draw_circle(points[k], p_radius / 2, Color( 1, 0, 0, 1 )) + draw_circle(points[k], 2, Color( 1, 1, 0, 1 )) + + +func _ready() -> void: + var start_time = Time.get_ticks_msec() + points = PoissonDiscSampling.generate_points_for_polygon($Polygon2D.polygon, p_radius, 30) +# points = PoissonDiscSampling.generate_points_for_circle(Vector2(300,300),200, p_radius, 30) + print(points.size(), " points generated in ", Time.get_ticks_msec() - start_time, " miliseconds" ) + + +func _process(delta: float) -> void: + if k < points.size() - 1: + queue_redraw() + k += 1 diff --git a/addons/PoissonDiscSampling/Demo/polygon_demo.gd.uid b/addons/PoissonDiscSampling/Demo/polygon_demo.gd.uid new file mode 100644 index 0000000..30de919 --- /dev/null +++ b/addons/PoissonDiscSampling/Demo/polygon_demo.gd.uid @@ -0,0 +1 @@ +uid://ckgdl8g835gsm diff --git a/addons/PoissonDiscSampling/Demo/polygon_demo.tscn b/addons/PoissonDiscSampling/Demo/polygon_demo.tscn new file mode 100644 index 0000000..90a8a9c --- /dev/null +++ b/addons/PoissonDiscSampling/Demo/polygon_demo.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=2 format=3 uid="uid://c74o3ucws2ac4"] + +[ext_resource type="Script" path="res://addons/PoissonDiscSampling/Demo/polygon_demo.gd" id="1_3y3ej"] + +[node name="SubViewportContainer" type="SubViewportContainer"] +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="SubViewport" type="SubViewport" parent="."] +handle_input_locally = false +size = Vector2i(1152, 648) +render_target_clear_mode = 1 +render_target_update_mode = 4 + +[node name="PolygonDemo" type="Node2D" parent="SubViewport"] +script = ExtResource("1_3y3ej") + +[node name="Polygon2D" type="Polygon2D" parent="SubViewport/PolygonDemo"] +color = Color(1, 1, 1, 0) +antialiased = true +polygon = PackedVector2Array(123, 266, 378, 26, 682, 157, 1002, 118, 1077, 424, 747, 541, 843, 302, 810, 217, 553, 446, 468, 227, 430, 560, 103, 560, 261, 475, 361, 268) diff --git a/addons/PoissonDiscSampling/poisson_disc_sampling.gd b/addons/PoissonDiscSampling/poisson_disc_sampling.gd new file mode 100644 index 0000000..cba5c9e --- /dev/null +++ b/addons/PoissonDiscSampling/poisson_disc_sampling.gd @@ -0,0 +1,114 @@ +class_name PoissonDiscSampling + + +enum ShapeType {CIRCLE, POLYGON} +static var shape_info: Dictionary + + +static func generate_points_for_circle(circle_position: Vector2, circle_radius: float, poisson_radius: float, retries: int, start_point := Vector2.INF) -> PackedVector2Array: + var sample_region_rect = Rect2(circle_position.x - circle_radius, circle_position.y - circle_radius, circle_radius * 2, circle_radius * 2) + if start_point.x == INF: + var angle: float = 2 * PI * randf() + start_point = circle_position + Vector2(cos(angle), sin(angle)) * circle_radius * randf() + elif not Geometry2D.is_point_in_circle(start_point, circle_position, circle_radius): + push_error("Starting point ", start_point, " is not a valid point inside the circle!") + return PackedVector2Array() + + shape_info[ShapeType.CIRCLE] = { + "circle_position": circle_position, + "circle_radius": circle_radius + } + return _generate_points(ShapeType.CIRCLE, sample_region_rect, poisson_radius, retries, start_point) + + +static func generate_points_for_polygon(polygon: PackedVector2Array, poisson_radius: float, retries: int, start_point := Vector2.INF) -> PackedVector2Array: + var start: Vector2 = polygon[0] + var end: Vector2 = polygon[0] + for i in range(1, polygon.size()): + start.x = min(start.x, polygon[i].x) + start.y = min(start.y, polygon[i].y) + end.x = max(end.x, polygon[i].x) + end.y = max(end.y, polygon[i].y) + var sample_region_rect = Rect2(start, end - start) + + if start_point.x == INF: + var n: int = polygon.size() + var i: int = randi() % n + start_point = polygon[i] + (polygon[(i + 1) % n] - polygon[i]) * randf() + elif not Geometry2D.is_point_in_polygon(start_point, polygon): + push_error("Starting point ", start_point, " is not a valid point inside the polygon!") + return PackedVector2Array() + + shape_info[ShapeType.POLYGON] = {"points" = polygon} + return _generate_points(ShapeType.POLYGON, sample_region_rect, poisson_radius, retries, start_point) + + +static func _generate_points(shape: int, sample_region_rect: Rect2, poisson_radius: float, retries: int, start_pos: Vector2) -> PackedVector2Array: + var points: PackedVector2Array = PackedVector2Array() + points.clear() + var cell_size: float = poisson_radius / sqrt(2) + var cols: int = max(floor(sample_region_rect.size.x / cell_size), 1) + var rows: int = max(floor(sample_region_rect.size.y / cell_size), 1) + + # scale the cell size in each axis + var cell_size_scaled: Vector2 + cell_size_scaled.x = sample_region_rect.size.x / cols + cell_size_scaled.y = sample_region_rect.size.y / rows + + # use tranpose to map points starting from origin to calculate grid position + var transpose = -sample_region_rect.position + + var grid: Array = [] + for i in cols: + grid.append([]) + for j in rows: + grid[i].append(-1) + + var spawn_points: Array = [] + spawn_points.append(start_pos) + + while spawn_points.size() > 0: + var spawn_index: int = randi() % spawn_points.size() + var spawn_centre: Vector2 = spawn_points[spawn_index] + var sample_accepted: bool = false + for i in retries: + var angle: float = 2 * PI * randf() + var sample: Vector2 = spawn_centre + Vector2(cos(angle), sin(angle)) * (poisson_radius + poisson_radius * randf()) + if _is_point_in_sample_region(sample, shape): + if _is_valid_sample(shape, sample, transpose, cell_size_scaled, cols, rows, grid, points, poisson_radius): + var cell: Vector2 = Vector2(int((transpose.x + sample.x) / cell_size_scaled.x), int((transpose.y + sample.y) / cell_size_scaled.y)) + # fix: https://github.com/udit/poisson-disc-sampling/issues/3 + if cell.x < cols and cell.y < rows: + grid[cell.x][cell.y] = points.size() + points.append(sample) + spawn_points.append(sample) + sample_accepted = true + break + if not sample_accepted and points.size() > 0: + spawn_points.remove_at(spawn_index) + return points + + +static func _is_valid_sample(shape: int, sample: Vector2, transpose: Vector2, cell_size_scaled: Vector2, cols: int, rows: int, grid: Array, points: Array, poisson_radius: float) -> bool: + var cell := Vector2(int((transpose.x + sample.x) / cell_size_scaled.x), int((transpose.y + sample.y) / cell_size_scaled.y)) + var cell_start := Vector2(max(0, cell.x - 2), max(0, cell.y - 2)) + var cell_end := Vector2(min(cell.x + 2, cols - 1), min(cell.y + 2, rows - 1)) + + for i in range(cell_start.x, cell_end.x + 1): + for j in range(cell_start.y, cell_end.y + 1): + var search_index: int = grid[i][j] + if search_index != -1: + var dist: float = points[search_index].distance_to(sample) + if dist < poisson_radius: + return false + return true + + +static func _is_point_in_sample_region(sample: Vector2, shape: int) -> bool: + if shape == ShapeType.POLYGON and Geometry2D.is_point_in_polygon(sample, shape_info[shape]["points"]): + return true + elif shape == ShapeType.CIRCLE and Geometry2D.is_point_in_circle(sample, shape_info[shape]["circle_position"], shape_info[shape]["circle_radius"]): + return true + else: + return false + diff --git a/addons/PoissonDiscSampling/poisson_disc_sampling.gd.uid b/addons/PoissonDiscSampling/poisson_disc_sampling.gd.uid new file mode 100644 index 0000000..fa9464f --- /dev/null +++ b/addons/PoissonDiscSampling/poisson_disc_sampling.gd.uid @@ -0,0 +1 @@ +uid://cvht6xa8n4xvg diff --git a/addons/awesome_input_icons/InputIcon.gd.uid b/addons/awesome_input_icons/InputIcon.gd.uid new file mode 100644 index 0000000..6320f4f --- /dev/null +++ b/addons/awesome_input_icons/InputIcon.gd.uid @@ -0,0 +1 @@ +uid://dtrgkhmh6rdub diff --git a/addons/awesome_input_icons/awesome_input_icons.gd.uid b/addons/awesome_input_icons/awesome_input_icons.gd.uid new file mode 100644 index 0000000..f982e00 --- /dev/null +++ b/addons/awesome_input_icons/awesome_input_icons.gd.uid @@ -0,0 +1 @@ +uid://jljwkxt757na diff --git a/addons/awesome_input_icons/classes/InputIconSprite2D.gd.uid b/addons/awesome_input_icons/classes/InputIconSprite2D.gd.uid new file mode 100644 index 0000000..acf64b0 --- /dev/null +++ b/addons/awesome_input_icons/classes/InputIconSprite2D.gd.uid @@ -0,0 +1 @@ +uid://dw6c8e4ha6c0u diff --git a/addons/awesome_input_icons/classes/InputIconTextureRect.gd.uid b/addons/awesome_input_icons/classes/InputIconTextureRect.gd.uid new file mode 100644 index 0000000..d26e849 --- /dev/null +++ b/addons/awesome_input_icons/classes/InputIconTextureRect.gd.uid @@ -0,0 +1 @@ +uid://go64dt8gl8gy diff --git a/addons/awesome_input_icons/resources/scripts/InputIconScheme.gd.uid b/addons/awesome_input_icons/resources/scripts/InputIconScheme.gd.uid new file mode 100644 index 0000000..a50846e --- /dev/null +++ b/addons/awesome_input_icons/resources/scripts/InputIconScheme.gd.uid @@ -0,0 +1 @@ +uid://bqi6n0pu0w6kb diff --git a/addons/awesome_input_icons/resources/scripts/KeyIcon.gd.uid b/addons/awesome_input_icons/resources/scripts/KeyIcon.gd.uid new file mode 100644 index 0000000..292eee3 --- /dev/null +++ b/addons/awesome_input_icons/resources/scripts/KeyIcon.gd.uid @@ -0,0 +1 @@ +uid://bd3kf8ujt6p16 diff --git a/addons/awesome_input_icons/resources/scripts/configuration.gd.uid b/addons/awesome_input_icons/resources/scripts/configuration.gd.uid new file mode 100644 index 0000000..9f0bcf7 --- /dev/null +++ b/addons/awesome_input_icons/resources/scripts/configuration.gd.uid @@ -0,0 +1 @@ +uid://rs374yrjy620 diff --git a/addons/debug_menu/debug_menu.gd.uid b/addons/debug_menu/debug_menu.gd.uid new file mode 100644 index 0000000..74bd820 --- /dev/null +++ b/addons/debug_menu/debug_menu.gd.uid @@ -0,0 +1 @@ +uid://cfnbgy105dppi diff --git a/addons/debug_menu/plugin.gd.uid b/addons/debug_menu/plugin.gd.uid new file mode 100644 index 0000000..22327f2 --- /dev/null +++ b/addons/debug_menu/plugin.gd.uid @@ -0,0 +1 @@ +uid://d1ywuh58llyf2 diff --git a/addons/script-ide/Popup.gd.uid b/addons/script-ide/Popup.gd.uid new file mode 100644 index 0000000..9d3f4ac --- /dev/null +++ b/addons/script-ide/Popup.gd.uid @@ -0,0 +1 @@ +uid://bv5t04c0f3yyg diff --git a/addons/script-ide/plugin.gd.uid b/addons/script-ide/plugin.gd.uid new file mode 100644 index 0000000..a0cab00 --- /dev/null +++ b/addons/script-ide/plugin.gd.uid @@ -0,0 +1 @@ +uid://bvmoa4p7lhct6 diff --git a/export_presets.cfg b/export_presets.cfg index 08b611a..4ba9d5a 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -3,6 +3,7 @@ name="Web" platform="Web" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -13,12 +14,14 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.0.options] custom_template/debug="" custom_template/release="" variant/extensions_support=false +variant/thread_support=false vram_texture_compression/for_desktop=true vram_texture_compression/for_mobile=false html/export_icon=true @@ -28,6 +31,7 @@ html/canvas_resize_policy=2 html/focus_canvas_on_start=true html/experimental_virtual_keyboard=false progressive_web_app/enabled=false +progressive_web_app/ensure_cross_origin_isolation_headers=true progressive_web_app/offline_page="" progressive_web_app/display=1 progressive_web_app/orientation=0 @@ -41,6 +45,7 @@ progressive_web_app/background_color=Color(0, 0, 0, 1) name="Windows Desktop" platform="Windows Desktop" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -51,6 +56,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.1.options] @@ -58,10 +64,8 @@ custom_template/debug="" custom_template/release="" debug/export_console_wrapper=1 binary_format/embed_pck=false -texture_format/bptc=true -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false binary_format/architecture="x86_64" codesign/enable=false codesign/timestamp=true @@ -81,6 +85,8 @@ application/file_description="" application/copyright="" application/trademarks="" application/export_angle=0 +application/export_d3d12=0 +application/d3d12_agility_sdk_multiarch=true ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" ssh_remote_deploy/port="22" @@ -98,12 +104,17 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi 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}'" +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false [preset.2] name="Linux/X11" -platform="Linux/X11" +platform="Linux" runnable=true +advanced_options=false dedicated_server=false custom_features="" export_filter="all_resources" @@ -114,6 +125,7 @@ encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false +script_export_mode=2 [preset.2.options] @@ -121,10 +133,8 @@ custom_template/debug="" custom_template/release="" debug/export_console_wrapper=1 binary_format/embed_pck=false -texture_format/bptc=true -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false binary_format/architecture="x86_64" ssh_remote_deploy/enabled=false ssh_remote_deploy/host="user@host_ip" @@ -138,3 +148,7 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") rm -rf \"{temp_dir}\"" +texture_format/bptc=true +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false diff --git a/free_look_camera.gd.uid b/free_look_camera.gd.uid new file mode 100644 index 0000000..ac163b0 --- /dev/null +++ b/free_look_camera.gd.uid @@ -0,0 +1 @@ +uid://c2fq48nsley30 diff --git a/hex_outline.res b/hex_outline.res index 3146aa8..0e27444 100644 Binary files a/hex_outline.res and b/hex_outline.res differ diff --git a/hex_outline.tscn b/hex_outline.tscn index f0d1f5e..239a4e9 100644 --- a/hex_outline.tscn +++ b/hex_outline.tscn @@ -1,13 +1,17 @@ -[gd_scene load_steps=6 format=3 uid="uid://y2t5rrkvs0c0"] +[gd_scene load_steps=7 format=3 uid="uid://y2t5rrkvs0c0"] -[ext_resource type="Script" path="res://HexOutline.gd" id="1_cbscl"] +[ext_resource type="Script" uid="uid://rbug8ibnb87v" path="res://HexOutline.gd" id="1_cbscl"] [ext_resource type="ArrayMesh" uid="uid://cocujjycabbp3" path="res://hex_outline.res" id="2_hwabu"] -[ext_resource type="Script" path="res://MeshBreather.gd" id="3_6b28p"] +[ext_resource type="Script" uid="uid://btn30al6m0cfa" path="res://MeshBreather.gd" id="3_6b28p"] [ext_resource type="ArrayMesh" uid="uid://2hoclmeiswwf" path="res://hex_outline_bottom.res" id="4_lr4wm"] [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_uta8s"] data = PackedVector3Array(-0.25, 0.4004, 0.433014, 0.25, 0.000399577, 0.433014, -0.25, 0.000399577, 0.433014, -0.25, 0.4004, 0.433014, 0.25, 0.4004, 0.433014, 0.25, 0.000399577, 0.433014, -0.25, 0.4004, -0.433014, -0.5, 0.000399577, 0, -0.25, 0.000399577, -0.433014, -0.25, 0.4004, -0.433014, -0.5, 0.4004, 0, -0.5, 0.000399577, 0, 0.5, 0.4004, 0, 0.25, 0.000399577, -0.433014, 0.5, 0.000399577, 0, 0.5, 0.4004, 0, 0.25, 0.4004, -0.433014, 0.25, 0.000399577, -0.433014, 0.25, 0.4004, 0.433014, 0.25, 0.4004, -0.433014, 0.5, 0.4004, 0, 0.25, 0.4004, -0.433014, -0.5, 0.4004, 0, -0.25, 0.4004, -0.433014, -0.5, 0.4004, 0, 0.25, 0.4004, 0.433014, -0.25, 0.4004, 0.433014, 0.25, 0.4004, -0.433014, 0.25, 0.4004, 0.433014, -0.5, 0.4004, 0, 0.25, 0.4004, 0.433014, 0.5, 0.000399577, 0, 0.25, 0.000399577, 0.433014, 0.25, 0.4004, 0.433014, 0.5, 0.4004, 0, 0.5, 0.000399577, 0, 0.25, 0.4004, -0.433014, -0.25, 0.000399577, -0.433014, 0.25, 0.000399577, -0.433014, 0.25, 0.4004, -0.433014, -0.25, 0.4004, -0.433014, -0.25, 0.000399577, -0.433014, 0.5, 0.000399577, 0, -0.25, 0.000399577, 0.433014, 0.25, 0.000399577, 0.433014, -0.25, 0.000399577, 0.433014, -0.25, 0.000399577, -0.433014, -0.5, 0.000399577, 0, -0.25, 0.000399577, -0.433014, 0.5, 0.000399577, 0, 0.25, 0.000399577, -0.433014, -0.25, 0.000399577, 0.433014, 0.5, 0.000399577, 0, -0.25, 0.000399577, -0.433014, -0.5, 0.4004, 0, -0.25, 0.000399577, 0.433014, -0.5, 0.000399577, 0, -0.5, 0.4004, 0, -0.25, 0.4004, 0.433014, -0.25, 0.000399577, 0.433014) +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tu70t"] +transparency = 1 +albedo_color = Color(0.133333, 0.592157, 0, 0.607843) + [node name="HexOutline" type="Area3D"] monitoring = false script = ExtResource("1_cbscl") @@ -23,6 +27,7 @@ script = ExtResource("3_6b28p") [node name="HexOutlineBottom" type="MeshInstance3D" parent="Mesh"] mesh = ExtResource("4_lr4wm") skeleton = NodePath("../../../..") +surface_material_override/0 = SubResource("StandardMaterial3D_tu70t") [connection signal="input_event" from="." to="." method="_on_input_event"] [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"] diff --git a/hex_outline_bottom.res b/hex_outline_bottom.res index b4acd19..7262cd4 100644 Binary files a/hex_outline_bottom.res and b/hex_outline_bottom.res differ diff --git a/hexagon.res b/hexagon.res index e7be2d0..447b148 100644 Binary files a/hexagon.res and b/hexagon.res differ diff --git a/hexagon_small.res b/hexagon_small.res index b587ca9..a0892bc 100644 Binary files a/hexagon_small.res and b/hexagon_small.res differ diff --git a/hexagon_small_collision.res b/hexagon_small_collision.res index d3ddc47..70b9da5 100644 Binary files a/hexagon_small_collision.res and b/hexagon_small_collision.res differ diff --git a/project.godot b/project.godot index 2fea3d2..a99cabe 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Swarm" run/main_scene="res://UI/main_menu.tscn" -config/features=PackedStringArray("4.2", "Mobile") +config/features=PackedStringArray("4.4", "Mobile") config/icon="res://icon.svg" [autoload] @@ -36,22 +36,22 @@ place_tile={ } camera_up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":119,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":119,"location":0,"echo":false,"script":null) ] } camera_left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":97,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":97,"location":0,"echo":false,"script":null) ] } camera_right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":100,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":100,"location":0,"echo":false,"script":null) ] } camera_down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":115,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":115,"location":0,"echo":false,"script":null) ] } zoom_camera_in={ @@ -81,7 +81,7 @@ select_tile={ } toggle_controls={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":104,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"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":104,"location":0,"echo":false,"script":null) ] } diff --git a/webrtc/lib/libwebrtc_native.android.template_debug.arm64.so b/webrtc/lib/libwebrtc_native.android.template_debug.arm64.so index fc45b56..d53ddf6 100644 Binary files a/webrtc/lib/libwebrtc_native.android.template_debug.arm64.so and b/webrtc/lib/libwebrtc_native.android.template_debug.arm64.so differ diff --git a/webrtc/lib/libwebrtc_native.android.template_debug.x86_64.so b/webrtc/lib/libwebrtc_native.android.template_debug.x86_64.so index 081fe35..ecd8481 100644 Binary files a/webrtc/lib/libwebrtc_native.android.template_debug.x86_64.so and b/webrtc/lib/libwebrtc_native.android.template_debug.x86_64.so differ diff --git a/webrtc/lib/libwebrtc_native.android.template_release.arm64.so b/webrtc/lib/libwebrtc_native.android.template_release.arm64.so index e438270..bfb60a6 100644 Binary files a/webrtc/lib/libwebrtc_native.android.template_release.arm64.so and b/webrtc/lib/libwebrtc_native.android.template_release.arm64.so differ diff --git a/webrtc/lib/libwebrtc_native.android.template_release.x86_64.so b/webrtc/lib/libwebrtc_native.android.template_release.x86_64.so index e5bdcc1..13cdad1 100644 Binary files a/webrtc/lib/libwebrtc_native.android.template_release.x86_64.so and b/webrtc/lib/libwebrtc_native.android.template_release.x86_64.so differ diff --git a/webrtc/lib/libwebrtc_native.ios.template_debug.arm64.dylib b/webrtc/lib/libwebrtc_native.ios.template_debug.arm64.dylib index bdf5e35..c072ada 100644 Binary files a/webrtc/lib/libwebrtc_native.ios.template_debug.arm64.dylib and b/webrtc/lib/libwebrtc_native.ios.template_debug.arm64.dylib differ diff --git a/webrtc/lib/libwebrtc_native.ios.template_debug.x86_64.simulator.dylib b/webrtc/lib/libwebrtc_native.ios.template_debug.x86_64.simulator.dylib index 2d8db21..c53f74a 100644 Binary files a/webrtc/lib/libwebrtc_native.ios.template_debug.x86_64.simulator.dylib and b/webrtc/lib/libwebrtc_native.ios.template_debug.x86_64.simulator.dylib differ diff --git a/webrtc/lib/libwebrtc_native.ios.template_release.arm64.dylib b/webrtc/lib/libwebrtc_native.ios.template_release.arm64.dylib index 9389e03..e79ff0f 100644 Binary files a/webrtc/lib/libwebrtc_native.ios.template_release.arm64.dylib and b/webrtc/lib/libwebrtc_native.ios.template_release.arm64.dylib differ diff --git a/webrtc/lib/libwebrtc_native.ios.template_release.x86_64.simulator.dylib b/webrtc/lib/libwebrtc_native.ios.template_release.x86_64.simulator.dylib index f1cbbfb..1b06bb6 100644 Binary files a/webrtc/lib/libwebrtc_native.ios.template_release.x86_64.simulator.dylib and b/webrtc/lib/libwebrtc_native.ios.template_release.x86_64.simulator.dylib differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_debug.arm32.so b/webrtc/lib/libwebrtc_native.linux.template_debug.arm32.so new file mode 100644 index 0000000..5300ea7 Binary files /dev/null and b/webrtc/lib/libwebrtc_native.linux.template_debug.arm32.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_debug.arm64.so b/webrtc/lib/libwebrtc_native.linux.template_debug.arm64.so new file mode 100644 index 0000000..aa96921 Binary files /dev/null and b/webrtc/lib/libwebrtc_native.linux.template_debug.arm64.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_debug.x86_32.so b/webrtc/lib/libwebrtc_native.linux.template_debug.x86_32.so index 67988b9..f08e473 100644 Binary files a/webrtc/lib/libwebrtc_native.linux.template_debug.x86_32.so and b/webrtc/lib/libwebrtc_native.linux.template_debug.x86_32.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_debug.x86_64.so b/webrtc/lib/libwebrtc_native.linux.template_debug.x86_64.so index 9d647fc..8e1fbcb 100644 Binary files a/webrtc/lib/libwebrtc_native.linux.template_debug.x86_64.so and b/webrtc/lib/libwebrtc_native.linux.template_debug.x86_64.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_release.arm32.so b/webrtc/lib/libwebrtc_native.linux.template_release.arm32.so new file mode 100644 index 0000000..a51deaa Binary files /dev/null and b/webrtc/lib/libwebrtc_native.linux.template_release.arm32.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_release.arm64.so b/webrtc/lib/libwebrtc_native.linux.template_release.arm64.so new file mode 100644 index 0000000..878abb0 Binary files /dev/null and b/webrtc/lib/libwebrtc_native.linux.template_release.arm64.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_release.x86_32.so b/webrtc/lib/libwebrtc_native.linux.template_release.x86_32.so index 19d34d4..3090ec3 100644 Binary files a/webrtc/lib/libwebrtc_native.linux.template_release.x86_32.so and b/webrtc/lib/libwebrtc_native.linux.template_release.x86_32.so differ diff --git a/webrtc/lib/libwebrtc_native.linux.template_release.x86_64.so b/webrtc/lib/libwebrtc_native.linux.template_release.x86_64.so index 686252c..b3b53b9 100644 Binary files a/webrtc/lib/libwebrtc_native.linux.template_release.x86_64.so and b/webrtc/lib/libwebrtc_native.linux.template_release.x86_64.so differ diff --git a/webrtc/lib/libwebrtc_native.macos.template_debug.universal.framework/libwebrtc_native.macos.template_debug.universal.dylib b/webrtc/lib/libwebrtc_native.macos.template_debug.universal.framework/libwebrtc_native.macos.template_debug.universal.dylib index de690a0..0188a27 100644 Binary files a/webrtc/lib/libwebrtc_native.macos.template_debug.universal.framework/libwebrtc_native.macos.template_debug.universal.dylib and b/webrtc/lib/libwebrtc_native.macos.template_debug.universal.framework/libwebrtc_native.macos.template_debug.universal.dylib differ diff --git a/webrtc/lib/libwebrtc_native.macos.template_release.universal.framework/libwebrtc_native.macos.template_release.universal.dylib b/webrtc/lib/libwebrtc_native.macos.template_release.universal.framework/libwebrtc_native.macos.template_release.universal.dylib index b425616..abf6e00 100644 Binary files a/webrtc/lib/libwebrtc_native.macos.template_release.universal.framework/libwebrtc_native.macos.template_release.universal.dylib and b/webrtc/lib/libwebrtc_native.macos.template_release.universal.framework/libwebrtc_native.macos.template_release.universal.dylib differ diff --git a/webrtc/lib/libwebrtc_native.windows.template_debug.x86_32.dll b/webrtc/lib/libwebrtc_native.windows.template_debug.x86_32.dll index 003d9d2..4675d1e 100644 Binary files a/webrtc/lib/libwebrtc_native.windows.template_debug.x86_32.dll and b/webrtc/lib/libwebrtc_native.windows.template_debug.x86_32.dll differ diff --git a/webrtc/lib/libwebrtc_native.windows.template_debug.x86_64.dll b/webrtc/lib/libwebrtc_native.windows.template_debug.x86_64.dll index a4b2697..63a9437 100644 Binary files a/webrtc/lib/libwebrtc_native.windows.template_debug.x86_64.dll and b/webrtc/lib/libwebrtc_native.windows.template_debug.x86_64.dll differ diff --git a/webrtc/lib/libwebrtc_native.windows.template_release.x86_32.dll b/webrtc/lib/libwebrtc_native.windows.template_release.x86_32.dll index 451baf0..cd58e07 100644 Binary files a/webrtc/lib/libwebrtc_native.windows.template_release.x86_32.dll and b/webrtc/lib/libwebrtc_native.windows.template_release.x86_32.dll differ diff --git a/webrtc/lib/libwebrtc_native.windows.template_release.x86_64.dll b/webrtc/lib/libwebrtc_native.windows.template_release.x86_64.dll index bc62c5d..7b5830b 100644 Binary files a/webrtc/lib/libwebrtc_native.windows.template_release.x86_64.dll and b/webrtc/lib/libwebrtc_native.windows.template_release.x86_64.dll differ diff --git a/webrtc/webrtc.gdextension.uid b/webrtc/webrtc.gdextension.uid new file mode 100644 index 0000000..e20b8d7 --- /dev/null +++ b/webrtc/webrtc.gdextension.uid @@ -0,0 +1 @@ +uid://jqx8212t4yia