Merge branch 'threejs' into dev

Author: syoyo

sandbox/threejs/CMakeLists.txt

@@ -31,8 +31,6 @@ list(
 add_executable(${BUILD_TARGET} ${SOURCES})
 add_sanitizers(${BUILD_TARGET})
 
-set(EXT_COMPILE_OPTIONS "-sTOTAL_MEMORY=1024MB")
-
 target_compile_options(${BUILD_TARGET} PRIVATE ${EXT_COMPILE_OPTIONS})
 
 # tinyusdz dir
@@ -50,11 +48,11 @@ if (EMSCRIPTEN)
         ${BUILD_TARGET}
         PROPERTIES OUTPUT_NAME tinyusdz
                    SUFFIX ".js"
-                   RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/dist)
+                   RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/simple)
     #set(CMAKE_EXECUTABLE_SUFFIX ".html")
 endif()
 
-set_target_properties(${BUILD_TARGET} PROPERTIES LINK_FLAGS "-s INITIAL_MEMORY=128MB -s TOTAL_MEMORY=1GB -sTOTAL_STACK=256MB -sASSERTIONS -s ALLOW_MEMORY_GROWTH=1 -s WASM=1 -sMODULARIZE -sEXPORT_ES6=1 --bind")
+set_target_properties(${BUILD_TARGET} PROPERTIES LINK_FLAGS "-s INITIAL_MEMORY=128MB -s TOTAL_MEMORY=512MB -sTOTAL_STACK=128MB -sASSERTIONS -s ALLOW_MEMORY_GROWTH=1 -s WASM=1 -sMODULARIZE -sEXPORT_ES6=1 --bind")
 
 # ENVIRONMENT=web
 # SINGLE_FILE=1

sandbox/threejs/binding.cc

@@ -8,6 +8,47 @@
 
 using namespace emscripten;
 
+namespace detail {
+
+// To RGBA 
+bool ToRGBA(const std::vector<uint8_t> &src, int channels,
+  std::vector<uint8_t> &dst) {
+  
+  uint32_t npixels = src.size() / channels;
+  dst.resize(npixels * 4);
+
+  if (channels == 1) { // grayscale
+    for (size_t i = 0; i < npixels; i++) {
+      dst[4 * i + 0] = src[i];
+      dst[4 * i + 1] = src[i];
+      dst[4 * i + 2] = src[i];
+      dst[4 * i + 3] = 1.0f;
+    }
+  } else if (channels == 2) { // assume luminance + alpha
+    for (size_t i = 0; i < npixels; i++) {
+      dst[4 * i + 0] = src[2*i+0];
+      dst[4 * i + 1] = src[2*i+0];
+      dst[4 * i + 2] = src[2*i+0];
+      dst[4 * i + 3] = src[2*i+1];
+    }
+  } else if (channels == 3) {
+    for (size_t i = 0; i < npixels; i++) {
+      dst[4 * i + 0] = src[3*i+0];
+      dst[4 * i + 1] = src[3*i+1];
+      dst[4 * i + 2] = src[3*i+2];
+      dst[4 * i + 3] = 1.0f;
+    }
+  } else if (channels == 4) {
+    dst = src;
+  } else {
+    return false;
+  }
+
+  return true;
+}
+
+}
+
 ///
 /// Simple C++ wrapper class for Emscripten
 ///
@@ -29,6 +70,8 @@ class TinyUSDZLoader {
 
     tinyusdz::tydra::RenderSceneConverterEnv env(stage);
 
+    env.material_config.preserve_texel_bitdepth = true;
+
     if (is_usdz) {
       // Setup AssetResolutionResolver to read a asset(file) from memory.
       bool asset_on_memory =
@@ -69,6 +112,81 @@ class TinyUSDZLoader {
     return render_scene_.meshes.size();
   }
 
+  emscripten::val getMaterial(int mat_id) const {
+
+    emscripten::val mat = emscripten::val::object();
+
+    if (!loaded_) {
+      return mat;
+    }
+
+    if (mat_id >= render_scene_.materials.size()) {
+      return mat;
+    }
+
+    const auto &m = render_scene_.materials[mat_id];
+
+    if (m.surfaceShader.diffuseColor.is_texture()) {
+      mat.set("diffuseColorTextureId", m.surfaceShader.diffuseColor.texture_id);
+    } else {
+      // TODO
+      //mat.set("diffuseColor", m.surfaceShader.diffuseColor);
+    }
+
+    return mat;
+  }
+
+  emscripten::val getTexture(int tex_id) const {
+
+    emscripten::val tex = emscripten::val::object();
+
+    if (!loaded_) {
+      return tex;
+    }
+
+    if (tex_id >= render_scene_.textures.size()) {
+      return tex;
+    }
+
+    const auto &t = render_scene_.textures[tex_id];
+
+    tex.set("textureImageId", int(t.texture_image_id));
+    //tex.set("wrapS", to_string(t.wrapS));
+    //tex.set("wrapT", to_string(t.wrapT));
+    // TOOD: bias, scale, rot/scale/trans
+
+    return tex;
+  }
+
+  emscripten::val getImage(int img_id) const {
+
+    emscripten::val img = emscripten::val::object();
+
+    if (!loaded_) {
+      return img;
+    }
+
+    if (img_id >= render_scene_.images.size()) {
+      return img;
+    }
+
+    const auto &i = render_scene_.images[img_id];
+
+    if ((i.buffer_id >= 0) && (i.buffer_id < render_scene_.buffers.size())) {
+      const auto &b = render_scene_.buffers[i.buffer_id];
+
+      // TODO: Support HDR
+      
+      img.set("data", emscripten::typed_memory_view(b.data.size(), b.data.data()));
+      img.set("width", int(i.width));
+      img.set("height", int(i.height));
+      img.set("channels", int(i.channels));
+    }
+
+
+    return img;
+  }
+
   emscripten::val getMesh(int mesh_id) const {
     emscripten::val mesh = emscripten::val::object();
 
@@ -94,6 +212,20 @@ class TinyUSDZLoader {
     // vec3
     mesh.set("points", emscripten::typed_memory_view(rmesh.points.size() * 3, points_ptr)); 
 
+    {
+      // slot 0 hardcoded.
+      uint32_t uvSlotId = 0;
+      if (rmesh.texcoords.count(uvSlotId)) {
+        const float *uvs_ptr = reinterpret_cast<const float *>(rmesh.texcoords.at(uvSlotId).data.data());
+
+        // assume vec2
+        mesh.set("texcoords", emscripten::typed_memory_view(rmesh.texcoords.at(uvSlotId).vertex_count() * 2, uvs_ptr)); 
+      }
+    }
+
+    mesh.set("materialId", rmesh.material_id);
+
+
     return mesh;
   }
 
@@ -122,6 +254,9 @@ EMSCRIPTEN_BINDINGS(tinyusdz_module) {
       .constructor<const std::string &>()
       .function("getMesh", &TinyUSDZLoader::getMesh)
       .function("numMeshes", &TinyUSDZLoader::numMeshes)
+      .function("getMaterial", &TinyUSDZLoader::getMaterial)
+      .function("getTexture", &TinyUSDZLoader::getTexture)
+      .function("getImage", &TinyUSDZLoader::getImage)
       .function("ok", &TinyUSDZLoader::ok)
       .function("error", &TinyUSDZLoader::error);
 }