From 182d95c6ced40d9637fb1fc3662b5f3b848bcea7 Mon Sep 17 00:00:00 2001
From: Philip Rideout <philiprideout@gmail.com>
Date: Thu, 11 Oct 2018 09:51:55 -0700
Subject: [PATCH] Use filamat file instead of inc in a web sample.

For test coverage, ensure that one of our C++ based web samples
uses a filamat file instead of inc, because this is how the JS based
web samples will work.

This makes pre-zipped triangle wasm go from 747 KB to 741 KB.
---
 samples/web/CMakeLists.txt | 18 ++++++++++--------
 samples/web/triangle.cpp   |  9 ++++-----
 samples/web/triangle.html  |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/samples/web/CMakeLists.txt b/samples/web/CMakeLists.txt
index 6c6621de25..bfdd532aaa 100644
--- a/samples/web/CMakeLists.txt
+++ b/samples/web/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.1)
 project(web-samples)
 
 # ==================================================================================================
-# Build materials into inc files.
+# To fetch materials, the web samples can either: (1) use #include or (2) download filamat files.
+# For simplicity, we generate both types of files for each material.
 # ==================================================================================================
 
 set(MATERIAL_NAMES
@@ -19,29 +20,30 @@ if (CMAKE_CROSSCOMPILING)
     include(${IMPORT_EXECUTABLES})
 endif()
 
-set(MATC_TARGET mobile)
-set(MATC_FLAGS -a opengl)
+set(MATC_FLAGS -a opengl -m material -p mobile)
 if (CMAKE_BUILD_TYPE MATCHES Release)
     set(MATC_FLAGS -O ${MATC_FLAGS})
 endif()
 
 set(GENERATION_ROOT ${CMAKE_CURRENT_BINARY_DIR})
 file(MAKE_DIRECTORY "${GENERATION_ROOT}/generated/material/")
+file(MAKE_DIRECTORY "public/material/")
 
 set(MATERIAL_BINS)
 foreach (NAME ${MATERIAL_NAMES})
     set(mat_src "../materials/${NAME}.mat")
     get_filename_component(localname "${mat_src}" NAME_WE)
     get_filename_component(fullname "${mat_src}" ABSOLUTE)
-    set(output_path "${GENERATION_ROOT}/generated/material/${localname}.inc")
+    set(output_inc "${GENERATION_ROOT}/generated/material/${localname}.inc")
+    set(output_bin "public/material/${localname}.filamat")
     add_custom_command(
-            OUTPUT ${output_path}
-            COMMAND matc ${MATC_FLAGS} -p ${MATC_TARGET} -m material -f header
-                    -o ${output_path} ${fullname}
+            OUTPUT ${output_inc} ${output_bin}
+            COMMAND matc ${MATC_FLAGS} -f header -o ${output_inc} ${fullname}
+            COMMAND matc ${MATC_FLAGS} -o ${output_bin} ${fullname}
             MAIN_DEPENDENCY ${mat_src}
             DEPENDS matc
             COMMENT "Compiling material ${mat_src} to ${output_path}")
-    list(APPEND MATERIAL_BINS ${output_path})
+    list(APPEND MATERIAL_BINS ${output_inc} ${output_bin})
 endforeach()
 
 add_custom_target(sample_materials DEPENDS ${MATERIAL_BINS})
diff --git a/samples/web/triangle.cpp b/samples/web/triangle.cpp
index e6d5cb55b6..aa31eb89df 100644
--- a/samples/web/triangle.cpp
+++ b/samples/web/triangle.cpp
@@ -54,10 +54,6 @@ static const Vertex TRIANGLE_VERTICES[3] = {
 
 static constexpr uint16_t TRIANGLE_INDICES[3] = { 0, 1, 2 };
 
-static constexpr uint8_t BAKED_COLOR_PACKAGE[] = {
-    #include "generated/material/bakedColor.inc"
-};
-
 static TriangleApp app;
 
 void setup(Engine* engine, View* view, Scene* scene) {
@@ -80,9 +76,12 @@ void setup(Engine* engine, View* view, Scene* scene) {
             .build(*engine);
     app.ib->setBuffer(*engine,
             IndexBuffer::BufferDescriptor(TRIANGLE_INDICES, 6, nullptr));
+
+    auto bakedColor = filaweb::getRawFile("bakedColor");
     app.mat = Material::Builder()
-            .package((void*) BAKED_COLOR_PACKAGE, sizeof(BAKED_COLOR_PACKAGE))
+            .package(bakedColor.rawData.get(), bakedColor.rawSize)
             .build(*engine);
+
     app.renderable = EntityManager::get().create();
     RenderableManager::Builder(1)
             .boundingBox({{ -1, -1, -1 }, { 1, 1, 1 }})
diff --git a/samples/web/triangle.html b/samples/web/triangle.html
index 3ce1e2a862..d692250eec 100644
--- a/samples/web/triangle.html
+++ b/samples/web/triangle.html
@@ -22,7 +22,7 @@
     <script src="triangle.js"></script>
     <script src="filaweb.js"></script>
     <script>
-    load({});
+    load({'bakedColor': load_rawfile('material/bakedColor.filamat')});
     </script>
 </body>
 </html>