recompile material

ios/include/material/UnlitMaterialProvider.hpp

@@ -9,24 +9,14 @@ namespace polyvox {
       public:
         UnlitMaterialProvider(Engine* engine) {
           _m = Material::Builder()
-            .package(	UNLIT_OPAQUE_UNLIT_DATA, UNLIT_OPAQUE_UNLIT_SIZE)
+            .package(	UNLIT_OPAQUE_UNLIT_OPAQUE_DATA, UNLIT_OPAQUE_UNLIT_OPAQUE_SIZE)
             .build(*engine);
-          if(_m) {
-            Log("YES");
-          } else {
-            Log("NO!");
-          }
           _ms[0] = _m;
         }
 
         filament::MaterialInstance* createMaterialInstance(MaterialKey* config, UvMap* uvmap,
                 const char* label = "material", const char* extras = nullptr) {
           MaterialInstance* d = (MaterialInstance*)_m->getDefaultInstance();
-          if(d) {
-            Log("YES");
-          } else {
-            Log("NO INSTANCE!");
-          }
           return d;
         }
 

ios/include/material/image.S

@@ -0,0 +1,12 @@
+    .global IMAGE_IMAGE_OFFSET;
+    .global IMAGE_IMAGE_SIZE;
+
+    .global IMAGE_PACKAGE
+    .section .rodata
+IMAGE_PACKAGE:
+    .incbin "image.bin"
+IMAGE_IMAGE_OFFSET:
+    .int 0
+IMAGE_IMAGE_SIZE:
+    .int 44497
+

ios/include/material/image.apple.S

@@ -0,0 +1,12 @@
+    .global _IMAGE_IMAGE_OFFSET;
+    .global _IMAGE_IMAGE_SIZE;
+
+    .global _IMAGE_PACKAGE
+    .section __TEXT,__const
+_IMAGE_PACKAGE:
+    .incbin "image.bin"
+_IMAGE_IMAGE_OFFSET:
+    .int 0
+_IMAGE_IMAGE_SIZE:
+    .int 44497
+

ios/include/material/image.h

@@ -0,0 +1,13 @@
+#ifndef IMAGE_H_
+#define IMAGE_H_
+
+#include <stdint.h>
+
+extern "C" {
+    extern const uint8_t IMAGE_PACKAGE[];
+    extern int IMAGE_IMAGE_OFFSET;
+    extern int IMAGE_IMAGE_SIZE;
+}
+#define IMAGE_IMAGE_DATA (IMAGE_PACKAGE + IMAGE_IMAGE_OFFSET)
+
+#endif

ios/include/material/image_material.S

@@ -1,12 +0,0 @@
-    .global IMAGE_MATERIAL_IMAGE_OFFSET;
-    .global IMAGE_MATERIAL_IMAGE_SIZE;
-
-    .global IMAGE_MATERIAL_PACKAGE
-    .section .rodata
-IMAGE_MATERIAL_PACKAGE:
-    .incbin "image_material.bin"
-IMAGE_MATERIAL_IMAGE_OFFSET:
-    .int 0
-IMAGE_MATERIAL_IMAGE_SIZE:
-    .int 44142
-

ios/include/material/image_material.apple.S

@@ -1,12 +0,0 @@
-    .global _IMAGE_MATERIAL_IMAGE_OFFSET;
-    .global _IMAGE_MATERIAL_IMAGE_SIZE;
-
-    .global _IMAGE_MATERIAL_PACKAGE
-    .section __TEXT,__const
-_IMAGE_MATERIAL_PACKAGE:
-    .incbin "image_material.bin"
-_IMAGE_MATERIAL_IMAGE_OFFSET:
-    .int 0
-_IMAGE_MATERIAL_IMAGE_SIZE:
-    .int 44142
-

ios/include/material/image_material.h

@@ -1,13 +0,0 @@
-#ifndef IMAGE_MATERIAL_H_
-#define IMAGE_MATERIAL_H_
-
-#include <stdint.h>
-
-extern "C" {
-    extern const uint8_t IMAGE_MATERIAL_PACKAGE[];
-    extern int IMAGE_MATERIAL_IMAGE_OFFSET;
-    extern int IMAGE_MATERIAL_IMAGE_SIZE;
-}
-#define IMAGE_MATERIAL_IMAGE_DATA (IMAGE_MATERIAL_PACKAGE + IMAGE_MATERIAL_IMAGE_OFFSET)
-
-#endif

ios/include/material/unlit_opaque.S

@@ -1,12 +1,12 @@
-    .global UNLIT_OPAQUE_UNLIT_OFFSET;
-    .global UNLIT_OPAQUE_UNLIT_SIZE;
+    .global UNLIT_OPAQUE_UNLIT_OPAQUE_OFFSET;
+    .global UNLIT_OPAQUE_UNLIT_OPAQUE_SIZE;
 
     .global UNLIT_OPAQUE_PACKAGE
     .section .rodata
 UNLIT_OPAQUE_PACKAGE:
     .incbin "unlit_opaque.bin"
-UNLIT_OPAQUE_UNLIT_OFFSET:
+UNLIT_OPAQUE_UNLIT_OPAQUE_OFFSET:
     .int 0
-UNLIT_OPAQUE_UNLIT_SIZE:
-    .int 34077
+UNLIT_OPAQUE_UNLIT_OPAQUE_SIZE:
+    .int 78806
 

ios/include/material/unlit_opaque.apple.S

@@ -1,12 +1,12 @@
-    .global _UNLIT_OPAQUE_UNLIT_OFFSET;
-    .global _UNLIT_OPAQUE_UNLIT_SIZE;
+    .global _UNLIT_OPAQUE_UNLIT_OPAQUE_OFFSET;
+    .global _UNLIT_OPAQUE_UNLIT_OPAQUE_SIZE;
 
     .global _UNLIT_OPAQUE_PACKAGE
     .section __TEXT,__const
 _UNLIT_OPAQUE_PACKAGE:
     .incbin "unlit_opaque.bin"
-_UNLIT_OPAQUE_UNLIT_OFFSET:
+_UNLIT_OPAQUE_UNLIT_OPAQUE_OFFSET:
     .int 0
-_UNLIT_OPAQUE_UNLIT_SIZE:
-    .int 34077
+_UNLIT_OPAQUE_UNLIT_OPAQUE_SIZE:
+    .int 78806
 

ios/include/material/unlit_opaque.h

@@ -5,9 +5,9 @@
 
 extern "C" {
     extern const uint8_t UNLIT_OPAQUE_PACKAGE[];
-    extern int UNLIT_OPAQUE_UNLIT_OFFSET;
-    extern int UNLIT_OPAQUE_UNLIT_SIZE;
+    extern int UNLIT_OPAQUE_UNLIT_OPAQUE_OFFSET;
+    extern int UNLIT_OPAQUE_UNLIT_OPAQUE_SIZE;
 }
-#define UNLIT_OPAQUE_UNLIT_DATA (UNLIT_OPAQUE_PACKAGE + UNLIT_OPAQUE_UNLIT_OFFSET)
+#define UNLIT_OPAQUE_UNLIT_OPAQUE_DATA (UNLIT_OPAQUE_PACKAGE + UNLIT_OPAQUE_UNLIT_OPAQUE_OFFSET)
 
 #endif