Update

Author: RobLoach

examples/benchmark/sprite.png

@@ -0,0 +1,7 @@
+/**
+ * ChaiLove callback; Configure the application.
+ */
+def conf(t) {
+  t.window.width = 400
+  t.window.height = 300
+}

examples/simple/conf.chai

@@ -11,7 +11,8 @@ def load() {
 }
 
 def draw() {
-    love.graphics.print("Congrats! You created your first ChaiLove application!", 120, 230)
+    love.graphics.print("Congrats!", 170, 150)
+	love.graphics.print("You created your first ChaiLove application!", 30, 170)
     love.graphics.draw(logo, x, y)
 }
 

examples/simple/main.chai

@@ -88,7 +88,7 @@ bool ChaiLove::load(const std::string& file, const void* data, unsigned int data
 	// Load up the window dimensions.
 	window.load(app, config);
 
-	graphics.load();
+	graphics.load(app);
 	image.load();
 	keyboard.load();
 	joystick.load(app);

src/ChaiLove.cpp

@@ -12,6 +12,16 @@ Font::Font() {
 	font = pntr_load_font_default();
 }
 
+Font::Font(int size) {
+	font = pntr_load_font_default();
+	if (font != NULL) {
+		float scale = (float)size / 8.0f;
+		pntr_font* newFont = pntr_font_scale(font, scale, scale, PNTR_FILTER_NEARESTNEIGHBOR);
+		pntr_unload_font(font);
+		font = newFont;
+	}
+}
+
 Font::Font(const std::string& filename, int glyphWidth, int glyphHeight, const std::string& letters) {
 	font = pntr_load_font_tty(filename.c_str(), glyphWidth, glyphHeight, letters.c_str());
 }

src/love/Types/Graphics/Font.cpp

@@ -16,6 +16,7 @@ namespace Graphics {
 class Font {
 	public:
 	Font();
+	Font(int size);
 	Font(const std::string& filename, int glyphWidth, int glyphHeight, const std::string& letters);
 	Font(const std::string& filename, int ptsize);
 	~Font();

src/love/Types/Graphics/Font.h

@@ -18,20 +18,22 @@ graphics::graphics() {
 }
 
 pntr_image* graphics::getScreen() {
-	if (ChaiLove::hasInstance()) {
-		return ChaiLove::getInstance()->screen;
+	if (m_app != NULL) {
+		return m_app->screen;
 	}
 	return NULL;
 }
 
-bool graphics::load() {
+bool graphics::load(pntr_app* app) {
 	// Set the default font.
 	graphics::setFont();
 
 	// Match the default colors of Love2D
 	color_back = pntr_new_color(0, 0, 0, 255); // Black
 	color_front = pntr_new_color(255, 255, 255, 255); // White
 
+	m_app = app;
+
 	return true;
 }
 
@@ -229,18 +231,10 @@ std::string graphics::getDefaultFilter() {
 
 
 int graphics::getWidth() {
-	pntr_image* screen = getScreen();
-	if (screen != NULL) {
-		return screen->width;
-	}
-	return 800;
+	return pntr_app_width(m_app);
 }
 int graphics::getHeight() {
-	pntr_image* screen = getScreen();
-	if (screen != NULL) {
-		return screen->height;
-	}
-	return 600;
+	return pntr_app_height(m_app);
 }
 
 Point graphics::getDimensions() {
@@ -278,23 +272,59 @@ graphics& graphics::ellipse(const std::string& drawmode, int x, int y, int radiu
 }
 
 Font* graphics::newFont(const std::string& filename, int glyphWidth, int glyphHeight, const std::string& letters) {
-	return new Font(filename, glyphWidth, glyphHeight, letters);
+	Font* font = new Font(filename, glyphWidth, glyphHeight, letters);
+	if (font->loaded()) {
+		return font;
+	}
+
+	delete font;
+	return NULL;
 }
 
 Font* graphics::newFont(const std::string& filename, int size) {
-	return new Font(filename, size);
+	Font* font = new Font(filename, size);
+	if (font->loaded()) {
+		return font;
+	}
+
+	delete font;
+	return NULL;
 }
 
 Font* graphics::newFont(const std::string& filename) {
-	return new Font(filename, 12);
+	Font* font = new Font(filename, 16);
+	if (font->loaded()) {
+		return font;
+	}
+
+	delete font;
+	return NULL;
 }
 
 Font* graphics::newFont() {
-	return new Font();
+	Font* font = new Font();
+	if (font->loaded()) {
+		return font;
+	}
+
+	delete font;
+	return NULL;
+}
+
+Font* graphics::newFont(int size) {
+	Font* font = new Font(size);
+	if (font->loaded()) {
+		return font;
+	}
+
+	delete font;
+	return NULL;
 }
 
 graphics& graphics::setFont(Font* font) {
-	activeFont = font;
+	if (font != NULL) {
+		activeFont = font;
+	}
 	return *this;
 }
 

src/love/graphics.cpp

@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "pntr_app.h"
+#include "config.h"
 #include "Types/Graphics/Image.h"
 #include "Types/Graphics/Quad.h"
 #include "Types/Graphics/Font.h"
@@ -24,7 +25,7 @@ namespace love {
 class graphics {
 	public:
 	graphics();
-	bool load();
+	bool load(pntr_app* app);
 
 	/**
 	 * Draws a rectangle.
@@ -108,12 +109,21 @@ class graphics {
 	 * Creates a new TrueType font, with the given font size.
 	 *
 	 * @param filename (default) The path to the TrueType .ttf font. When not provided, will return the default font.
-	 * @param size (12) The size of the font to create.
+	 * @param size (16) The size of the font to create.
 	 *
 	 * @return The created TrueType font.
 	 */
 	Font* newFont(const std::string& filename, int size);
 	Font* newFont(const std::string& filename);
+
+	/**
+	 * Creates a new pixel font at the given size.
+	 *
+	 * @param size (8) The size of the font to create.
+	 *
+	 * @return The created Pixel font.
+	 */
+	Font* newFont(int size);
 	Font* newFont();
 
 	/**
@@ -308,6 +318,8 @@ class graphics {
 	Font defaultFont;
 
 	int m_smooth = 1;
+
+	pntr_app* m_app = NULL;
 };
 
 }  // namespace love

src/love/graphics.h

@@ -303,6 +303,7 @@ script::script(const std::string& file) {
 	chai.add(fun<Font*, graphics, const std::string&, int>(&graphics::newFont), "newFont");
 	chai.add(fun<Font*, graphics, const std::string&>(&graphics::newFont), "newFont");
 	chai.add(fun<Font*, graphics, const std::string&, int, int, const std::string&>(&graphics::newFont), "newFont");
+	chai.add(fun<Font*, graphics, int>(&graphics::newFont), "newFont");
 	chai.add(fun<Font*, graphics>(&graphics::newFont), "newFont");
 	chai.add(fun<love::graphics&, graphics, Font*>(&graphics::setFont), "setFont");
 	chai.add(fun<love::graphics&, graphics>(&graphics::setFont), "setFont");

src/love/script.cpp

@@ -144,8 +144,8 @@ pntr_app Main(int argc, char* argv[]) {
     (void)argc;
     (void)argv;
     return (pntr_app) {
-        .width = 640,
-        .height = 480,
+        .width = 800,
+        .height = 600,
         .title = "ChaiLove",
         .init = Init,
         .update = Update,