fixes

bugfix for non-square atlases. Added additional defines. Newline now goes to the next line and not the previous >__>.
esmelusina · Nov 3, 2015 · 85e5f19 · 85e5f19
1 parent f6a3a67
commit 85e5f19
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 12 deletions.
diff --git a/Test/Test.vcxproj.filters b/Test/Test.vcxproj.filters
@@ -9,7 +9,7 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Resource Files">
+    <Filter Include="Source Files\Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>

diff --git a/Test/main.cpp b/Test/main.cpp
@@ -8,6 +8,7 @@ void main()
 {
 	sfw::initContext(800,600,"NSFW Draw");
 
+	unsigned f = sfw::loadTextureMap("../res/tonc_font.png", 16, 6);
 	unsigned d = sfw::loadTextureMap("../res/fontmap.png",16,16);
 	unsigned r = sfw::loadTextureMap("../res/background.jpg");
 	unsigned u = sfw::loadTextureMap("../res/crosshair.png");
@@ -19,11 +20,14 @@ void main()
 
 	while (sfw::stepContext())
 	{	
+		sfw::drawString(f, " !\"#$%&'()*+,./-\n0123456789:;<=>?\n@ABCDEFGHIJKLMNO\nPQRSTUVWXYZ[\\]^_\n`abcdefghijklmno\npqrstuvwxyz{|}~", 0, 600, 48, 48, 0, ' ');
 		sfw::drawTexture(r, 0, 600, 800, 600, 0, false,0, 0x88888888);
 
 		acc += sfw::getDeltaTime();
 		sfw::drawString(d, "TIME 4 FUN", 400, 300, 48, 48, -acc*24,'\0',MAGENTA);
 
+
+
 		sfw::drawString(d, "6", 400, 32, 24, 24);
 		sfw::drawString(d, "12", 400, 600 - 32, 24, 24);
 		sfw::drawString(d, "3", 800-32, 300, 24, 24);

diff --git a/dep/lib/deb/glfw3.lib b/dep/lib/deb/glfw3.lib
diff --git a/dep/lib/glfw3.lib → dep/lib/rel/glfw3.lib b/dep/lib/glfw3.lib → dep/lib/rel/glfw3.lib
diff --git a/nsfw2draw/nsfw2draw.vcxproj b/nsfw2draw/nsfw2draw.vcxproj
@@ -88,7 +88,7 @@
       <AdditionalDependencies>glfw3.lib;opengl32.lib</AdditionalDependencies>
     </Lib>
     <Lib>
-      <AdditionalLibraryDirectories>$(SolutionDir)dep\lib\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)dep\lib\deb</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>
@@ -122,7 +122,7 @@
       <AdditionalDependencies>glfw3.lib;opengl32.lib</AdditionalDependencies>
     </Lib>
     <Lib>
-      <AdditionalLibraryDirectories>$(SolutionDir)dep\lib\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)dep\lib\rel</AdditionalLibraryDirectories>
     </Lib>
     <ProjectReference>
       <LinkLibraryDependencies>true</LinkLibraryDependencies>

diff --git a/nsfw2draw/sfwdraw.cpp b/nsfw2draw/sfwdraw.cpp
@@ -153,7 +153,7 @@ namespace sfw
 		glm::mat4 model = glm::translate(a_x, a_y, 0.f) * glm::rotate(r, 0.f, 0.f, 1.f) * glm::scale(w, h, 0.f) * glm::translate(0.5f,-0.5f,0.f);
 		for (size_t i = 0; i < strlen(text); ++i)
 		{
-			if (text[i] == '\n' || text[i] == '\r') { y += 1; x = 0; }
+			if (text[i] == '\n' || text[i] == '\r') { y -= 1; x = 0; }
 			else if (text[i] == '\t') x += 4;
 			else
 			{
@@ -183,7 +183,7 @@ namespace sfw
 
 		quad = makeVAO(QuadVerts, 4, QuadTris, 6);
 
-		const char *vsourceTex =   "#version 330\n\
+		const char *vsourceTex = "#version 330\n\
 									layout(location = 0) in vec4 Position;\
 									layout(location = 2) in vec2 TexCoord;\
 									out vec2 vTexCoord;\
@@ -195,8 +195,9 @@ namespace sfw
 									uniform int index = 0;\
 									void main()\
 									{\
-										float c = (index % cols) % cols; \
-										float r = (index / cols) % rows; \
+										int i = index % (rows*cols);\
+										float c = (i % rows); \
+										float r = (i / rows); \
 										vTexCoord = (vec2(c,r) + TexCoord) / vec2(rows,cols);\
 										gl_Position = Projection * View * Model * Position;\
 									}";

diff --git a/nsfw2draw/sfwdraw.h b/nsfw2draw/sfwdraw.h
@@ -28,10 +28,16 @@ NOTE: YOU MUST CALL initContext for any of the functions to work!
 ************************/
 
 // Uses GLFW keycodes, research for additional options.
-#define KEY_UP		262
-#define KEY_DOWN	263
-#define KEY_LEFT	264
-#define KEY_RIGHT	265
+#define KEY_ESCAPE    256
+#define KEY_ENTER	  257
+#define KEY_TAB		  258
+#define KEY_BACKSPACE 259
+
+#define KEY_RIGHT     262
+#define KEY_LEFT	  263
+#define KEY_DOWN	  264
+#define KEY_UP		  265
+
 #define MOUSE_BUTTON_RIGHT	1
 #define MOUSE_BUTTON_LEFT	0
 
@@ -43,7 +49,7 @@ NOTE: YOU MUST CALL initContext for any of the functions to work!
 #define CYAN	 0x00ffffff
 #define MAGENTA  0xff00ffff
 #define YELLOW	 0xffff00ff
-#define RED	 0xff0000ff
+#define RED		 0xff0000ff
 #define GREEN    0x00ff00ff
 #define BLUE	 0x0000ffff
 #define NONE     0x00000000

diff --git a/res/tonc_font.png b/res/tonc_font.png