From 83758c90b3279862c31d8d5c84498dac01453154 Mon Sep 17 00:00:00 2001 From: Ben Kyd Date: Wed, 2 Jul 2025 20:41:20 +0100 Subject: [PATCH] commit --- .../index/Aeon.cpp.486F3A6DD69928F6.idx | Bin 2168 -> 2230 bytes .../index/Display.cpp.D92635EEBD4AE5E7.idx | Bin 3734 -> 3892 bytes .../index/Display.hpp.1F2BECCAA6FFFC93.idx | Bin 1742 -> 1828 bytes .../index/Events.cpp.B4EE623917FA0DA2.idx | Bin 7024 -> 6698 bytes .../index/Events.hpp.A496277A6267D622.idx | Bin 4904 -> 4996 bytes .../ExampleGame.cpp.9EC42D6E840C2507.idx | Bin 2604 -> 2624 bytes Aeon/Entity/CoreComponents/Material.hpp | 16 ---------------- .../CoreComponents/MaterialComponent.hpp | 16 ++++++++++++++++ .../{Mesh.hpp => MeshComponent.hpp} | 4 ++-- Aeon/Entity/Entity.hpp | 3 --- Aeon/Rendering/RenderObject.hpp | 0 .../{RenderObject.cpp => RenderPass.cpp} | 0 Aeon/Rendering/RenderPass.hpp | 2 ++ Aeon/Rendering/RenderQueue.hpp | 0 Aeon/Scene.hpp | 10 ++++++++++ Game/ExampleGame.cpp | 8 ++++++-- 16 files changed, 36 insertions(+), 23 deletions(-) delete mode 100644 Aeon/Entity/CoreComponents/Material.hpp create mode 100644 Aeon/Entity/CoreComponents/MaterialComponent.hpp rename Aeon/Entity/CoreComponents/{Mesh.hpp => MeshComponent.hpp} (81%) delete mode 100644 Aeon/Rendering/RenderObject.hpp rename Aeon/Rendering/{RenderObject.cpp => RenderPass.cpp} (100%) create mode 100644 Aeon/Rendering/RenderPass.hpp delete mode 100644 Aeon/Rendering/RenderQueue.hpp diff --git a/.cache/clangd/index/Aeon.cpp.486F3A6DD69928F6.idx b/.cache/clangd/index/Aeon.cpp.486F3A6DD69928F6.idx index f61d850dd24b495a4f53a3bc1839f5fef336b7fc..afb3387eb23688915c03d6104819df1ff4e6d089 100644 GIT binary patch literal 2230 zcmZux2~ZPf6y7WWlI7nVZ0;2f-6jzz&F2aj5mSimg_`3$#`Hr}jZQ)669K-+TXi-+S--cB4XqgAa=c zV)XQo`I)IXQ-uUUDDXEs$C_R!Ac!{Xn7^Yqx+d$F{-~w$rLLjTI;e2;hP{?0DtgD$ zBUcRLzH720upPZntcA1&( zc)M}z)RVEQphKFP;seXZfAQpsPhM1bvLtiUtj1SeClgektn!$2&^Kku4~l_fDzXw2 z`VQRzfSjfn!U5B!vC(r&xudB4DakJi@tll z&Tn&STG2PHQIAS>S#3-6*0bVet;H{{Ox!PSo_UU|(+^I`?H9%N$?zWIe(u(*-dQJB zKPk1S3KZAP*A6U*s#WISNX}an9_PI2=JmsCc8;sDyCR@mz;>bDra{0f$4WP=+^%4XzNr6p~z!RQ>IE9jW?Q zj^Lb-ll0#+A!GL(q%-j;qUgyND~gLC>70X#aaa6j8!R2nbRK+b)-8Kr)Y|W;-)js&sJ>Ce=Q?f zoE@kLbm#Sq-VL&?scG3NM}m-=Ghq0bpP;ind`i#&41ycB)85G zdY(rPEN5U0EOf|nJj2^r-i&v*_4RwyJUWYR=!N)dfNW{^uvp|J1a~WCIzV+ z@AOcb4uo<7#7(9qOMqmU62sX`1jAu!AP8#2o3Tj|+)x_3Z4w0c(Z#;^4SK5|o_?}) zvK){C-VI&byZY2f+;gZR)D4mm7om!MM*2T7W4ApSE9+fWH&-pmwh?K^FXG0!jMV{f zcua|0>HXJoM|{bN?p7J%7$JjzNW}Sz{AE281PB9Aj}_z+#DJ!)&2;{R%r#$P(aME# zS13Tv?Q_R*g>W@iXP7KZ3tMHmNNJ=7w#ss`@>m^gwW)Xghh7(E6k;VHDPo}#{Nv5o za}V8Mx9xF+g$?mN5;uLmqzvQwGQN7a#d3a(pPe<78QN{R-ty{LqTX=~PY^%{bkpW= zVhB5@+@Tt`W54>QC~MKyU*A?^xp*2q%>aP7!N$RMR;(~q27~S1*?ekwd(C;&WaR9N`M-8qhW>FzsdBw zqVliThCjyubRT*!0Du@U8Me0@kRcCtm+XG!`UcNVi* zYG3^FLEXOhcqV&DYih<++lw^YIxTy+?cibi`S{`CKoFiiN3ZUqfUD?Gj{7O>`^!S! k!_$kHmN`8`jiZcGK{_}Jom?o9vlvN~a;ch@30#T40k^;3$;z3t>gshXIT(hSpywgq6SNoJO^urdv)FKiY#Y(4b7m523^*`1FI2FJ7LgE2|NvzPZbW-WX1Rj1#0`EkK28Sm--U$R_= zJm(&}ROlaGH1FmrN#T^24YN{T6$dq~$O{#UVC5FjjiMSjs*wb zWag%>T8B2VJ)r!0WQ{;b;?{DE4i|*W8C$-s3`5J)KZR#jl)1!2xstdV!6AYWb4JZq zO95Wqn9bgiK7e2w1P2R(DaM9xBLVnl%?E|c8;*r3aPxn{VKkTEivK-hr0U4mCMm93 z61PO&fm9&Fs3a;HyyG5^h`c?yF(j@;aHJqo#xQ)w9Nji-D~qc5ju8+#BC8w z2`CfBf^R_poKhS|)fzp2q`<8pINyY?g5b92jb9e+%^MQX5Eil--1M^!-bk^g0p6 zGNTC}LIceWg;I-y&hC-p1WiZ?Ij9L*&XbEE?&l-tlIel<7RbnOKm;wEBJ>3pes;N+ zac!J}P0&iU(iwaS+DYwXAZa)nF>s=B*iLGDd_K)0=x9N-2(}4bqI8B_K=!;Y6y+gdai-GeuLWs8>Ma<>ONW=Z3>zE#=N#WHnhw{H3ypoTY@t|hsZ)~AOk^% zTZG%fCV;Rk{(p)SG-~^={4}@_)hs2XW|Q5=@?uFy2W&>g>8T9G0gTjo3WFNhi!%Km zYmwS;8C%?V!G8SEA^LTrY=6yO@FY{|NZkYaKJG8 wi6e_{Dl97OthwOFX6)>-_|$|H83HM(8P4W%j0AjRA&(GAO~o=3k|n|Z0^j)D?f?J) diff --git a/.cache/clangd/index/Display.cpp.D92635EEBD4AE5E7.idx b/.cache/clangd/index/Display.cpp.D92635EEBD4AE5E7.idx index b9bd88dbcdcb6ffbd24f9acdc4b3d1d00c009ce7..88da2e4c8cc006185fbcc43870fcd6e732e1ef72 100644 GIT binary patch delta 509 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 diff --git a/.cache/clangd/index/Events.hpp.A496277A6267D622.idx b/.cache/clangd/index/Events.hpp.A496277A6267D622.idx index a19b9fb878e5d07c392373ac54758c13570e684e..15fd094f1405c43af894a0d5ece7d311b6258694 100644 GIT binary patch delta 1121 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 literal 2604 zcmY*a2~bm46#e=Bgd}|UA%4aY06HtB6?9 zs;wX@Dx)Y!#eJcOI28dw1qDSwmRc)qT?V^bpu48ug|U!SU5R?NaMF&o3u^Y>{36T967&C8X2%J7}UYF&-k)_XC)uM+Ps|G&k ze^FA;eB(Fx9c|oSdD^3?vev%Idwo@>V-$a3(~q4&A~#u$?u*{_dtRJ~_Paee$769( z&xYAq3*NE0@f9}Pg*Or(O7iF88Mn3<77)cHc|T%3T*SzM)ewHt4 z)6X2)X`j$#>mxn=;q2NTO58uTiap2QyHHo9eA(5pLO#UmcDu>buS$*z#4&7cd2B&j ztJ>8Bx5Y5ppW|=A81$yhpVdbEUU;>KhX9vaW3-B=5;F#9dC2xwqQ}oyfR9GB56{Pf zF+gvURm_>n3G^4^wssgDKm<^X0eUDrF8e`&?;>>C5u>en))tHb+HSu^Ls3*(ycIqM zosJ+P*o*=CZDpPP?w#wuGQq7-6Bg}Y= z0lGHdZuO#-yB?v$P~_uzf~x>rs(N&7qc%c1v3TFqCR!6rZn{;*CYnbrZ4q$Ai7 zf{&{xB8q}XS$JvXh;1ugx+3RVuGRwXg;r)+Gc61+3@wacL;nIi>AhEu@?wRGAZd;h z#}%55r1>^{IaG633=s;W183O zbW|&iR3n2+Ks?B$K{?>E%gg?3`H{z&ERv?oDQjrdFW2-A?Bpb5p-ZSS)aL+$#Ly)M zeL0H{fuc0%7+M)5j9`O)p#mUX1RHbTG|Y9_(mPzlrn1{uR{DIIJR>;RiWvcC3I2>!i~Qt_lbMUcw*8N1R;r#xxF zMYNhykAmH3B~=?6W!%^uS%cF0Hsn`rqn5%ZivPT2?>^Ndq%%8PJ0;{o(kfe(5_ABL zP%4HY0@Z=}fndY%fS6%!AlNW8V7JYIkaZ8P1-?YVQ&KeD{~uj&3TfCdL!hYSuriQz zFgMsJd$jtbC@^SH+==MWk)g&~$Op{7ceC{Q2c@Y|XgnZ$w3@8(hZUMhNs&V+ z0!#d-rG)c!k_F9e1fUWyo{T?=Fa$7Aj}d@?i~wYO_nDVl{M0->3(9N+;1vQUn)g0C zb1s(!y<`NS#uMDi=EbC&pJc&oG6FCPTAFlEuU+`_2@BNj^~yW87OQ^B0?`=(cu!2P zi`LIHyo4N{1H)v-uPmCl-kg*$I4+DWlRG&pFlQr$Ieq-9`1mzCIVK7H@?s+`MfeCd V!Qt~vOu3}Fr3E$0Ou!Oi{{bnzY-j)g diff --git a/Aeon/Entity/CoreComponents/Material.hpp b/Aeon/Entity/CoreComponents/Material.hpp deleted file mode 100644 index 331a6cc..0000000 --- a/Aeon/Entity/CoreComponents/Material.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef AEON_ENTITY_CORECOMPONENTS_MESH_H_ -#define AEON_ENTITY_CORECOMPONENTS_MESH_H_ - -#include - -namespace EC -{ - -struct Material -{ - MaterialHandle Handle; -}; - -} // namespace EC - -#endif diff --git a/Aeon/Entity/CoreComponents/MaterialComponent.hpp b/Aeon/Entity/CoreComponents/MaterialComponent.hpp new file mode 100644 index 0000000..ba9defb --- /dev/null +++ b/Aeon/Entity/CoreComponents/MaterialComponent.hpp @@ -0,0 +1,16 @@ +#ifndef AEON_ENTITY_CORECOMPONENTS_MATERIAL_H_ +#define AEON_ENTITY_CORECOMPONENTS_MATERIAL_H_ + +#include + +namespace EC +{ + +struct MaterialComponent +{ + MaterialHandle Handle; +}; + +}; // namespace EC + +#endif diff --git a/Aeon/Entity/CoreComponents/Mesh.hpp b/Aeon/Entity/CoreComponents/MeshComponent.hpp similarity index 81% rename from Aeon/Entity/CoreComponents/Mesh.hpp rename to Aeon/Entity/CoreComponents/MeshComponent.hpp index 2509a60..dfce140 100644 --- a/Aeon/Entity/CoreComponents/Mesh.hpp +++ b/Aeon/Entity/CoreComponents/MeshComponent.hpp @@ -6,11 +6,11 @@ namespace EC { -struct Mesh +struct MeshComponent { MeshHandle Handle; }; -} // namespace EC +}; // namespace EC #endif diff --git a/Aeon/Entity/Entity.hpp b/Aeon/Entity/Entity.hpp index cb50e46..37e074d 100644 --- a/Aeon/Entity/Entity.hpp +++ b/Aeon/Entity/Entity.hpp @@ -1,9 +1,6 @@ #ifndef AEON_ENTITY_ENTITY_H_ #define AEON_ENTITY_ENTITY_H_ -#include -#include -#include #include #include diff --git a/Aeon/Rendering/RenderObject.hpp b/Aeon/Rendering/RenderObject.hpp deleted file mode 100644 index e69de29..0000000 diff --git a/Aeon/Rendering/RenderObject.cpp b/Aeon/Rendering/RenderPass.cpp similarity index 100% rename from Aeon/Rendering/RenderObject.cpp rename to Aeon/Rendering/RenderPass.cpp diff --git a/Aeon/Rendering/RenderPass.hpp b/Aeon/Rendering/RenderPass.hpp new file mode 100644 index 0000000..144af91 --- /dev/null +++ b/Aeon/Rendering/RenderPass.hpp @@ -0,0 +1,2 @@ +#ifndef AEON_RENDERING_RENDERPASS_H_ + diff --git a/Aeon/Rendering/RenderQueue.hpp b/Aeon/Rendering/RenderQueue.hpp deleted file mode 100644 index e69de29..0000000 diff --git a/Aeon/Scene.hpp b/Aeon/Scene.hpp index e69de29..4bcc8c0 100644 --- a/Aeon/Scene.hpp +++ b/Aeon/Scene.hpp @@ -0,0 +1,10 @@ +#ifndef AEON_SCENE_H_ +#define AEON_SCENE_H_ + +#include + +class Scene +{ +}; + +#endif diff --git a/Game/ExampleGame.cpp b/Game/ExampleGame.cpp index c17964c..1dcd0e3 100644 --- a/Game/ExampleGame.cpp +++ b/Game/ExampleGame.cpp @@ -1,5 +1,8 @@ #include #include +#include +#include +#include #include #include #include @@ -77,11 +80,12 @@ public: ExampleGame() : App({"Example"}, {"Game with AEON!"}) { - const auto entity = GetEntityRegistry().create(); + EC::Entity entity = GetEntityRegistry().create(); GetEntityRegistry().emplace(entity, EC::Transform({0.0f, 0.0f, 0.0f})); + GetEntityRegistry().emplace(entity, EC::MeshComponent {}); + GetEntityRegistry().emplace(entity, EC::MaterialComponent {}); Level* level = new Level; - PushLayer((Core::GameLayer*)level); DebugLayer debug;