[NOT READY] Basic text rendering

.gitignore

@@ -7,4 +7,5 @@
 /ios/build
 /config.gypi
 /config.mk
-/build
+/build
+/node_modules

Makefile

@@ -9,6 +9,10 @@ all: llmr
 llmr: config.gypi src llmr.gyp
 	@if [ ! -f out ]; then echo 'please run ./configure first'; else $(MAKE) -C out BUILDTYPE=Release V=$(V) llmr-x86; fi;
 
+gtest: config.gypi src llmr.gyp
+	deps/run_gyp llmr.gyp -Goutput_dir=./out/ --depth=. --generator-output=./build/gtest -f make
+	make -C build/gtest gtest V=$(V)
+
 # build OS X app with pure make
 app: config.gypi src macosx/llmr-app.gyp
 	deps/run_gyp macosx/llmr-app.gyp -Goutput_dir=./out/ --depth=. --generator-output=./build/macosx-make -f make
@@ -58,6 +62,13 @@ isim: config.gypi src ios/llmr-app.gyp
 	# does not work
 	#"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" -SimulateApplication ios/build/Release-iphonesimulator/llmr.app/llmr
 
+test: config.gypi src test/test.gyp
+	deps/run_gyp test/test.gyp -Goutput_dir=. --depth=. --generator-output=./build/test -f make
+	make -C build/test V=$(V)
+	@for FILE in build/test/Release/test_*; do \
+		$${FILE}; \
+	done
+
 clean:
 	-rm -rf out
 	-rm -rf build
@@ -71,7 +82,4 @@ distclean:
 	-rm -rf macosx/llmr-app.xcodeproj
 	-rm -rf ios/llmr-app.xcodeproj
 
-test: all
-	echo test
-
 .PHONY: test linux

bin/build-shaders.js

@@ -4,12 +4,17 @@
 var fs = require('fs');
 var path = require('path');
 
+var glsl;
+try { glsl = require('glsl-optimizer'); } catch(err) {}
+
 module.exports = function() {
     var name;
     var shaders = {};
 
     var shaderFiles = fs.readdirSync('src/shader');
 
+
+    // Load shaders
     for (var i = 0; i < shaderFiles.length; i++) {
         var parts = shaderFiles[i].match(/^(.+)\.(vertex|fragment)\.glsl$/);
         if (parts) {
@@ -22,6 +27,36 @@ module.exports = function() {
         }
     }
 
+
+    // Optimize shader
+    if (glsl) {
+        var compiler = new glsl.Compiler(glsl.TARGET_OPENGLES20);
+        for (name in shaders) {
+            var vertex_shader = new glsl.Shader(compiler, glsl.VERTEX_SHADER, shaders[name].vertex);
+            if (vertex_shader.compiled()) {
+                shaders[name].vertex = vertex_shader.output();
+            } else {
+                console.warn('failed to optimize %s vertex shader', name);
+                process.exit(1);
+            }
+            vertex_shader.dispose();
+
+            var fragment_shader = new glsl.Shader(compiler, glsl.FRAGMENT_SHADER, shaders[name].fragment);
+            if (fragment_shader.compiled()) {
+                shaders[name].fragment = fragment_shader.output();
+            } else {
+                console.warn('failed to optimize %s fragment shader', name);
+                process.exit(1);
+            }
+            fragment_shader.dispose();
+        }
+        compiler.dispose();
+    } else {
+        console.warn('Not optimizing shaders');
+    }
+
+
+    // Save to file
     var lines = [];
     var consts = [];
     for (var name in shaders) {
@@ -69,6 +104,7 @@ module.exports = function() {
     code += '\n};\n';
 
     fs.writeFileSync('src/shader/shaders.cpp', code);
+
 };
 
 module.exports();

bin/style.js

@@ -87,10 +87,45 @@ module.exports = {
             "value": ["Restaurant"],
             "type": "point"
         },
+        "country_label": {
+            "source": "streets",
+            "type": "text",
+            "layer": "country_label",
+            "feature_type": "point",
+            "padding": 10,
+            "text_field": "name",
+            "path": "horizontal",
+            "font": "Open Sans, Jomolhari, Siyam Rupali, Alef, Arial Unicode MS",
+            "fontSize": 16
+        },
+        "place_label": {
+            "source": "streets",
+            "type": "text",
+            "layer": "place_label",
+            "feature_type": "point",
+            "text_field": "name",
+            "path": "horizontal",
+            "font": "Open Sans, Jomolhari, Siyam Rupali, Alef, Arial Unicode MS",
+            "fontSize": 18,
+            "alwaysVisible": true
+        },
+        "road_label": {
+            "source": "streets",
+            "type": "text",
+            "layer": "road_label",
+            "feature_type": "line",
+            "text_field": "name",
+            "path": "curve",
+            "font": "Open Sans, Jomolhari, Siyam Rupali, Alef, Arial Unicode MS",
+            "fontSize": 12,
+            "textMinDistance": 250,
+            "maxAngleDelta": 1.04, // radians
+        },
     },
     "sprite": "img/maki-sprite",
     "constants": {
         "park": "#c8df9f",
+        "text": "#000000",
     },
     "structure": [
         { "name": "park", "bucket": "park" },
@@ -105,6 +140,9 @@ module.exports = {
         { "name": "embassy_poi", "bucket": "embassy_poi" },
         { "name": "park_poi", "bucket": "park_poi" },
         { "name": "restaurant_poi", "bucket": "restaurant_poi" },
+        { "name": "country_label", "bucket": "country_label" },
+        { "name": "place_label", "bucket": "place_label" },
+        { "name": "road_label", "bucket": "road_label" },
     ],
     "classes": [
         {
@@ -156,8 +194,8 @@ module.exports = {
                         { z: 0, val: 0.5 },
                         { z: 13, val: 0.5 },
                         { z: 16, val: 2 },
-                        { z: 20, val: 32 },
-                        { z: 30, val: 32 }
+                        { z: 20, val: 16 },
+                        { z: 30, val: 16 }
                     ],
                 },
                 "road_large": {
@@ -169,8 +207,8 @@ module.exports = {
                         { z: 11, val: 0.5 },
                         { z: 13, val: 1 },
                         { z: 16, val: 4 },
-                        { z: 20, val: 64 },
-                        { z: 30, val: 64 }
+                        { z: 20, val: 32 },
+                        { z: 30, val: 32 }
                     ],
                 },
                 "alcohol_poi": {
@@ -208,6 +246,24 @@ module.exports = {
                     "image": "restaurant",
                     "opacity": [ "linear", 15, 0, 1.0, 0, 0.75 ]
                 },
+                "country_label": {
+                    "type": "text",
+                    "stroke": [ 1, 1, 1, 0.7 ],
+                    "color": "text",
+                    "size": 16
+                },
+                "place_label": {
+                    "type": "text",
+                    "stroke": [1,1,1,0.7],
+                    "color": "text",
+                    "size": 18
+                },
+                "road_label": {
+                    "type": "text",
+                    "color": "text",
+                    "stroke": [1,1,1,0.7],
+                    "size": ["exponential", 14, 8, 1, 8, 12]
+                },
             }
         }
     ]

common.gypi

@@ -9,16 +9,19 @@
     'cflags_cc': ['-std=c++11'],
     'configurations': {
       'Debug': {
-        'cflags': [ '-g', '-O0' ],
+        'cflags': [ '-g', '-O0', '-I<(boost_root)/include' ],
         'defines': [ 'DEBUG' ],
         'xcode_settings': {
-          'OTHER_CPLUSPLUSFLAGS': [ '-g']
+          'OTHER_CPLUSPLUSFLAGS': [ '-g', '-I<(boost_root)/include' ]
         }
       },
       'Release': {
-        'cflags': [ '-O3'],
-        'defines': [ 'NDEBUG' ]
+        'cflags': [ '-O3', '-I<(boost_root)/include' ],
+        'defines': [ 'NDEBUG' ],
+        'xcode_settings': {
+          'OTHER_CPLUSPLUSFLAGS': [ '-I<(boost_root)/include' ]
+        }
       }
     }
   }
-}
+}

common/map_view.cpp

@@ -68,12 +68,10 @@ class MapView {
         glfwSetKeyCallback(window, key);
     }
 
-
     static void character(GLFWwindow *window, unsigned int codepoint) {
 
     }
 
-
     static void key(GLFWwindow *window, int key, int scancode, int action, int mods) {
         MapView *mapView = (MapView *)glfwGetWindowUserPointer(window);
 
@@ -95,7 +93,6 @@ class MapView {
         }
     }
 
-
     static void scroll(GLFWwindow *window, double xoffset, double yoffset) {
         MapView *mapView = (MapView *)glfwGetWindowUserPointer(window);
         double delta = yoffset * 40;
@@ -234,3 +231,42 @@ class MapView {
     llmr::Settings& settings;
     llmr::Map map;
 };
+
+namespace llmr {
+namespace platform {
+
+double time() {
+    return glfwGetTime();
+}
+
+
+void show_debug_image(std::string name, const char *data, size_t width, size_t height) {
+    static GLFWwindow *debug_window = nullptr;
+    if (!debug_window) {
+        debug_window = glfwCreateWindow(width, height, name.c_str(), nullptr, nullptr);
+        if (!debug_window) {
+            glfwTerminate();
+            fprintf(stderr, "Failed to initialize window\n");
+            exit(1);
+        }
+    }
+
+    GLFWwindow *current_window = glfwGetCurrentContext();
+
+    glfwSetWindowSize(debug_window, width, height);
+    glfwMakeContextCurrent(debug_window);
+
+    int fb_width, fb_height;
+    glfwGetFramebufferSize(debug_window, &fb_width, &fb_height);
+    float scale = (float)fb_width / (float)width;
+
+    glPixelZoom(scale, -scale);
+    glRasterPos2f(-1.0f, 1.0f);
+    glDrawPixels(width, height, GL_LUMINANCE, GL_UNSIGNED_BYTE, data);
+    glfwSwapBuffers(debug_window);
+
+    glfwMakeContextCurrent(current_window);
+}
+
+}
+}

configure

@@ -19,6 +19,11 @@ parser.add_option("--debug",
     dest="debug",
     help="Also build debug build")
 
+parser.add_option("--boost",
+    action="store",
+    dest="boost_root",
+    help="Path to boost (defaults to /usr/local)")
+
 parser.add_option("--glfw3",
     action="store",
     dest="glfw3",
@@ -55,6 +60,10 @@ def pkg_config(pkg):
   return (libs, cflags)
 
 def configure_llmr(o):
+  if options.boost_root:
+      o['variables']['boost_root'] = options.boost_root
+  else:
+      o['variables']['boost_root'] = '/usr/local'
   o['target_defaults']['default_configuration'] = 'Debug' if options.debug else 'Release'
 
 def configure_glfw3(o):