Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gltfio-lite: add BLEND material

Browse Source 
This increases the size to 538K.
This commit is contained in:
Philip Rideout
2020-02-18 11:53:43 -08:00
parent b9c857130a
commit ca81d48432
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/gltfio-android/CMakeLists.txt
View File

@@ -61,6 +61,9 @@ set(GLTFIO_SRCS
src/main/cpp/ResourceLoader.cpp
src/main/cpp/Gltfio.cpp
${FILAMENT_DIR}/include/gltfio/resources/gltfresources_lite.h
${FILAMENT_DIR}/include/gltfio/resources/gltfresources.h
../common/NioUtils.cpp
)
@@ -85,5 +88,4 @@ target_include_directories(gltfio-jni-lite PRIVATE ${GLTFIO_INCLUDE_DIRS})
set_target_properties(gltfio-jni-lite PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libgltfio-jni.symbols)
set_target_properties(gltfio-jni-lite PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libgltfio-jni.map)
target_link_libraries(gltfio-jni-lite filament-jni utils gltfio_resources_lite log)
target_compile_definitions(gltfio-jni-lite PUBLIC GLTFIO_LITE=1)

6
libs/gltfio/CMakeLists.txt
View File

@@ -99,10 +99,12 @@ add_custom_command(OUTPUT ${DUMMY_SRC} COMMAND echo "//" > ${DUMMY_SRC})
add_library(gltfio_resources ${DUMMY_SRC} ${RESGEN_SOURCE})
# ==================================================================================================
# Build "lite" resources library, which contains only one material
# Build "lite" resources library, which contains only a few materials
# ==================================================================================================
set(RESOURCE_BINS "${RESOURCE_DIR}/lit_opaque.filamat")
set(RESOURCE_BINS
"${RESOURCE_DIR}/lit_opaque.filamat"
"${RESOURCE_DIR}/lit_fade.filamat")
get_resgen_vars(${RESOURCE_DIR} gltfresources_lite)

9
libs/gltfio/src/UbershaderLoader.cpp
View File

@@ -118,10 +118,17 @@ Material* UbershaderLoader::getMaterial(const MaterialKey& config) const {
return mMaterials[matindex];
}
switch (matindex) {
#if !GLTFIO_LITE || defined(GLTFRESOURCES_LITE_LIT_OPAQUE_DATA)
case MATINDEX(LIT, AlphaMode::OPAQUE): mMaterials[matindex] = CREATE_MATERIAL(LIT_OPAQUE); break;
#endif
#if !GLTFIO_LITE || defined(GLTFRESOURCES_LITE_LIT_BLEND_DATA)
case MATINDEX(LIT, AlphaMode::BLEND): mMaterials[matindex] = CREATE_MATERIAL(LIT_FADE); break;
#endif
#if !GLTFIO_LITE
case MATINDEX(LIT, AlphaMode::MASK): mMaterials[matindex] = CREATE_MATERIAL(LIT_MASKED); break;
case MATINDEX(LIT, AlphaMode::BLEND): mMaterials[matindex] = CREATE_MATERIAL(LIT_FADE); break;
case MATINDEX(UNLIT, AlphaMode::OPAQUE): mMaterials[matindex] = CREATE_MATERIAL(UNLIT_OPAQUE); break;
case MATINDEX(UNLIT, AlphaMode::MASK): mMaterials[matindex] = CREATE_MATERIAL(UNLIT_MASKED); break;
case MATINDEX(UNLIT, AlphaMode::BLEND): mMaterials[matindex] = CREATE_MATERIAL(UNLIT_FADE); break;