Fixed bug with Sprites, Created installer

Sprites would not center at initialization, instead only after changing a second time Installer for adding Slang interpreter to 'Program Files' directory in Windows
sam-astro · Jan 15, 2022 · 687b9c6 · 687b9c6
1 parent 3f6e04b
commit 687b9c6
Show file tree

Hide file tree

Showing 8 changed files with 806 additions and 33 deletions.
diff --git a/Slang-Installer/Slang-Installer.vdproj b/Slang-Installer/Slang-Installer.vdproj
diff --git a/Slang.sln b/Slang.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.0.31612.314
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Slang", "Slang\Slang.vcxproj", "{D5F150F8-1F83-41EB-A195-1B5C3CA9322A}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Slang-Installer", "Slang-Installer\Slang-Installer.vdproj", "{42EA0B7A-2068-4065-B9EB-041F32933A66}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -21,6 +23,11 @@ Global
 		{D5F150F8-1F83-41EB-A195-1B5C3CA9322A}.Release|x64.Build.0 = Release|x64
 		{D5F150F8-1F83-41EB-A195-1B5C3CA9322A}.Release|x86.ActiveCfg = Release|Win32
 		{D5F150F8-1F83-41EB-A195-1B5C3CA9322A}.Release|x86.Build.0 = Release|Win32
+		{42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x64.ActiveCfg = Release
+		{42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x64.Build.0 = Release
+		{42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x86.ActiveCfg = Debug
+		{42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x64.ActiveCfg = Release
+		{42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x86.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Slang/CMakeLists.txt b/Slang/CMakeLists.txt
diff --git a/Slang/Main.cpp b/Slang/Main.cpp
@@ -657,7 +657,7 @@ int main(int argc, char* argv[])
 	}
 	else
 	{
-		LogCriticalError("No script provided! Please drag and drop .SLG file over interpreter executable file, or provide it's path as a command-line argument.");
+		LogWarning("No script provided! Please drag and drop .SLG file over interpreter executable file, or provide it's path as a command-line argument.");
 		system("pause");
 		exit(1);
 	}

diff --git a/Slang/Pong-Project/script.slg b/Slang/Pong-Project/script.slg
@@ -24,11 +24,9 @@ func Start()
 
 	Vec2 ballScale = NVec2(10, 10)
 	Vec2 ballPos = centerOfScreen
-	ballPos	-= ballScale
 
 	Vec2 paddleScale = NVec2(4, 70)
 	float yPosPaddle = centerOfScreen.y
-	yPosPaddle -= paddleScale.y / 2
 
 	Vec2 lPaddlePosition = NVec2(15, yPosPaddle)
 	global Vec2 lPaddleTargetPosition = NVec2(15, yPosPaddle)

diff --git a/Slang/Slang.vcxproj b/Slang/Slang.vcxproj
@@ -162,12 +162,6 @@
     <ClInclude Include="SLB.h" />
     <ClInclude Include="strops.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="script.slg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Image Include="icon.ico" />
     <Image Include="tut\hello_world.bmp" />

diff --git a/Slang/Slang.vcxproj.filters b/Slang/Slang.vcxproj.filters
@@ -48,12 +48,6 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="script.slg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Image Include="tut\hello_world.bmp">
       <Filter>Source Files</Filter>

diff --git a/Slang/graphics.h b/Slang/graphics.h
@@ -12,7 +12,7 @@
 #include "strops.h"
 #include "main.h"
 #include <SDL.h>
-#include <SDL_image.h>
+#include <SDL_image.h> 
 #include <stdio.h>
 #include <chrono>
 #include <SDL.h>
@@ -189,7 +189,7 @@ class Vec2
 	{
 		x *= rhs;
 		y *= rhs;
-
+		
 		return *this;
 	}
 
@@ -360,6 +360,9 @@ class Sprite
 		rect.y = static_cast<int>(position.y);
 		rect.w = scale.x;
 		rect.h = scale.y;
+		// Centers
+		rect.x = position.x - (rect.w / 2);
+		rect.y = position.y - (rect.h / 2);
 
 		Load();
 	}
@@ -383,10 +386,10 @@ class Sprite
 
 	int Draw()
 	{
+		SDL_RenderCopy(gRenderer, texture, NULL, &rect);
 		// Centers
 		rect.x = position.x - (rect.w / 2);
 		rect.y = position.y - (rect.h / 2);
-		SDL_RenderCopy(gRenderer, texture, NULL, &rect);
 		return 0;
 	}
 
@@ -493,6 +496,9 @@ class Sprite
 			else if (oper == "/=")
 				scale.y /= AnyAsFloat(otherVal);
 		}
+		// Centers
+		rect.x = position.x - (rect.w / 2);
+		rect.y = position.y - (rect.h / 2);
 		return *this;
 	}
 
@@ -534,8 +540,8 @@ class Text
 		scale.y = rect.h;
 
 		// Centers
-		position.x = rect.x - (rect.w / 2);
-		position.y = rect.y - (rect.h / 2);
+		rect.x = position.x - (rect.w / 2);
+		rect.y = position.y - (rect.h / 2);
 
 		SDL_FreeSurface(surface);
 		return 0;
@@ -556,8 +562,8 @@ class Text
 		scale.y = rect.h;
 
 		// Centers
-		position.x = rect.x - (rect.w / 2);
-		position.y = rect.y - (rect.h / 2);
+		rect.x = position.x - (rect.w / 2);
+		rect.y = position.y - (rect.h / 2);
 
 		SDL_FreeSurface(surface);
 		return 0;