From 8ec2a4318739fc55f847f7e6699b605c38c42673412e4d69661f0828e5f69851 Mon Sep 17 00:00:00 2001 From: Mexpert_PRO Date: Sun, 8 Feb 2026 18:11:47 +0100 Subject: [PATCH] updated TSE, and testet tileMap funktionality --- TSE | 2 +- .../Resources/Iso64DirtGrassRails.aseprite | Bin 0 -> 1634 bytes TSE-RTS/Resources/tiles.png | Bin 0 -> 3525 bytes TSE-RTS/src/game.cpp | 32 ++++++++++++++++++ TSE-RTS/src/game.hpp | 10 ++++++ TSE-RTS/src/main.cpp | 3 +- 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100755 TSE-RTS/Resources/Iso64DirtGrassRails.aseprite create mode 100644 TSE-RTS/Resources/tiles.png create mode 100644 TSE-RTS/src/game.cpp create mode 100644 TSE-RTS/src/game.hpp diff --git a/TSE b/TSE index 2f3fdf8..330d4b2 160000 --- a/TSE +++ b/TSE @@ -1 +1 @@ -Subproject commit 2f3fdf83ae48f8eb638afbff2299a86a86e0b2d5fdf345ba35e1c4b1729de03a +Subproject commit 330d4b26dceb9585fbdc4709d4c8e1a3b6403bf8cfb7d81d64bfcd4c8f060895 diff --git a/TSE-RTS/Resources/Iso64DirtGrassRails.aseprite b/TSE-RTS/Resources/Iso64DirtGrassRails.aseprite new file mode 100755 index 0000000000000000000000000000000000000000000000000000000000000000..761d9455ae518092976aa3db3716d6fe2608cb3691c772b4dfa2b6a142a3df80 GIT binary patch literal 1634 zcmcIjX;4#F6b^!o)|RL!b-|D+E_9|NZipBjfjWv3wTg-g3b?aWf<_GF2@gt@LBZHj zj3N+P)(%TVDj1Uph%8D;P=sjE7Z5@q;qgL9@_>ZA20Kpu(ZBufoO{o9=Q}^ncl-+i zp{LM>kTfG{28CclAP`Pk?O#}P(@DZy>-j(MVJ3kvIcoQj)y_)bXf-0`BjsmwkyhVs zdOC{L`IfR_tE<;(&$XODs^Z+rw|S>W8nR5fjdzuMBA=}BxD`#0a0{R>U+3jXqg_}N z_H%G_?}>YOXj^}4w;9Lrd*wC1B&J40Mjj3fxcI}>vUTg;9y}ofA9J|=R~c)Zr$o#1|CI0dq82%aUKHiXDi4vSUn`&Y63q`=W! zwT-y}zlM2mhisIW#tae&=a2AiPY0$88s7E8;9PdGi~h&vGGLatqf!M`lZWGJI$AKv zDB_Mgi-~?P-OPbgTu^t5pT;*0TY~2s@}7a$AQUJWg+C}jQltnQ$GTD+QNSWLacaB59L|KF%GnDQ3;aUjaS()k8cXaX!3aii!C=6<)z% z@^-dNtLV1ffo55vz`Wk09ne|Q22t?1)Zo)0yo?_qZ4d`fa=@_O_phLLwsX)*NMnCU zP@{LgSoai|;M5Y=3Gs2zSz9Z1Y$J!$G?(E%bE%2L-;qxYqJ|7lx#DVzJ4l&|UZq@S zX&s{*ebhP85~^9I;ttwi=y`u}0|X{Y$T3s)HCeNv(r=$Z6X8}?+ST6he^T5uIND{~#9z`7|*QWPYO z=ZwX@UHZ`Y$hwM%Ljc*Irzyj>AwWenF$i2jz zv7tPqz7>9>&H*`9(}6F@*tvHz3jubQvI0#Y!YtTN8eGrB4z>XmMJy+2Z6VLCvR3Bp zS0qtX;Z4gnO*$dK>R9g)RfSyYh9v9ZMUPdFNP5YxNX{H-vjB5azJwK^u?aSphok34 zrN#Sm14*T3*rTbNT%5t3dcQ;i>|W|-61sPR*&9QQtSHg&Ie9pe0S_fWYt+oS7`#b` jDS{Qw>4QKKi_tGvl#f<7M|221{6o4ILN+beyu$tl9S|qr literal 0 HcmV?d00001 diff --git a/TSE-RTS/Resources/tiles.png b/TSE-RTS/Resources/tiles.png new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..deeb8e26cdcee658a3300e7799b2ab078f16f3db700937f386b50a8d8b01e17f GIT binary patch literal 3525 zcmeH|`CC)R8h|GdAr}M^MFa}Lhz(HC0Lmt^g;a_`R+Sy1D2q`l4T!RY7}iQ5RxF8v zh_^+gY_e5?Nl5FkkF@#<)imw|U)I8UF2Pvhw6I_m6DqfhdzaJW?(GDUETk#O2_QtW#p0GvaWQK(ssJ5DcA!E2tRpxK{rRO{FjNeqGT zcxk#ozphLOzn2hp*=oA0y6%n|FwaU~diJ4X*3eoZCI-{2LoL7j?ioLgsY@@KQU+CH zF6-%KnIu1npiqncR0I6(u$|U3?)m^qbOyaC7>y(YEJd}wb&6ROj8Jg`rS1^`>!;Cv z7lONt)T9FE;A%zln?Z;|b zRQYf%+a!~e0~J!AzVlU!J_@y(COSgUiX`56imUztkj|@5i(`i-GP6l&s()Bsa~%1N z(H3A%FGvQ1!PkkZ?SqhKQeTN3y#B^!{h)j-N#&9}C2*0fr?{Ufmo7AxDB2ForxWpL zxWiBKsr03^z`0As1!DiFmykiP+_4Fnq@A9sb)iD8(V=Sw3hv4|-mtg?u+pqeV8)dY zpYw8=J9YyoXU_>xEVIPOx zJss5PLzqB5miCCbR(xEhS5TsF^2dmmzd>it!Sj^@+7wQXQMuDpYXAZmQH!vUAVh-N zr)6t(w(|@cpV|?%068qI6l;pc@zHNZfzmY?O%UUt6gh`Eb}(h66>?>Fupd?&gcw$r zo3c1hlwBD5_=xO&9#;eW;V<-3sL;pzsebx;r`=JdCLVFr;ghYS(uUdOUDxQ?sfLwh zMKEXsm7eMvz4*`aI0U5z)7bba?mH7S&D{^N_aEDXhja7D%zRhlz+g#L>PM)_{jW!x z-s2A|_HN&{etiC7wEySYvMNOoke@!Vvw4lz>-DTZIZevF8M@*0Y~Ue>x-9m}=WM)K zh=(Kc}^rL(K$FJ#Jw zzfInQ)5;C@Rr12EdFt8fyb^I1bS3e}%68T1s#wSwDp;C4^1^)U?J z0|lUHthN0zB5bY8Yj;pacoH!_=59e4W2rFF53#?vat@LWXtbPTk7aJc#?JcKJtL05{Ta1X4m*3 zrwnC_vUf}rN=)rI`D0BvDf^b;Xkvc2pXBy9e^tnTm}Kx++>w(fH!?m$28Ft_*A=iF zH}fqoS}_5q@+X}svXc7c3*Ewe1DuoDsg$k2yz#a@ZD&8)IxCPXBKlriQft3XfoHS$ z%tnXdqOkHAWJ;Alq77)L=WDzd;`SZo_73YB?SG@k8RZ|V6Sr00n>@XC9wris;e8}xkH?wf-T(@moE@;RX|x7i0yX@QTZ=D=ysVd_ zQ+6YIoSJNR$AUZtYV*>#T~4#wAddLayer(&gameLayer); + + Transformable* tileMap = new Transformable("tileMap"); + gameLayer.AddTransformable(tileMap); + Texture* setTexture = new Texture("tiles.png"); + TileSet* set = new TileSet(setTexture, 10, 10); + TileMap* map = new TileMap(); + map->set = set; + + for (int x = -64; x < 64; x++) + { + for (int y = -64; y < 64; y++) + { + map->SetTile(Vector2(x, y), {0,9}); + } + } + + Material* tileMapMaterial = new Material("tileSetMat", ShaderRegistry::GetShader("Basic Unlit TileMap Shader")); + Renderable* rnd = new Renderable(tileMapMaterial); + + tileMap->AddBehaviourScript(map); + tileMap->AddBehaviourScript(rnd); +} \ No newline at end of file diff --git a/TSE-RTS/src/game.hpp b/TSE-RTS/src/game.hpp new file mode 100644 index 0000000..9eda776 --- /dev/null +++ b/TSE-RTS/src/game.hpp @@ -0,0 +1,10 @@ +#pragma once +#include "elements/Scene.hpp" + +class game +{ + public: + inline static TSE::Layer gameLayer = TSE::Layer("gameLayer"); + + static void setup(TSE::Scene* s); +}; \ No newline at end of file diff --git a/TSE-RTS/src/main.cpp b/TSE-RTS/src/main.cpp index 8f8b216..0a72ff1 100644 --- a/TSE-RTS/src/main.cpp +++ b/TSE-RTS/src/main.cpp @@ -14,6 +14,7 @@ #include "elements/Layer.hpp" #include "elements/Scene.hpp" #include "EditorSubsystem.hpp" +#include "game.hpp" #define USE_EDITOR @@ -41,7 +42,7 @@ void SetupWindow() rend = new DefaultRendererOpenGL(*BasicShader::Instance()); currentScene = new Scene(); - + game::setup(currentScene); #ifdef USE_EDITOR currentScene->AddLayer(&editor->editorLayer);