From c1b1558256997df22678f6405ea320ae454ad5b4 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 17 Feb 2015 13:32:29 -0500 Subject: Removed tool used to generate the font, also commited some stuff I forgot in the last commit --- CMakeLists.txt | 4 +- res/arcadepix_regular_8.PNG | Bin 3906 -> 0 bytes res/arcadepix_regular_8.bmp | Bin 24632 -> 0 bytes res/arcadepix_regular_8.sfl | 94 -------------------------------------------- res/font.bmp | Bin 49208 -> 49208 bytes shaders/bloom1.fragment | 2 +- shaders/bloom2.fragment | 4 +- src/translate_font.cpp | 32 --------------- 8 files changed, 5 insertions(+), 131 deletions(-) delete mode 100644 res/arcadepix_regular_8.PNG delete mode 100644 res/arcadepix_regular_8.bmp delete mode 100644 res/arcadepix_regular_8.sfl delete mode 100644 src/translate_font.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 54aee1f..2622733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,6 @@ find_package(GLFW REQUIRED) # include_directories(${SDL2_INCLUDE_DIR}) set(CMAKE_BUILD_TYPE Debug) -add_executable(Aromatherapy src/main.cpp src/map.cpp src/renderer.cpp) +add_executable(Aromatherapy src/main.cpp src/map.cpp src/mapview.cpp src/renderer.cpp) target_link_libraries(Aromatherapy ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${GLFW_LIBRARY}) -add_executable(translate_font src/translate_font.cpp src/renderer.cpp) -target_link_libraries(translate_font ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${GLFW_LIBRARY}) install(TARGETS Aromatherapy RUNTIME DESTINATION ${BIN_DIR}) diff --git a/res/arcadepix_regular_8.PNG b/res/arcadepix_regular_8.PNG deleted file mode 100644 index 5b152aa..0000000 Binary files a/res/arcadepix_regular_8.PNG and /dev/null differ diff --git a/res/arcadepix_regular_8.bmp b/res/arcadepix_regular_8.bmp deleted file mode 100644 index fc2fd82..0000000 Binary files a/res/arcadepix_regular_8.bmp and /dev/null differ diff --git a/res/arcadepix_regular_8.sfl b/res/arcadepix_regular_8.sfl deleted file mode 100644 index b906c01..0000000 --- a/res/arcadepix_regular_8.sfl +++ /dev/null @@ -1,94 +0,0 @@ -39 1 3 2 2 0 4 3 -96 4 3 4 2 0 4 6 -34 9 3 6 2 0 4 8 -94 16 3 6 3 0 4 8 -45 23 6 5 1 0 7 7 -126 29 5 7 2 1 6 9 -60 37 4 4 5 0 5 6 -62 42 4 4 5 0 5 6 -35 47 4 5 5 0 5 7 -47 53 4 5 5 1 5 8 -61 59 4 5 5 0 5 7 -92 65 4 5 5 1 5 8 -43 71 4 7 5 -1 5 7 -32 79 10 0 0 0 11 8 -91 80 10 0 0 0 11 0 -93 81 10 0 0 0 11 0 -123 82 10 0 0 0 11 0 -124 83 10 0 0 0 11 0 -125 84 10 0 0 0 11 0 -58 85 5 2 5 0 6 3 -46 88 8 2 2 0 9 3 -105 91 1 3 9 0 2 4 -33 95 3 3 7 0 4 4 -40 99 3 3 7 0 4 4 -41 103 3 3 7 0 4 4 -108 107 3 3 7 0 4 4 -36 111 3 5 7 0 4 7 -42 117 3 5 7 0 4 7 -102 1 11 5 7 0 4 7 -116 7 11 5 7 0 4 7 -38 13 11 6 7 0 4 8 -49 20 11 6 7 0 4 8 -73 27 11 6 7 0 4 8 -84 34 11 6 7 0 4 8 -89 41 11 6 7 0 4 8 -98 48 11 6 7 0 4 8 -100 55 11 6 7 0 4 8 -104 62 11 6 7 0 4 8 -107 69 11 6 7 0 4 8 -97 76 12 6 6 0 5 8 -99 83 12 6 6 0 5 8 -101 90 12 6 6 0 5 8 -110 97 12 6 6 0 5 8 -111 104 12 6 6 0 5 8 -114 111 12 6 6 0 5 8 -115 118 12 6 6 0 5 8 -117 1 20 6 6 0 5 8 -118 8 20 6 6 0 5 8 -120 15 20 6 6 0 5 8 -122 22 20 6 6 0 5 8 -37 29 19 7 7 1 4 9 -48 37 19 7 7 1 4 9 -50 45 19 7 7 1 4 9 -51 53 19 7 7 1 4 9 -52 61 19 7 7 1 4 9 -53 69 19 7 7 1 4 9 -54 77 19 7 7 1 4 9 -55 85 19 7 7 1 4 9 -56 93 19 7 7 1 4 9 -57 101 19 7 7 1 4 9 -65 109 19 7 7 1 4 9 -66 117 19 7 7 1 4 9 -67 1 27 7 7 1 4 9 -68 9 27 7 7 1 4 9 -69 17 27 7 7 1 4 9 -70 25 27 7 7 1 4 9 -71 33 27 7 7 1 4 9 -72 41 27 7 7 1 4 9 -74 49 27 7 7 1 4 9 -75 57 27 7 7 1 4 9 -76 65 27 7 7 1 4 9 -77 73 27 7 7 1 4 9 -78 81 27 7 7 1 4 9 -79 89 27 7 7 1 4 9 -80 97 27 7 7 1 4 9 -81 105 27 7 7 1 4 9 -82 113 27 7 7 1 4 9 -83 1 37 7 7 1 4 9 -85 9 37 7 7 1 4 9 -86 17 37 7 7 1 4 9 -87 25 37 7 7 1 4 9 -88 33 37 7 7 1 4 9 -90 41 37 7 7 1 4 9 -109 49 38 7 6 1 5 9 -119 57 38 7 6 1 5 9 -59 65 39 3 6 0 6 4 -44 69 42 3 3 0 9 4 -95 73 44 7 1 0 11 8 -64 81 37 8 8 1 4 10 -106 90 35 4 11 0 2 6 -103 95 38 6 8 0 5 8 -112 102 38 6 8 0 5 8 -113 109 38 6 8 0 5 8 -121 116 38 6 8 0 5 8 diff --git a/res/font.bmp b/res/font.bmp index 498f915..6be5236 100644 Binary files a/res/font.bmp and b/res/font.bmp differ diff --git a/shaders/bloom1.fragment b/shaders/bloom1.fragment index 77031f2..4940933 100644 --- a/shaders/bloom1.fragment +++ b/shaders/bloom1.fragment @@ -21,7 +21,7 @@ vec2 rot2d(vec2 p, float a) void main() { const int NUM_TAPS = 12; - float max_siz = 1.0; + float max_siz = 15.0; vec2 fTaps_Poisson[NUM_TAPS]; fTaps_Poisson[0] = vec2(-.326, -.406); diff --git a/shaders/bloom2.fragment b/shaders/bloom2.fragment index 323f441..ac18124 100644 --- a/shaders/bloom2.fragment +++ b/shaders/bloom2.fragment @@ -51,7 +51,9 @@ void main() } vec3 bloom_c = (sum / vec4(NUM_TAPS)).rgb; - bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); + //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); + //bloom_c = vec3(bloom_c.r*bloom_c.r, bloom_c.g*bloom_c.g, bloom_c.b*bloom_c.b); + bloom_c = max(bloom_c - 0.25, vec3(0,0,0)); color = texture(screenTex, UV).rgb + bloom_c; } diff --git a/src/translate_font.cpp b/src/translate_font.cpp deleted file mode 100644 index 7eb4c59..0000000 --- a/src/translate_font.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "renderer.h" -#include - -#define min(x,y) ((x) > (y) ? (y) : (x)) - -int main() -{ - initRenderer(); - - Texture* palette = createTexture(128, 128); - fillTexture(palette, NULL, 0, 0, 0); - - Texture* wrong = loadTextureFromBMP("../res/arcadepix_regular_8.bmp"); - - FILE* desc = fopen("../res/arcadepix_regular_8.sfl", "r"); - while (!feof(desc)) - { - int ch; - Rectangle srcRect; - - fscanf(desc, "%d %d %d %d %d %*d %*d %*d \n", &ch, &(srcRect.x), &(srcRect.y), &(srcRect.w), &(srcRect.h)); - - Rectangle dstRect(ch % 16 * 8, ch / 16 * 8 + (8 - min(srcRect.h,8)), min(srcRect.w, 8), min(srcRect.h, 8)); - blitTexture(wrong, palette, &srcRect, &dstRect); - } - - fclose(desc); - - saveTextureToBMP(palette, "tex.bmp"); - - destroyRenderer(); -} -- cgit 1.4.1