From d68b9d1f9d6be7899f2342e3c113d0164f7a8a3f Mon Sep 17 00:00:00 2001 From: maelstrom Date: Tue, 8 Jul 2025 14:48:50 +0200 Subject: [PATCH] feat(editor): added icons to players and player --- assets/icons/player.png | Bin 0 -> 741 bytes assets/icons/players.png | Bin 0 -> 753 bytes core/src/objects/datamodel.cpp | 6 +++--- core/src/objects/player.h | 6 +++--- core/src/objects/service/players.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 assets/icons/player.png create mode 100644 assets/icons/players.png diff --git a/assets/icons/player.png b/assets/icons/player.png new file mode 100644 index 0000000000000000000000000000000000000000..79f35ccbdad44489dbf07d1bf688c411aa3b612c GIT binary patch literal 741 zcmVz1iyEv%?$mbQ(# zwJpuiQJP8?X_`#S8b+U_G6=ziYB!xPAcq{)ZJ0bECH@ zYx#`n8^Wzn^J!4>=q^bltNO15ry?0ecSLkjpT@vlid!jk)Fjf7&)q_V5zGs#3N%6* zbW~7Hg=&P0&~Y(|g>$hC9FL?;ttzPDZbpZu9OLb33^e2;FNTGJxScp1&q4M+y2ntQ z?C(=hpU$3~`Thx0eHwi0x`q+!d5k@|0_WHe%sG3e-s^MM`xM-ig!VcIA7H}X1ot~L zg=MLB4w-Q;Bi!!u2|I+Qb;0{{4Q53YX6+4_aXena{nmt*!YG7ua~`qc>o=?@U?rOU znS7%>klzi*muXnbM6i@4FR@s^8vTjDgy&%J?w?`u>NYMDFa_2%0SQ(qJE<3=<8Bzo zfdU60e*y(^$RF%r$kl)p7=7tlCDa$+J7w>}DU(O#~fk>pYuRvHi1E9^msg{tLeV XM&GIRvfA7%00000NkvXXu0mjf&%8>| literal 0 HcmV?d00001 diff --git a/assets/icons/players.png b/assets/icons/players.png new file mode 100644 index 0000000000000000000000000000000000000000..7fb4e1f1e1cd6ee67d33ffd24f09ddd5c3478bec GIT binary patch literal 753 zcmV(G`SI(6vnfMgxg){D+Lwutc1Si0swhN#FwOv#}l83ts6rCW;r!9Q9l zl<41549yYiq6clJ;(J(YgF_14nmKFB@QK(mo6I~sr{BJxJ$rsp0HSt^ntND0Z;o48 z>O2Ckm9}n?$F`*>$L{;{zT>f+bCm7tpaqw^4q@%k z&cHHt3=3xZmt6rQ_dtDM#)Xwp66-Thu=<9?(zFvpy0gAr0U4Z3smE5f@pZNr!NoqT zEjSPuCQzMw(H;?yvf{+e;!7(;4hv)+d%cjKFiBL%egy0aeCof8z<>rLEjMsF|CBRH z86WcxAYvS6H;Yq)jY1Z-rrjWiu~m;clLmJlDAE7UhMJ*jBxp}s&nQkrZvqDXxsiv3 zSJ78>4W2GFIu$$+Ic&5Pq{1?zhIy(24enCZy35e>z6~XgVx$x%k(+>tPw)9SL~R?4 zs${`1bqjTFC3F)dxIIw>)!QP7$vk+;^#2c5r{lsjtwKYnfnn+j{~{GK;|I8rvPFU z5NbS#W7m)ofjNER&&ggR6fXi0xd4%4143#8JZlhXW+2TN#8b=5@L&-EUlY^cTT=>w zb_~+jfcRCYfdj}H0J49#sP#gtxE~%YBJiQ3AjMgoQJKuMITA}Iz|zizG7pw|7R*XF j=$D`QjOCK>V3B}dL4UFUkhgq600000NkvXXu0mjf1x-zB literal 0 HcmV?d00001 diff --git a/core/src/objects/datamodel.cpp b/core/src/objects/datamodel.cpp index 2dbacca..6ae87de 100644 --- a/core/src/objects/datamodel.cpp +++ b/core/src/objects/datamodel.cpp @@ -33,9 +33,9 @@ void DataModel::Init(bool runMode) { if (runMode) service->OnRun(); } - if (runMode) { - GetService()->createLocalPlayer(0); - } + // if (runMode) { + // GetService()->createLocalPlayer(0); + // } } void DataModel::SaveToFile(std::optional path) { diff --git a/core/src/objects/player.h b/core/src/objects/player.h index d866f38..2ce8c6a 100644 --- a/core/src/objects/player.h +++ b/core/src/objects/player.h @@ -5,7 +5,7 @@ #include "objects/model.h" #include -class DEF_INST_() Player : public Instance { +class DEF_INST_(explorer_icon="player") Player : public Instance { AUTOGEN_PREAMBLE public: @@ -15,8 +15,8 @@ public: DEF_PROP_CATEGORY(DATA) DEF_PROP_(readonly) int userId = 0; DEF_PROP std::weak_ptr character; - DEF_PROP_CATEGORY(TEAM) //placeholder, we cant add TeamColor or Teams yet since no BrickColor - DEF_PROP bool neutral = true; + // DEF_PROP_CATEGORY(TEAM) //placeholder, we cant add TeamColor or Teams yet since no BrickColor + // DEF_PROP bool neutral = true; static inline std::shared_ptr New() { return std::make_shared(); }; static inline std::shared_ptr Create() { return std::make_shared(); }; diff --git a/core/src/objects/service/players.h b/core/src/objects/service/players.h index 76739d7..ffae524 100644 --- a/core/src/objects/service/players.h +++ b/core/src/objects/service/players.h @@ -4,7 +4,7 @@ #include "objects/base/service.h" #include "objects/player.h" -class DEF_INST_SERVICE Players : public Service { +class DEF_INST_SERVICE_(explorer_icon="players") Players : public Service { AUTOGEN_PREAMBLE protected: void InitService() override;