From aed51eeab9e7934ffc59000ef7b6739663e295f0 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Thu, 14 Mar 2024 15:48:50 -0500 Subject: [PATCH] Fixed crooked lines --- TiledCollisionEditor/main.cpp | 27 +++++++++++++++++------- TiledCollisionEditor/rollingcounter.png | Bin 0 -> 5293 bytes 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 TiledCollisionEditor/rollingcounter.png diff --git a/TiledCollisionEditor/main.cpp b/TiledCollisionEditor/main.cpp index 6751bce..ce00090 100644 --- a/TiledCollisionEditor/main.cpp +++ b/TiledCollisionEditor/main.cpp @@ -26,6 +26,8 @@ public: sAppName = "TiledCollisionEditor"; } + Renderable rollingCounter; + public: bool OnUserCreate() override { @@ -34,6 +36,8 @@ public: std::string tilesetFilename=TILESET_DIR+"Basic Tileset.tsx"; Tileset&tileset=tilesets[tilesetFilename]=TSXParser{tilesetFilename}.GetData(); + rollingCounter.Load("rollingcounter.png",nullptr,false,false); + Renderable&tilesetImg=images[tilesetFilename]; tilesetImg.Load(TILESET_DIR+tileset.filename); @@ -41,10 +45,17 @@ public: return true; } + float hundredsDigit=0.f; + float tensDigit=0.f; + float onesDigit=0.f; + + float currentHealth=0; + float targetHealth=60; + bool OnUserUpdate(float fElapsedTime) override { Clear(VERY_DARK_BLUE); -/* + view.HandlePanAndZoom(); const Tileset&tileset=tilesets[activeTileset]; @@ -62,10 +73,10 @@ public: } for(auto&[objName,obj]:tileset.objects){ - view.DrawLineDecal(obj.bounds.pos,obj.bounds.pos+vf2d{2.f,float(obj.bounds.size.y)},YELLOW); - view.DrawLineDecal(obj.bounds.pos,obj.bounds.pos+vf2d{float(obj.bounds.size.x),2},YELLOW); - view.DrawLineDecal(obj.bounds.pos+obj.bounds.size,obj.bounds.pos+obj.bounds.size+vf2d{-2.f,-float(obj.bounds.size.y)},YELLOW); - view.DrawLineDecal(obj.bounds.pos+obj.bounds.size,obj.bounds.pos+obj.bounds.size+vf2d{-float(obj.bounds.size.x),-2.f},YELLOW); + view.DrawLineDecal(obj.bounds.pos,obj.bounds.pos+vf2d{0.f,float(obj.bounds.size.y)},YELLOW); + view.DrawLineDecal(obj.bounds.pos,obj.bounds.pos+vf2d{float(obj.bounds.size.x),0.f},YELLOW); + view.DrawLineDecal(obj.bounds.pos+obj.bounds.size,obj.bounds.pos+obj.bounds.size+vf2d{0.f,-float(obj.bounds.size.y)},YELLOW); + view.DrawLineDecal(obj.bounds.pos+obj.bounds.size,obj.bounds.pos+obj.bounds.size+vf2d{-float(obj.bounds.size.x),0.f},YELLOW); vi2d nameTextSize=GetTextSizeProp(objName)*0.25f; view.GradientFillRectDecal(obj.bounds.pos,nameTextSize+vf2d{2,2},RED,{255,0,0,64},{255,0,0,64},RED); @@ -127,13 +138,13 @@ public: view.DrawPolygonDecal(nullptr,points,uvs,cols); } } - */ - //Font test. + + /* //Font test. DrawStringDecal({0,0},"the quick brown fox jumps over the lazy dog 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f}); DrawStringDecal({0,18},"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f}); DrawStringPropDecal({0,36},"the quick brown fox jumps over the lazy dog 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f}); DrawStringPropDecal({0,54},"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f}); - + */ return true; } diff --git a/TiledCollisionEditor/rollingcounter.png b/TiledCollisionEditor/rollingcounter.png new file mode 100644 index 0000000000000000000000000000000000000000..0f1fd5587c99fe2a0f9572fed8920292b62ba040 GIT binary patch literal 5293 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 k