Last Commit?

At the moment, we can finalize fase 1. See you soon
tonilsz · Jan 28, 2016 · b0583b8 · b0583b8
1 parent b73b2f2
commit b0583b8
Show file tree

Hide file tree

Showing 7 changed files with 183 additions and 19 deletions.
diff --git a/Animation.h b/Animation.h
@@ -35,9 +35,15 @@ class Animation
 	int loops = 0;
 
 public:
+
 	Animation(bool repeat = true) : frames(), speed(1.0f), current_frame(0.0f), repeat(repeat)
 	{}
 
+	~Animation()
+	{
+		frames.clear();
+	}
+
 	void SetCurrentFrame(const float &pos){
 		current_frame = pos;
 	}

diff --git a/Collider.h b/Collider.h
@@ -44,14 +44,7 @@ class Collider
 		to_delete(false),
 		to_erase(false),
 		enabled(true)
-	{}
-
-	Collider::~Collider()
-	{
-		RELEASE(callback);
-	}
-
-
+	{}	
 
 	void Collider::SetPos(fPoint pos)
 	{

diff --git a/Main.cpp b/Main.cpp
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "Application.h"
 #include "Globals.h"
+#include <vld.h> 
 
 #include "SDL/include/SDL.h"
 #pragma comment( lib, "SDL/libx86/SDL2.lib" )

diff --git a/ModuleParticles.cpp b/ModuleParticles.cpp
@@ -26,9 +26,6 @@ bool ModuleParticles::Start()
 {
 	LOG("Loading particules");
 
-	App->particles_top->Enable();
-	App->particles_bottom->Enable();
-
 	return true;
 }
 
@@ -52,8 +49,6 @@ bool ModuleParticles::Stop()
 		RELEASE ((*it).first);
 	}
 	App->textures->Unload(graphics);
-	/*App->particles_top->Disable();
-	App->particles_bottom->Disable();*/
 
 	particles.clear();
 	background.clear();

diff --git a/RoadLine.cpp b/RoadLine.cpp
@@ -29,15 +29,17 @@ SDL_Rect* RoadLine::GetCourrentTile(){
 
 void RoadLine::CleanLine(){
 	if (mask != NULL){
-		for (vector<Collider*>::iterator it = mask->begin(); it != mask->end(); ++it)
+		/*for (vector<Collider*>::iterator it = mask->begin(); it != mask->end(); ++it){
 			RELEASE(*it);
+			App->mask->DropCollider();
+		}*/
 
 		mask->clear();
+		RELEASE(mask);
 	}
 
-	mask->clear();
-	line->clear();
-
-	RELEASE(line);
-	RELEASE(mask);
+	if (line != NULL){
+		line->clear();
+		RELEASE(line);
+	}
 }
diff --git a/RoadSegmentDefinition.cpp b/RoadSegmentDefinition.cpp
@@ -974,8 +974,19 @@ RoadLine* RoadSegment::GenerateSegmentLine(const LINE_TYPE &type){
 		LOG("RoadSegmentDefinition - Cannot generate line collider \n");
 	}
 
+	RELEASE(right_mask);
+
 	//generate new line
 	RoadLine* res = new RoadLine(tiles, mask);
+
+	//free memory
+	//if (right_mask != nullptr)
+	//	right_mask->clear();
+	//RELEASE(right_mask);
+
+	//if (mask != nullptr)
+	//	mask->clear();
+	//RELEASE(mask);
 	return res;
 }
 

diff --git a/SpyHunter.vcxproj.filters b/SpyHunter.vcxproj.filters
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Main.cpp">
+      <Filter>Main</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleAudio.cpp">
+      <Filter>CoreModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleCollision.cpp">
+      <Filter>CoreModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleInput.cpp">
+      <Filter>CoreModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleCars.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleCopter.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleDriver.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleRender.cpp">
+      <Filter>CoreModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleTextures.cpp">
+      <Filter>CoreModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleWindow.cpp">
+      <Filter>CoreModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleParticles.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModulePlayer.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleRoad.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="ModuleUI.cpp">
+      <Filter>GameModules</Filter>
+    </ClCompile>
+    <ClCompile Include="RoadLine.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="RoadLoop.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="RoadSegment.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="RoadSegmentDefinition.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Timer.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Application.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Log.cpp">
+      <Filter>Utils</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Animation.h">
+      <Filter>Main</Filter>
+    </ClInclude>
+    <ClInclude Include="Application.h">
+      <Filter>Main</Filter>
+    </ClInclude>
+    <ClInclude Include="Collider.h">
+      <Filter>Main</Filter>
+    </ClInclude>
+    <ClInclude Include="Globals.h">
+      <Filter>Main</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleAudio.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleCollision.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleInput.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleCars.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleCopter.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleDriver.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleRender.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleTextures.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleWindow.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleParticles.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModulePlayer.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleRoad.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="ModuleUI.h">
+      <Filter>GameModules</Filter>
+    </ClInclude>
+    <ClInclude Include="Point.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="RoadLoop.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="RoadSegment.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Timer.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Animation.cpp">
+      <Filter>Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Module.h">
+      <Filter>CoreModules</Filter>
+    </ClInclude>
+    <ClInclude Include="RoadLine.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="CoreModules">
+      <UniqueIdentifier>{a92de391-2780-4256-b71e-2effa5ada451}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="GameModules">
+      <UniqueIdentifier>{7afaa947-3cb4-4f59-912f-ddcb109135ec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Main">
+      <UniqueIdentifier>{de236f59-8fb1-4546-8a74-51ba4bb79b08}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Utils">
+      <UniqueIdentifier>{fd7dbb02-6992-4741-89ae-a1591ab5ac7c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>