Linux version now works

sam-astro · Jan 16, 2022 · f537cf4 · f537cf4
1 parent ebc3954
commit f537cf4
Show file tree

Hide file tree

Showing 34 changed files with 3,604 additions and 11 deletions.
diff --git a/Slang/Main.cpp b/Slang/Main.cpp
@@ -2,7 +2,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
-#define DEVELOPER_MESSAGES true
+#define DEVELOPER_MESSAGES false
 #define EXAMPLE_PROJECT false
 
 #if defined(__unix__)

diff --git a/Slang/builtin.h b/Slang/builtin.h
@@ -288,7 +288,7 @@ boost::any SLBFunction(const string& name, const vector<boost::any>& args)
 		any_cast<Sprite>(args[0]).Load();
 	else if (name == "SLB.Graphics.Text")
 	{
-		Text t(StringRaw(AnyAsString(args[0])), StringRaw(AnyAsString(args[1])), any_cast<Vec2>(args[2]), AnyAsFloat(args[3]), AnyAsFloat(args[4]), AnyAsInt(args[5]), AnyAsInt(args[6]), AnyAsInt(args[7]));
+		Text t(StringRaw(AnyAsString(args[0])), StringRaw(AnyAsString(args[1])), any_cast<Vec2>(args[2]), AnyAsFloat(args[3]), AnyAsFloat(args[4]), (Uint8)AnyAsFloat(args[5]), (Uint8)AnyAsFloat(args[6]), (Uint8)AnyAsFloat(args[7]));
 		return t;
 	}
 	else if (name == "SLB.Graphics.DrawText")

diff --git a/Slang/graphics.h b/Slang/graphics.h
@@ -516,24 +516,27 @@ class Sprite
 class Text
 {
 public:
-	Text(std::string content, std::string pathToFont, Vec2 position, float fontSize, double angle, int r, int g, int b)
+	Text(std::string content, std::string pathToFont, Vec2 position, float fontSize, double angle, Uint8 r, Uint8 g, Uint8 b)
 		: position(position), angle(angle), content(content), pathToFont(pathToFont), fontSize(fontSize), r(r), g(g), b(b)
 	{
 		rect.x = position.x;
 		rect.y = position.y;
-
+		
 		font = TTF_OpenFont(pathToFont.c_str(), fontSize);
 
 		Load();
 	}
 
 	int Load()
 	{
-		SDL_Color color = { (Uint8)r, (Uint8)g, (Uint8)b };
+		cout << "Load" << endl;
+		SDL_Color color = { r, g, b };
 
 		SDL_Surface* surface = TTF_RenderText_Solid(font, content.c_str(), color);
-
-		SDL_DestroyTexture(texture);
+
+		//if(texture != NULL)
+		//	SDL_DestroyTexture(texture);
+		cout << "Loaded" << endl;
 		texture = SDL_CreateTextureFromSurface(gRenderer, surface);
 
 		TTF_SizeText(font, content.c_str(), &rect.w, &rect.h);
@@ -551,7 +554,7 @@ class Text
 
 	int Update()
 	{
-		SDL_Color color = { (Uint8)r, (Uint8)g, (Uint8)b };
+		SDL_Color color = { r, g, b };
 
 		SDL_Surface* surface = TTF_RenderText_Solid(font, content.c_str(), color);
 
@@ -715,9 +718,9 @@ class Text
 	Vec2 scale;
 	float fontSize;
 	double angle;
-	int r;
-	int g;
-	int b;
+	Uint8 r;
+	Uint8 g;
+	Uint8 b;
 	std::string content;
 	std::string pathToFont;