C++ rewrite and integration with Daz Bridge Library (#27)

* Initial Commit: C++ refactor * Daz Bridge Library integration * Embedded c4d plugin update * Bugfix: Save Project with Assets (C4D r25)
daz3d · Jun 3, 2022 · c4d7a8b · c4d7a8b
1 parent 2f2e74c
commit c4d7a8b
Show file tree

Hide file tree

Showing 36 changed files with 3,728 additions and 4,005 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
 .vscode
+.vs
+out
+CMakeSettings.json
+.DS_Store
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dzbridge-common"]
+	path = dzbridge-common
+	url = https://github.com/daz3d/DazBridgeUtils.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,279 @@
+#**********************************************************************
+#	Copyright (C) 2002-2020 Daz 3D, Inc. All Rights Reserved.
+#
+#	This file is part of the DAZ Studio SDK.
+#
+#	This file may be used only in accordance with the DAZ Studio SDK
+#	license provided with the DAZ Studio SDK.
+#
+#	The contents of this file may not be disclosed to third parties,
+#	copied or duplicated in any form, in whole or in part, without the
+#	prior written permission of Daz 3D, Inc, except as explicitly
+#	allowed in the DAZ Studio SDK license.
+#
+#	See http://www.daz3d.com to contact DAZ 3D or for more
+#	information about the DAZ Studio SDK.
+#**********************************************************************
+
+cmake_minimum_required(VERSION 3.4.0)
+
+if(APPLE)
+	if(NOT CMAKE_OSX_ARCHITECTURES)
+  		message( FATAL_ERROR "Mac needs CMAKE_OSX_ARCHITECTURES, set to i386 or x86_64" )
+		return()
+	endif()
+endif(APPLE)
+
+project("DzBridge-C4D")
+set(FBX_SDK_DIR "" CACHE PATH "Path to FBX SDK" )
+set(OPENSUBDIV_DIR "" CACHE PATH "Path to Opensubdiv folder" )
+set(USE_DZBRIDGE_SUBMODULE "ON")
+set(USE_DZBRIDGE_STATIC "ON")
+
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(DAZ_STUDIO_EXE_DIR "" CACHE PATH "Path to DAZ Studio, needs to be installed to a writeable location" )
+if(NOT DAZ_STUDIO_EXE_DIR )
+	message("Location to DAZ Studio not provided. Projects will build locally.")
+endif()
+
+if(WIN32)
+	set(DZ_LIB_SUFFIX ".lib")
+	set(DZ_BIN_SUFFIX ".dll")
+	set(DZ_LIB_PREFIX "")
+	set(UTIL_EXT ".exe")
+	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+		set(DZ_PLATFORM x86)
+		set(DZ_MIXED_PLATFORM Win32)
+		set(DZ_OS_PLATFORM Win32)
+	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		set(DZ_PLATFORM x64)
+		set(DZ_MIXED_PLATFORM x64)
+		set(DZ_OS_PLATFORM Win64)
+	else()
+		message(FATAL_ERROR "Unknown architecture")
+	endif()
+elseif(APPLE)
+	set(DZ_LIB_SUFFIX ".dylib")
+	set(DZ_BIN_SUFFIX ".dylib")
+	set(DZ_LIB_PREFIX "lib")
+	set(UTIL_EXT "")
+	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+		set(DZ_PLATFORM x86)
+		set(DZ_MIXED_PLATFORM Mac32)
+		set(DZ_OS_PLATFORM Mac32)
+	elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		set(DZ_PLATFORM x64)
+		set(DZ_MIXED_PLATFORM Mac64)
+		set(DZ_OS_PLATFORM Mac64)
+	else()
+		message(FATAL_ERROR "Unknown architecture")
+	endif()
+	set(CMAKE_MACOSX_RPATH TRUE)
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
+else()
+	message(FATAL_ERROR "Unknown architecture")
+endif(WIN32)
+
+set(DAZ_SDK_DIR_DEFAULT "")
+set(DAZ_SDK_CORE_RELATIVE_PATH "lib/${DZ_MIXED_PLATFORM}/${DZ_LIB_PREFIX}dzcore${DZ_LIB_SUFFIX}")
+if(NOT DAZ_SDK_DIR)
+	if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/DAZStudio4.5+ SDK/${DAZ_SDK_CORE_RELATIVE_PATH}")
+		set( DAZ_SDK_DIR_DEFAULT "${CMAKE_CURRENT_LIST_DIR}/DAZStudio4.5+ SDK" )
+	endif()
+endif()
+
+set(DAZ_SDK_DIR ${DAZ_SDK_DIR_DEFAULT} CACHE PATH "Path to root of the DAZ Studio SDK" )
+
+if(NOT DAZ_SDK_DIR)
+	message(FATAL_ERROR "Missing path to DAZ Studio SDK")
+	return()
+endif()
+
+set(QT_BINARY_DIR_DEFAULT "" CACHE PATH "Path to directory with QT binaries")
+if(NOT QT_BINARY_DIR_DEFAULT)
+	if(EXISTS "${DAZ_SDK_DIR}/bin/${DZ_MIXED_PLATFORM}/qmake${UTIL_EXT}")
+		set( QT_BINARY_DIR_DEFAULT "${DAZ_SDK_DIR}/bin/${DZ_MIXED_PLATFORM}" )
+	endif()
+endif()
+
+if(NOT QT_BINARY_DIR_DEFAULT)
+	message(FATAL_ERROR "Missing path QT binaries. Check QT_BINARY_DIR_DEFAULT path")
+	return()
+endif()
+
+find_package(OpenGL REQUIRED)
+
+#we only have release libraries for dzcore/qt so make sure even in debug they we use MD and undef debug
+if(WIN32)
+	add_compile_options( "/MD" "/U_DEBUG" )
+endif()
+
+# Set dzcore as import target
+set(DZ_SDK_INCLUDE "${DAZ_SDK_DIR}/include" CACHE FILEPATH "path to daz sdk includes" )
+set(DAZ_SDK_LIB "${DAZ_SDK_DIR}/${DAZ_SDK_CORE_RELATIVE_PATH}" CACHE FILEPATH "path to dzcore" )
+if(NOT EXISTS ${DAZ_SDK_LIB})
+	message(FATAL_ERROR "The library dzcore could not be located.  Check the path for DAZ_SDK_DIR.")
+	return()
+endif()
+
+add_library(dzcore SHARED IMPORTED)
+if(WIN32)
+	set_property(TARGET dzcore APPEND PROPERTY IMPORTED_IMPLIB ${DAZ_SDK_LIB})
+else()
+	set_property(TARGET dzcore APPEND PROPERTY IMPORTED_LOCATION ${DAZ_SDK_LIB})
+endif(WIN32)
+set_property(TARGET dzcore APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${DZ_SDK_INCLUDE}" )
+
+# Set dpc as import target
+set(DAZ_SDK_DPC_EXE "${DAZ_SDK_DIR}/bin/${DZ_MIXED_PLATFORM}/dpc${UTIL_EXT}" CACHE FILEPATH "path to sdk dpc" )
+if(NOT EXISTS ${DAZ_SDK_DPC_EXE})
+	message(FATAL_ERROR "The executable dpc could not be located.  Check the path for DAZ_SDK_DIR.")
+	return()
+endif()
+add_executable(dpc IMPORTED)
+set_property(TARGET dpc APPEND PROPERTY IMPORTED_LOCATION ${DAZ_SDK_DPC_EXE})
+
+# Setup Qt from the DAZ SDK
+if(WIN32)
+	set(DAZ_SDK_QTCORE_LIBRARY "${DAZ_SDK_DIR}/lib/${DZ_MIXED_PLATFORM}/QtCore4.lib")
+elseif(APPLE)
+	set(DAZ_SDK_QTCORE_LIBRARY "${DAZ_SDK_DIR}/lib/${DZ_MIXED_PLATFORM}/QtCore.framework")
+endif()
+
+set(QT_QTCORE_LIBRARY_RELEASE ${DAZ_SDK_QTCORE_LIBRARY})
+set(QT_BINARY_DIR "${QT_BINARY_DIR_DEFAULT}")
+set(QT_QMAKE_EXECUTABLE "${QT_BINARY_DIR_DEFAULT}/qmake${UTIL_EXT}")
+#set(QT_QMAKE_EXECUTABLE "${DAZ_SDK_DIR}/bin/${DZ_MIXED_PLATFORM}/qmake${UTIL_EXT}")
+#set(QT_BINARY_DIR "${DAZ_SDK_DIR}/bin/${DZ_MIXED_PLATFORM}")
+set(QT_HEADERS_DIR "${DAZ_SDK_DIR}/include")
+set(QT_QTCORE_INCLUDE_DIR "${DAZ_SDK_DIR}/include/QtCore")
+
+# the qt find module needs this folder but our build does not so just fake it
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/DUMMY_MKSPECS/default" )
+set(QT_MKSPECS_DIR "${CMAKE_CURRENT_BINARY_DIR}/DUMMY_MKSPECS")
+
+find_package(Qt4 4.8.1 REQUIRED QtCore QtGui QtScript QtOpenGL QtNetwork QtSql QtXml)
+
+set(DZSDK_QT_CORE_TARGET Qt4::QtCore)
+set(DZSDK_QT_GUI_TARGET Qt4::QtGui)
+set(DZSDK_QT_SCRIPT_TARGET Qt4::QtScript)
+set(DZSDK_QT_OPENGL_TARGET Qt4::QtOpenGL)
+set(DZSDK_QT_NETWORK_TARGET Qt4::QtNetwork)
+set(DZSDK_QT_SQL_TARGET	Qt4::QtSql)
+set(DZSDK_QT_XML_TARGET	Qt4::QtXml)
+
+############################
+# FBX SETTINGS
+############################
+IF(NOT WIN32)
+	set(FBX_ARCH "x64")
+	SET(CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}")
+	SET(FBX_TMP_TARGET_LIBS ${FBX_TMP_TARGET_LIBS} dl pthread)
+	SET(CMAKE_CXX_FLAGS "-D_NDEBUG -Os ${CMAKE_CXX_FLAGS}")
+	SET(CMAKE_C_FLAGS "-D_NDEBUG -Os ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
+	SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall")
+
+	IF(APPLE)
+		set(FBX_LINKER_FLAGS "-lz -lxml2 -liconv")
+		IF(NOT FBX_CLANG)
+			SET(FBX_LINKER_FLAGS "-framework Carbon -framework SystemConfiguration ${FBX_LINKER_FLAGS}")
+		ELSE(NOT FBX_CLANG)
+			SET(FBX_LINKER_FLAGS "-framework CoreFoundation -framework SystemConfiguration ${FBX_LINKER_FLAGS}")
+		ENDIF(NOT FBX_CLANG)
+		SET(FBX_TMP_TARGET_LIBS ${FBX_TMP_TARGET_LIBS} iconv)
+	ENDIF()
+
+#	SET(CMAKE_CXX_FLAGS "-std=c++11 -stdlib\=libstdc++ ${CMAKE_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
+
+ENDIF(NOT WIN32)
+
+#set(FBX_SDK_DIR "" CACHE PATH "Path to FBX SDK" )
+if(NOT FBX_SDK_DIR)
+	message(FATAL_ERROR "Missing path to FBX SDK folder")
+	return()
+endif()
+
+set(FBX_SDK_INCLUDE "${FBX_SDK_DIR}/include" CACHE PATH "Path to FBX SDK Includes" )
+if(WIN32)
+	set(FBX_PLATFORM "vs2017/x64/release")
+	set(FBX_SDK_LIB "${FBX_SDK_DIR}/lib/${FBX_PLATFORM}/libfbxsdk-md.lib" CACHE FILEPATH "Path to FBX SDK static library (libfbx-md.lib)" )
+	set(FBX_SDK_XMLLIB "${FBX_SDK_DIR}/lib/${FBX_PLATFORM}/libxml2-md.lib" CACHE FILEPATH "Path to FBX SDK XML library (libxml2-md.lib)" )
+	set(FBX_IMPORT_LIBS
+		${FBX_SDK_LIB}
+		${FBX_SDK_XMLLIB}
+		${FBX_LINKER_FLAGS})
+elseif(APPLE)
+#	set(FBX_PLATFORM "clang/libstdcpp/release")
+    set(FBX_PLATFORM "clang/release")
+	set(FBX_SDK_LIB "${FBX_SDK_DIR}/lib/${FBX_PLATFORM}/libfbxsdk.a" CACHE FILEPATH "Path to FBX SDK static library (libfbxsdk.a)" )
+	set(FBX_IMPORT_LIBS
+		${FBX_SDK_LIB}
+		${FBX_LINKER_FLAGS})
+endif()
+
+############################
+# Opensubdiv SETTINGS
+############################
+#set(OPENSUBDIV_DIR "" CACHE PATH "Path to Opensubdiv folder" )
+if(NOT OPENSUBDIV_DIR)
+	message(FATAL_ERROR "Missing path to Opensubdiv folder")
+	return()
+endif()
+set(OPENSUBDIV_INCLUDE "${OPENSUBDIV_DIR}" CACHE PATH "Path to Opensubdiv include folder (usually same as root folder)" )
+if(WIN32)
+	set(OPENSUBDIV_LIB "${OPENSUBDIV_DIR}/build/lib/Release/osdCPU.lib" CACHE FILEPATH "Path to Opensubdiv CPU static library (osdCPU.lib)" )
+elseif(APPLE)
+	set(OPENSUBDIV_LIB "${OPENSUBDIV_DIR}/build/lib/Release/libosdCPU.a" CACHE FILEPATH "Path to Opensubdiv CPU static library (libosdCPU.a)" )
+endif()
+
+############################
+# DzBridge SETTINGS
+############################
+if (USE_DZBRIDGE_SUBMODULE)
+	add_subdirectory("dzbridge-common")
+	include_directories("dzbridge-common/include")
+else(NOT USE_DZBRIDGE_SUBMODULE)
+	#set(DZBRIDGE_DIR "" CACHE PATH "Path to DzBridge folder" )
+	if(NOT DZBRIDGE_DIR)
+		message(FATAL_ERROR "Missing path to DzBridge folder")
+		return()
+	endif()
+	set(DZBRIDGE_INCLUDE_DIR "${DZBRIDGE_DIR}/include" CACHE PATH "Path to Opensubdiv include folder (usually same as root folder)" )
+	if(WIN32)
+		set(DZBRIDGE_LIB_SHARED "${DZBRIDGE_DIR}/out/lib/Release/dzbridge.lib" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge.lib)" )
+		set(DZBRIDGE_LIB_DEBUG_SHARED "${DZBRIDGE_DIR}/out/lib/Debug/dzbridge.lib" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge.lib)" )
+
+		set(DZBRIDGE_LIB_STATIC "${DZBRIDGE_DIR}/out/lib/Release/dzbridge-static.lib" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge-static.lib)" )
+		set(DZBRIDGE_LIB_DEBUG_STATIC "${DZBRIDGE_DIR}/out/lib/Debug/dzbridge-static.lib" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge-static.lib)" )
+	elseif(APPLE)
+		set(DZBRIDGE_LIB_SHARED "${DZBRIDGE_DIR}/out/lib/Release/dzbridge.a" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge.a)" )
+		set(DZBRIDGE_LIB_DEBUG_SHARED "${DZBRIDGE_DIR}/out/lib/Debug/dzbridge.a" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge.a)" )
+
+		set(DZBRIDGE_LIB_STATIC "${DZBRIDGE_DIR}/out/lib/Release/dzbridge-static.a" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge-static.a)" )
+		set(DZBRIDGE_LIB_DEBUG_STATIC "${DZBRIDGE_DIR}/out/lib/Debug/dzbridge-static.a" CACHE FILEPATH "Path to Opensubdiv CPU static library (dzbridge-static.a)" )
+	endif()
+	if(NOT USE_DZBRIDGE_STATIC)
+		set(DZBRIDGE_LIB "${DZBRIDGE_LIB_SHARED}" CACHE FILEPATH "")
+		set(DZBRIDGE_LIB_DEBUG "${DZBRIDGE_LIB_DEBUG_SHARED}" CACHE FILEPATH "")
+		set(DZBRIDGE_LIB_FLAGS "")
+	else()
+		set(DZBRIDGE_LIB "${DZBRIDGE_LIB_STATIC}" CACHE FILEPATH "")
+		set(DZBRIDGE_LIB_DEBUG "${DZBRIDGE_LIB_DEBUG_STATIC}" CACHE FILEPATH "")
+		set(DZBRIDGE_LIB_FLAGS "DZ_BRIDGE_STATIC")
+	endif()
+endif(USE_DZBRIDGE_SUBMODULE)
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
+list(APPEND CMAKE_AUTOMOC_MOC_OPTIONS -i)
+
+add_subdirectory("Test/UnitTests")
+add_subdirectory("DazStudioPlugin")
diff --git a/Cinema 4D/appdir_common/plugins/DazToC4D/lib/CustomImports.py b/Cinema 4D/appdir_common/plugins/DazToC4D/lib/CustomImports.py
@@ -125,13 +125,15 @@ def genesis_import(self, file_path, dtu, sss_value, normal_value, bump_value):
         print("Material Conversion Done")
         c4d.EventAdd()
 
-        wgt.store_subdivision(dtu)
-        if wgt.check_level():
-            auto_weight = c4d.gui.QuestionDialog(
-                "Subdivisions have been detected\nthis is currently not fully supported.\nWould you like to autoweight the mesh?"
-            )
-            if auto_weight:
-                wgt.auto_calculate_weights(var.body)
+        ## DB 2022-June-03: subdivision correction is now done in Daz Studio plugin,
+        ##   the following code block no longer needed.
+        # wgt.store_subdivision(dtu)
+        # if wgt.check_level():
+        #     auto_weight = c4d.gui.QuestionDialog(
+        #         "Subdivisions have been detected\nthis is currently not fully supported.\nWould you like to autoweight the mesh?"
+        #     )
+        #     if auto_weight:
+        #         wgt.auto_calculate_weights(var.body)
 
         pose.store_pose(dtu)
         pose.store_offset(dtu)

diff --git a/Cinema 4D/appdir_common/plugins/DazToC4D/lib/DtC4DDialogs.py b/Cinema 4D/appdir_common/plugins/DazToC4D/lib/DtC4DDialogs.py
@@ -170,6 +170,7 @@ def Command(self, id, msg):
 
         if id == self.BUTTON_SAVE:
             c4d.CallCommand(12255, 12255)  # Save Project with Assets...
+            self.Close()
 
         if id == self.BUTTON_CANCEL:
             self.Close()

diff --git a/Cinema 4D/appdir_common/plugins/DazToC4D/lib/DtC4DGuiImportDaz.py b/Cinema 4D/appdir_common/plugins/DazToC4D/lib/DtC4DGuiImportDaz.py
@@ -131,7 +131,7 @@ def buttonBC(self, tooltipText="", presetLook=""):
         return bc
 
     def CreateLayout(self):
-        self.SetTitle("DazToC4D v1.3.0")
+        self.SetTitle("DazToC4D 2022.1")
         self.AddSeparatorH(c4d.BFV_SCALEFIT)  # Separator H
 
         bc = c4d.BaseContainer()  # Create a new container to store the button image

diff --git a/Cinema 4D/appdir_common/plugins/DazToC4D/lib/StandardMaterials.py b/Cinema 4D/appdir_common/plugins/DazToC4D/lib/StandardMaterials.py
@@ -46,7 +46,30 @@ def set_up_transmission(self, mat, prop):
 
     def set_up_diffuse(self, mat, prop):
         lib = texture_library
+
         if self.is_diffuse(prop):
+            # DB 2022-June-03: New Standard Color Channel Assignment
+            # Adding the diffuse texture file here fixes errors in C4D r25 about
+            #   "Unable to find..." diffuse texture during "Save Project with Assets"
+            #    operations.
+            for prop_name in lib["color"]["Name"]:
+                if prop_name in prop.keys():
+                    if prop[prop_name]["Texture"] != "":
+                        path = prop[prop_name]["Texture"]
+                        hex_str = prop[prop_name]["Value"]
+                        hex_str = self.check_value("hex", hex_str)
+                        color = convert_color(hex_str)
+                        vector = c4d.Vector(color[0], color[1], color[2])
+                        texture = StdMaterials.create_texture(mat, path)
+                        mat[c4d.MATERIAL_USE_COLOR] = True
+                        mat[c4d.MATERIAL_COLOR_SHADER] = texture
+                        mat[c4d.MATERIAL_COLOR_COLOR] = vector
+                        mat[c4d.MATERIAL_COLOR_TEXTUREMIXING] = c4d.MATERIAL_TEXTUREMIXING_MULTIPLY
+
+            # Original Code: ?Adds IrayUber Diffuse Component as a Custom "Diffuse
+            #   Layer" to the C4D Reflection Channel? I am uncertain about the
+            #   full intent of this code block, leaving for now.
+            #   -DB (2022-June-03)
             diffuse = mat.AddReflectionLayer()
             diffuse.SetName("Diffuse Layer")
             mat[