From 8062cd3641b514572a636c9d6a4869e72bc78940 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Thu, 16 May 2024 18:26:09 -0400 Subject: [PATCH] Added a special resource to contain unique instances of `BugMarker` materials. --- Materials/{ => BugMarker}/bug.dds | Bin Materials/{ => BugMarker}/bug_marker.gdshader | 0 .../bug_marker_arrow.material.depren | Bin 0 -> 373 bytes .../bug_marker_arrow_in_progress.material | Bin 0 -> 387 bytes .../bug_marker_arrow_neutral.material | Bin 0 -> 395 bytes .../bug_marker_arrow_resolved.material | Bin 0 -> 384 bytes .../bug_marker_arrow_unresolved.material | Bin 0 -> 388 bytes .../BugMarker/bug_marker_icon.material.depren | Bin 0 -> 398 bytes .../bug_marker_icon_in_progress.material | Bin 0 -> 407 bytes .../bug_marker_icon_neutral.material | Bin 0 -> 416 bytes .../bug_marker_icon_resolved.material | Bin 0 -> 404 bytes .../bug_marker_icon_unresolved.material | Bin 0 -> 415 bytes .../BugMarker/bug_marker_in_progress.res | Bin 0 -> 312 bytes .../BugMarker/bug_marker_material_pack.gd | 5 +++ Materials/BugMarker/bug_marker_neutral.res | Bin 0 -> 307 bytes Materials/BugMarker/bug_marker_resolved.res | Bin 0 -> 310 bytes Materials/BugMarker/bug_marker_unresolved.res | Bin 0 -> 310 bytes Materials/bug_marker_arrow.material | Bin 371 -> 0 bytes Materials/bug_marker_icon.material | Bin 391 -> 0 bytes Meshes/arrow.res | Bin 1291 -> 1243 bytes Meshes/laser_beam.res.depren | Bin 383 -> 0 bytes Scenes/bug_marker.gd | 41 ++++++++---------- Scenes/bug_marker.tscn | 12 +++-- 23 files changed, 33 insertions(+), 25 deletions(-) rename Materials/{ => BugMarker}/bug.dds (100%) rename Materials/{ => BugMarker}/bug_marker.gdshader (100%) create mode 100644 Materials/BugMarker/bug_marker_arrow.material.depren create mode 100644 Materials/BugMarker/bug_marker_arrow_in_progress.material create mode 100644 Materials/BugMarker/bug_marker_arrow_neutral.material create mode 100644 Materials/BugMarker/bug_marker_arrow_resolved.material create mode 100644 Materials/BugMarker/bug_marker_arrow_unresolved.material create mode 100644 Materials/BugMarker/bug_marker_icon.material.depren create mode 100644 Materials/BugMarker/bug_marker_icon_in_progress.material create mode 100644 Materials/BugMarker/bug_marker_icon_neutral.material create mode 100644 Materials/BugMarker/bug_marker_icon_resolved.material create mode 100644 Materials/BugMarker/bug_marker_icon_unresolved.material create mode 100644 Materials/BugMarker/bug_marker_in_progress.res create mode 100644 Materials/BugMarker/bug_marker_material_pack.gd create mode 100644 Materials/BugMarker/bug_marker_neutral.res create mode 100644 Materials/BugMarker/bug_marker_resolved.res create mode 100644 Materials/BugMarker/bug_marker_unresolved.res delete mode 100644 Materials/bug_marker_arrow.material delete mode 100644 Materials/bug_marker_icon.material delete mode 100644 Meshes/laser_beam.res.depren diff --git a/Materials/bug.dds b/Materials/BugMarker/bug.dds similarity index 100% rename from Materials/bug.dds rename to Materials/BugMarker/bug.dds diff --git a/Materials/bug_marker.gdshader b/Materials/BugMarker/bug_marker.gdshader similarity index 100% rename from Materials/bug_marker.gdshader rename to Materials/BugMarker/bug_marker.gdshader diff --git a/Materials/BugMarker/bug_marker_arrow.material.depren b/Materials/BugMarker/bug_marker_arrow.material.depren new file mode 100644 index 0000000000000000000000000000000000000000..898251f6435001203897e85b095a61ad108ac354 GIT binary patch literal 373 zcmV-*0gC=oQ$s@n000005C8z%0ssJA0RR9fwJ-f(+X0;l0OF4|F>q_r0sQ~}zpARD zcU2@vbS9e|WN+GZYopv-@>BV}Oa58K09v^G6%zb)JnrkC{1h0N3u6rm?~B2ivIwQQsedDYMH@0VyqBy zu0anGxvx2hckkn@wu!ltZd&3zK?j%OjTI;QZj~}_?Bj@yVPh$I*<<)d`V_uz zS0{|=bU~N9c!ItBU-CcU4Hh3y1;nG{f4~p!wDCs0@G{+G{xAF=`2YMD_yaT`Py#|l zMLbK2I0mC)kOf=II~$I&X*f6*RU{c(>Q*{w)K1CZSa)nJSfkZ|!W zp3iAtfpORZIEaQ$s@n000005C8!20ssJO0RR9fwJ-f(@c|7B02YxtGjLUs4*WX(|NsC0 ze?=${5F^>-AbXQd?UE?>mb|$RH`h@-tOi8hC;lQnMuwy7Xxm~6DF7(|E&%CtL6^I@ zg1!9T`JZrz2!O^#2nWc2$(=Uds1{zP8O;BM{{#Oc{{{Xnaju|)>*0+%DJzxzfAVgn zGJ5R$fAEjk7&fMompz8>q)*}dc6GuS5k^u~@$`d?>GMo9#s7dus_}YowcKDmF;*Bk z*CL0A+}GU0yZ32U%fwttGXWMC%mu-q0NPBTu2cx1&3~xDaU>CpiPF6+L8kJx?10Rg z83E2D%9K(SJ-ixL%M&mlaDovlA|AsO{0s&$zydSn!GRT3{ zGV3c!?*Ekk32(rFM3+zp$A8J+y5_l==C+;9|Aqeo|D*o_e{5|>O1!W5B9odYSKDi; z{7-Nx*V3uM@c+R#rt9e1(&h#k&ecMNGh`+;?CH%&Gg6$3LXt4Hwvu#_6aN7|E!PZ2 z<`kpJs`W p%AFn(7^DK2-UP0WNU#5BSZE%!5Y^;Wu9A;?xcT=S#<5aULql$wvV{Nu literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_arrow_resolved.material b/Materials/BugMarker/bug_marker_arrow_resolved.material new file mode 100644 index 0000000000000000000000000000000000000000..04855bf0c6043e53b3bd1d72c8de9c43fef31b02 GIT binary patch literal 384 zcmV-`0e}8dQ$s@n000005C8z~0ssJL0RR9fwJ-f(?g8}*07j5FF>q_r0sMOa0000$ zKovS%#7H(d$lkQ+)<(Iv?wRFeF)#Ts}sg_x&jX}rVtd-68`}nsmANU)e?jC#8{!^T$30aa$j=|@7}jr zO%rn|)%3$T6&K89Qa})OBvDr?15qdHEIdyHVlh$JX1LUV%$gS;XBo?&Y zLMc;GKpiq5Z~~F4qB=`TodyFLWFgt|YQqtE5&_PR?nE9N7$wDd80(z0>Ln$YG0!!)ZwtKqx3UX49s(GI0)XD+u8u^n eZ)iAZ-dmue)HXsDu97eJkooU93}69LQ$s^h1*g^k literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_arrow_unresolved.material b/Materials/BugMarker/bug_marker_arrow_unresolved.material new file mode 100644 index 0000000000000000000000000000000000000000..022f90090e5605671f70a623853f40474de391c8 GIT binary patch literal 388 zcmV-~0ek*ZQ$s@n000005C8!10ssJP0RR9fwJ-f(@BtMI0QL|%F>q_r0sQ~}$EdEl z004k!Lr1d7LH4Fiw>HYXB|nvq-`R&bM)H1+iV5F=@Ld0IqEjdUC;%-0P8W2!i!0d6 z|0n+w-hn_H8efR~f81%~je6l_y2<>9{1^BS{SWv9=L$NwBHp-@vQpXq3Er(##*BUc z58jE5VPh(J*^7K9eG1>Vs}sfynrb5I2N}~Sg6N3<0FPAT_26o0!Fpn>P;#zG3=X-k zxrTS|y#Bt9RG|B}h%0aZ*CwioVIi2<24FCAwZ z%9NT)ig-D!mncFhF(7aP5ko|FOUj)FgBoCAnet%6S$R?cmoEJS`P4kLu)JqBp62Gn zFd#Gu3y?(sI7navcL90pMU i)0?=fBkA=q4F}DG7NS~S;VOA@517BtVH^umQ$s@)s;&M2 literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_icon.material.depren b/Materials/BugMarker/bug_marker_icon.material.depren new file mode 100644 index 0000000000000000000000000000000000000000..9e66fb9e5de146771c97087859d26274dfee9581 GIT binary patch literal 398 zcmV;90df9PQ$s@n000005C8xy0{{Sa0RR9fwJ-f(ECOW<0On9SGH`3s0sQ}}s;Z*X z{}syE43JF@vNvtIwNdUZy)y3hC)pcmF}jH&xeDQ9Bs`wSuZ<}v04V@108K)+jVsy9 z|Dpc~pBf&I2L|%-U-HSJKHjMoUZ)z&e}(@7|0Dkc{*{EXE#A44vQn)7KkrtGP0q&u z2IrWMy~hbGlYVTl|^S;}&ImY{T{BSfvEvlNcb_ z#s?kVy>Zi?X0oMJ(-G$w7tG}VDj=wIo=Q_F1C`DMf+UfSDWdof(9T5?&zM-QCTBH5 z?lRHDGL^J=H>{R5Wi=pRf+1B^Jxj`Hfq4U2WM$#s@@&J|Y!U}&MWaW s4o6Hm&_fP`D8T7W>gtH}`k01;=DmfeCa-*zyxarLkMSD-7E)6~L!TwPRR910 literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_icon_in_progress.material b/Materials/BugMarker/bug_marker_icon_in_progress.material new file mode 100644 index 0000000000000000000000000000000000000000..6aae6ab5cfbd738530236bff983ee67d268f86ee GIT binary patch literal 407 zcmV;I0cieGQ$s@n000005C8x|0{{Sj0RR9fwJ-f(LISM|0LGC#GH`3s0r1xY0001h z3kYDxW3H1Nx78^t04o450CFm1O+wwq zmF(sJ&wqqFWN*B(9Vlm+xx3vb*;@vR2tSKX@s#qPRb8Ib&wtOZi?W@;9g4Cde|Ab>g(s4JBLsPi9UcpgcFW1@5~OOh## zPcQ!g+Bu5EFD90&$ytn$JBc!>R0TC4V1gl4RXt0}Xn}bHS-fST;___6**wXBv#rx* zu9eR}Tr9!Gd%U2hDp6QB7X?DtWmFn!lgJ02WeHLqii^ Bwrl_Z literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_icon_neutral.material b/Materials/BugMarker/bug_marker_icon_neutral.material new file mode 100644 index 0000000000000000000000000000000000000000..2949471039dd752f34d68cff60e6683e261b0c53 GIT binary patch literal 416 zcmV;R0bl-7Q$s@n000005C8x^0{{Ss0RR9fwJ-f(J_7X%09KMeHDGPh0Wfe30TIy1 z5Gn{9$T3hA*(D=;Z_8Ud-pMZ%}y?yku#eM{S}bI z77>Tjk}QBwP;kg?h%UkCtEDv@p>n2&01To4rZ)jsN21p^G#oVVEkreW<*Vf79%lYL KhdC@#Q$s_=6|}?v literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_icon_resolved.material b/Materials/BugMarker/bug_marker_icon_resolved.material new file mode 100644 index 0000000000000000000000000000000000000000..112485f9f7ca6e30c0478e037c93bfdd1ba7fd94 GIT binary patch literal 404 zcmV;F0c-wJQ$s@n000005C8x_0{{Sg0RR9fwJ-f(KLV8t05%ajGH`3s0sQ~3s;a80 zaP>!}vnHDyWN+Hk(jvLH^vbv!e=I;Ni_sP?f1#D4{QvvaY;_7K04V@201RrAkZt2i z_VWMd|G_=l0!YV1lK&-#`go^ac%4d_{|WyC{zv{#{ta=iB$RFO&YhH%V*Q`;Zl&1d zZ2Vtvj`>(VrWmh_3g1a1!Z&VfCTDtCQ%0JqVs(_x=~@#_amu6~wN zv0P2gW`x{nDihOG(c;~3HXvXEky2H4Q_5(8c>`InWkF)|V8ao48UYTEHkUjYs7b}b z66`fh*NhyhU08&U0sJ8W4os$03K;j^jm$FeaHE@RWG+=Gg0U-#2faeN= zmmr|%1-k7UWRr&MO&f3RkbBD!84P;Mm8Ri{Fl$hLx`fpPcr{TwQY!!}05AY@GN?^L zwv8{@%m1bS2*(iV2+4qWko>0{>f@cd;dT1y{8#ud@PG0@;16r*rytIjgtAS%b1P-F zSpToQTP-$28~+=eV?LITEynBO!ne|x@QvG=1=Pd~V%L{JlY09+3E7N-1 zqHK?8xUL+lq#%40g9F?6V8gpNg4+8`78RTh=RhhT(1_Q z;&57$1rQ1f4!I4{B^Z6Rw1y*8&h!v~K@`CBCgAEw^!kQ|gXX=3s3xy`mAu@;%%A5l JhXqnoLqo7Q!7Ts) literal 0 HcmV?d00001 diff --git a/Materials/BugMarker/bug_marker_in_progress.res b/Materials/BugMarker/bug_marker_in_progress.res new file mode 100644 index 0000000000000000000000000000000000000000..82bbaa45cb6eaf40e0ea4649b7724dfb0113e496 GIT binary patch literal 312 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 FLqqLmQ_27U literal 1291 zcmV+m1@!t-Q$s@n000005C8zo4FCZ11ONaiwJ-f(%nVH@09G`(NT8h69E90R&M}_& zy9@7~u%lM(njbf>#Zi;Zea_2qLfgD0QmGJ%RgI7($aTyOlsV#tF;>V%)g_a*kEIx6 zg{{)JI)_Fi1)c!80J8u?N^Zmm{ye3sYL@ERLN$XW(~vi=Bb)M=hD75kOnp9c9EXGk zny7lRCJEPU6RP%Rg5^`{Gk+_OXPRX&W!GWvr}^}y!QbZf?3qjIa4pv+^S72h;R)oG ztPuT`Ck%8go6I2lV?u#{g3q8SMDQs*duy4pCD81p!1C;=!*o4kKY^W|W+buUg@*bA z__v-UUYM%-;ViMKvv{8nPYR4TM`9cWQCm z8PTY;q{4dUq5LKH7{4406&6+_qT{7@Dko^K&I$lq8T+iQnPO!o4hzXxSv$vK` z!<$hnM4f+2`6AvLy!g9NoT+q^Thy!-is7_64L?ZQYoPnNvh)7K~T~ZttMA4lO!DupCGU^;LM~DRax2MNz(nEv^Y6Y zaArHjmS*Zp31!5ODlSGc0lFg;N59L5sv>+qHAVViu@yA5Ib3wnMAN?ThsiHYUSXbZ z*XFtQ&bmP?w9p;aojb!n=l&VDZ3_Er+vlM@tg~zn%MMz@8wOg#K#$MHu!Uz^xaSB@ zSi%vOaLy1eFn}HWVAru5{0nAq%nHU?X4p3i_;rE@T(ivtJ}`o3HZTnlpAa1=fhMT& zAwni1B9f#aDQp~J1%yGzpos?(U<5S>H^^8cGg44geiams0otqJggbFp40Y__H=)lg zblgYb)Zv8X39C`x4dc)yCIxpL4*;l=ul{Iu-x8u?0Ut&kv7Q8*a$baxk44C(_WSE6 zJyHC)e`B37aO^nl-dKkW8=QsOev1AX&&jcNNQk+LVOc|l5O7N4Z=~7u8wBPzw>7yD zqpS&rW~5~jGsq}1$9y~- z62dwE8a9$}nTKCszzwsLGW5KD=gdS#F7}&>-)Y6?Z;$6X< zvEDTdJ56TGLxvpXIaqFX%-{eO@_pVhw9D(qavjoNK)g@MQKHOxX!0+gB_`pIPvPUp z$-5Gly&yzG4T|B5{G?f5fADNkf9~+mPc@Ro=i*#`>hEKAdprO3W>{PXPn*yHfg^0x zW@?m2Dg-r-e_?;mXrFaGv3j}DY$aRFD%hndVtpaE48|6f2QH)*2#T+0x{Q3PK8O$XTRXjqo>`lN$ULcYTI>a(R$9qFpa1U+Vo>jY1x->@LqopZ BasU7T diff --git a/Meshes/laser_beam.res.depren b/Meshes/laser_beam.res.depren deleted file mode 100644 index 176e9c32d1c2d524052828951db6c77f321d423e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmV-_0f7EeQ$s@n000005C8x*0ssJK0RR9fwJ-f(H397k0Cv(oHegkg#xPJWK3KpZ z0B|Q8gCP1@QL&Ld^2y#W+eDh&L=G0Y`~kNM5d~#i}?Z=vvc?T{_pLbFtR+KUi*=&Bf*!Dmva$p#TYBnJf`-24_M}_Bc$92Vg5615u0G`_qCgykbUz{x?dos?#}S?Z0-H$zhqHas0(b)g dS5+M}USj}3a6UP;Cr^$f^CxzL!va!MLqqKro<#rv diff --git a/Scenes/bug_marker.gd b/Scenes/bug_marker.gd index d214d7d..9cddafa 100644 --- a/Scenes/bug_marker.gd +++ b/Scenes/bug_marker.gd @@ -1,25 +1,23 @@ class_name BugMarker extends Node3D +@export_group("Marker", "marker_") enum BugStatus { NEUTRAL, UNRESOLVED, IN_PROGRESS, RESOLVED } @export var marker_status : BugStatus = BugStatus.NEUTRAL : set = __set_marker_status -const NEUTRAL_COLOUR = Color.CORNFLOWER_BLUE -const UNRESOLVED_COLOUR = Color(0.1, 0.0, 0.0) -const IN_PROGRESS_COLOUR = Color(0.5, 0.5, 0.0) -const RESOLVED_COLOUR = Color(0.0, 1.0, 0.0) +@export var marker_material_neutral : BugMarkerMaterialPack +@export var marker_material_unresolved : BugMarkerMaterialPack +@export var marker_material_in_progress : BugMarkerMaterialPack +@export var marker_material_resolved : BugMarkerMaterialPack +@export_group("") @export var enable_info : bool = true : set = set_info_enabled @onready var __arrow : MeshInstance3D = $Arrow as MeshInstance3D @onready var __billboard : MeshInstance3D = $Billboard as MeshInstance3D @onready var __info_collider : Area3D = $Billboard/Info as Area3D -var __arrow_material : ShaderMaterial -var __billboard_material : ShaderMaterial func _ready() -> void: - __arrow_material = __arrow.mesh.surface_get_material(0) as ShaderMaterial - __billboard_material = __billboard.mesh.surface_get_material(0) as ShaderMaterial set_info_enabled(enable_info) __set_marker_status(marker_status) @@ -35,19 +33,18 @@ func set_info_enabled(_enable:bool): func __set_marker_status(_status:BugStatus) -> void: - if __arrow_material and __billboard_material: - match _status: - BugStatus.NEUTRAL: - __arrow_material.set_shader_parameter("colour", NEUTRAL_COLOUR) - __billboard_material.set_shader_parameter("colour", NEUTRAL_COLOUR) - BugStatus.UNRESOLVED: - __arrow_material.set_shader_parameter("colour", UNRESOLVED_COLOUR) - __billboard_material.set_shader_parameter("colour", UNRESOLVED_COLOUR) - BugStatus.IN_PROGRESS: - __arrow_material.set_shader_parameter("colour", IN_PROGRESS_COLOUR) - __billboard_material.set_shader_parameter("colour", IN_PROGRESS_COLOUR) - BugStatus.RESOLVED: - __arrow_material.set_shader_parameter("colour", RESOLVED_COLOUR) - __billboard_material.set_shader_parameter("colour", RESOLVED_COLOUR) + match _status: + BugStatus.NEUTRAL: + __arrow.set_surface_override_material(0, marker_material_neutral.arrow) + __billboard.set_surface_override_material(0, marker_material_neutral.icon) + BugStatus.UNRESOLVED: + __arrow.set_surface_override_material(0, marker_material_unresolved.arrow) + __billboard.set_surface_override_material(0, marker_material_unresolved.icon) + BugStatus.IN_PROGRESS: + __arrow.set_surface_override_material(0, marker_material_in_progress.arrow) + __billboard.set_surface_override_material(0, marker_material_in_progress.icon) + BugStatus.RESOLVED: + __arrow.set_surface_override_material(0, marker_material_resolved.arrow) + __billboard.set_surface_override_material(0, marker_material_resolved.icon) marker_status = _status diff --git a/Scenes/bug_marker.tscn b/Scenes/bug_marker.tscn index 243b1d8..8bf2c02 100644 --- a/Scenes/bug_marker.tscn +++ b/Scenes/bug_marker.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=6 format=3 uid="uid://crr6cjploetps"] +[gd_scene load_steps=9 format=3 uid="uid://crr6cjploetps"] [ext_resource type="Script" path="res://addons/Bugbot/Scenes/bug_marker.gd" id="1_1adfi"] [ext_resource type="ArrayMesh" uid="uid://dtvea38mlpfla" path="res://addons/Bugbot/Meshes/arrow.res" id="1_65xos"] -[ext_resource type="Material" uid="uid://dkaq0ok73o5d4" path="res://addons/Bugbot/Materials/bug_marker_icon.material" id="3_px2dp"] +[ext_resource type="Resource" uid="uid://br7bd80u7vyid" path="res://addons/Bugbot/Materials/BugMarker/bug_marker_neutral.res" id="2_uwubq"] +[ext_resource type="Resource" uid="uid://dgsi0x8bj0twj" path="res://addons/Bugbot/Materials/BugMarker/bug_marker_unresolved.res" id="3_slhi1"] +[ext_resource type="Resource" uid="uid://qeog5ye8d64o" path="res://addons/Bugbot/Materials/BugMarker/bug_marker_in_progress.res" id="4_jrygt"] +[ext_resource type="Resource" uid="uid://bpog70fji227f" path="res://addons/Bugbot/Materials/BugMarker/bug_marker_resolved.res" id="5_yhhan"] [sub_resource type="QuadMesh" id="QuadMesh_dd1nc"] -material = ExtResource("3_px2dp") custom_aabb = AABB(-0.25, -0.25, -0.25, 0.5, 0.5, 0.5) size = Vector2(0.25, 0.25) @@ -14,6 +16,10 @@ radius = 0.125398 [node name="BugMarker" type="Node3D"] script = ExtResource("1_1adfi") +marker_material_neutral = ExtResource("2_uwubq") +marker_material_unresolved = ExtResource("3_slhi1") +marker_material_in_progress = ExtResource("4_jrygt") +marker_material_resolved = ExtResource("5_yhhan") [node name="Arrow" type="MeshInstance3D" parent="."] cast_shadow = 0