some more code

moar code

2d-game.vcxproj

@@ -149,6 +149,8 @@
     <ClCompile Include="ResourceManager.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="olc.h" />
+    <ClInclude Include="ITexture.h" />
     <ClInclude Include="Entity.h" />
     <ClInclude Include="interfaces.h" />
     <ClInclude Include="LazySprite.h" />

2d-game.vcxproj.filters

@@ -59,5 +59,11 @@
     <ClInclude Include="olcPixelGameEngine.h">
       <Filter>olc::PGE</Filter>
     </ClInclude>
+    <ClInclude Include="ITexture.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="olc.h">
+      <Filter>olc::PGE</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

AbstractTexture.cpp

+include "AbstractTexture.h"

Entity.cpp

 #include "Entity.h"
+
+namespace entities {
+	Entity::Entity(render::ITexture& texture, const olc::vf2d& pos)
+		:pos(pos), texture(texture)
+	{
+		
+	}
+	Entity::~Entity()
+	{
+		delete &texture;
+	}
+
+
+}
+
+olc::TransformedView& operator+=(olc::TransformedView& scene, entities::Entity& entity) {
+	entity.render(scene);
+	return scene;
+}
\ No newline at end of file

Entity.h

 #pragma once
+
+#include "olc.h"
+#include "ITexture.h"
+
+namespace entities {
+
 	class Entity
 	{
-private:
+	protected:
+		olc::vf2d pos; //I can store these safely directly
+		render::ITexture& texture;
+	public:
+
+		Entity(render::ITexture& texture, const olc::vf2d& pos);
+		
+		virtual olc::vf2d getPos() const;
 
+		virtual void tick(float deltaT);
+
+		//this shouldn't change it's state
+		virtual void render(olc::TransformedView& scene) const;
+
+		virtual ~Entity();
+
+		//TODO getAs*** stuff, all virtual
 	};
 
+
+}
+
+/**
+ * I literally add entities to the scene :D
+ */
+olc::TransformedView& operator+=(olc::TransformedView&, entities::Entity&);
\ No newline at end of file

ITexture.h

+#pragma once
+#include "Entity.h"
+#include "olcPGEX_TransformedView.h"
+
+namespace render
+{
+
+	class ITexture
+	{
+	public:
+
+		//Giving the entity will reduce the variables needed, and will make it's use more dynamic
+		virtual void render(olc::TransformedView& scene, Entity& entity) = 0;
+		
+		virtual ~ITexture() = default;
+	};
+}
+

LazySprite.cpp

@@ -12,10 +12,15 @@ namespace render {
 	}
 
 	LazySprite::LazySprite(int u, int v, int sizeU, int sizeV)
-		: uv(u, v), size(sizeU, sizeV)
+		: LazySprite(olc::vi2d(u, v), olc::vi2d(sizeU, sizeV))
+	{}
+	LazySprite::LazySprite(olc::vi2d pos, olc::vi2d size)
+		: uv(pos), size(size)
 	{
 		sprite = nullptr;
 	}
+
+	
 	void LazySprite::render(olc::TransformedView& scene, olc::vf2d pos, olc::vf2d scale)
 	{
 		scene.DrawPartialDecal(pos, this->getDecay(), uv, size, scale);

LazySprite.h

@@ -25,7 +25,9 @@ namespace render {
 		 * u, v the texture coordinates on the image,
 		 * sizeU, V are the size of that sprite
 		 */
-		LazySprite(int u, int v, int sizeU, int sizeV);
+		LazySprite(int u, int v, int sizeU = 16, int sizeV = 16);
+
+		LazySprite(olc::vi2d pos, olc::vi2d size = olc::vi2d(16, 16));
 
 		/**
 		 * Render the sprite in world-space

olc.h

+#pragma once
+
+#include "olcPGEX_TransformedView.h"
+#include "olcPixelGameEngine.h"
\ No newline at end of file