Merge pull request #1178 from JulianGro/rename_fbx_to_model-serializers

Rename fbx to model serializers

android/apps/interface/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME native-lib)
 setup_hifi_library()
-link_hifi_libraries(shared task networking gl gpu qml image fbx hfm render-utils physics entities octree ${PLATFORM_GL_BACKEND})
+link_hifi_libraries(shared task networking gl gpu qml image model-serializers hfm render-utils physics entities octree ${PLATFORM_GL_BACKEND})
 target_opengl()
 target_bullet()
 

android/apps/questInterface/CMakeLists.txt

@@ -2,7 +2,7 @@ set(TARGET_NAME questInterface)
 setup_hifi_library()
 link_hifi_libraries(
     shared task networking qml
-    image fbx hfm render-utils physics entities octree 
+    image model-serializers hfm render-utils physics entities octree
     oculusMobile oculusMobilePlugin
     gl gpu ${PLATFORM_GL_BACKEND}
 )

assignment-client/CMakeLists.txt

@@ -12,7 +12,7 @@ setup_thread_debugger()
 
 # link in the shared libraries
 link_hifi_libraries(
-  audio avatars octree gpu graphics shaders fbx hfm entities
+  audio avatars octree gpu graphics shaders model-serializers hfm entities
   networking animation recording shared script-engine embedded-webserver
   controllers physics plugins midi image
   material-networking model-networking ktx shaders

interface/CMakeLists.txt

@@ -219,7 +219,7 @@ endif()
 # link required hifi libraries
 link_hifi_libraries(
   shared workload task octree ktx gpu gl procedural graphics graphics-scripting render
-  pointers recording hfm fbx networking material-networking
+  pointers recording hfm model-serializers networking material-networking
   model-networking model-baker entities avatars
   audio audio-client animation script-engine physics
   render-utils entities-renderer avatars-renderer ui qml auto-updater midi

libraries/animation/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME animation)
 setup_hifi_library(Network Script)
-link_hifi_libraries(shared graphics fbx)
+link_hifi_libraries(shared graphics model-serializers)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(hfm)

libraries/avatars-renderer/CMakeLists.txt

@@ -4,7 +4,7 @@ link_hifi_libraries(shared shaders gpu graphics animation material-networking mo
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(hfm)
-include_hifi_library_headers(fbx)
+include_hifi_library_headers(model-serializers)
 include_hifi_library_headers(recording)
 include_hifi_library_headers(ktx)
 include_hifi_library_headers(procedural)

libraries/baking/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(TARGET_NAME baking)
 setup_hifi_library(Concurrent)
 
-link_hifi_libraries(shared shaders graphics networking procedural graphics-scripting ktx image fbx model-baker task)
+link_hifi_libraries(shared shaders graphics networking procedural graphics-scripting ktx image model-serializers model-baker task)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(material-networking)

libraries/display-plugins/CMakeLists.txt

@@ -7,7 +7,7 @@ include_hifi_library_headers(model-networking)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(graphics)
 include_hifi_library_headers(hfm)
-include_hifi_library_headers(fbx)
+include_hifi_library_headers(model-serializers)
 include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)
 include_hifi_library_headers(render)

libraries/entities-renderer/CMakeLists.txt

@@ -9,7 +9,7 @@ include_hifi_library_headers(audio)
 include_hifi_library_headers(physics)
 include_hifi_library_headers(animation)
 include_hifi_library_headers(hfm)
-include_hifi_library_headers(fbx)
+include_hifi_library_headers(model-serializers)
 include_hifi_library_headers(entities)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(controllers)

libraries/entities/CMakeLists.txt

@@ -2,7 +2,7 @@ set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
 target_include_directories(${TARGET_NAME} PRIVATE "${OPENSSL_INCLUDE_DIR}")
 include_hifi_library_headers(hfm)
-include_hifi_library_headers(fbx)
+include_hifi_library_headers(model-serializers)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)

libraries/graphics-scripting/CMakeLists.txt

@@ -1,4 +1,4 @@
 set(TARGET_NAME graphics-scripting)
 setup_hifi_library()
-link_hifi_libraries(shared networking graphics fbx image material-networking model-networking script-engine)
+link_hifi_libraries(shared networking graphics model-serializers image material-networking model-networking script-engine)
 include_hifi_library_headers(gpu)

libraries/model-networking/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME model-networking)
 setup_hifi_library()
-link_hifi_libraries(shared shaders networking graphics fbx procedural model-baker)
+link_hifi_libraries(shared shaders networking graphics model-serializers procedural model-baker)
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(task)
 include_hifi_library_headers(gpu)

libraries/model-serializers/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(TARGET_NAME fbx)
+set(TARGET_NAME model-serializers)
 setup_hifi_library()
 
 link_hifi_libraries(shared graphics networking image hfm)

libraries/model-serializers/src/FBX.h

@@ -1,6 +1,6 @@
 //
 //  FBX.h
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Ryan Huffman on 9/5/17.
 //  Copyright 2017 High Fidelity, Inc.

libraries/model-serializers/src/FBXSerializer.cpp

@@ -1,6 +1,6 @@
 //
 //  FBXSerializer.cpp
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Andrzej Kapolka on 9/18/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/model-serializers/src/FBXSerializer.h

@@ -1,6 +1,6 @@
 //
 //  FBXSerializer.h
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Andrzej Kapolka on 9/18/13.
 //  Copyright 2013 High Fidelity, Inc.

libraries/model-serializers/src/FBXSerializer_Material.cpp

@@ -1,6 +1,6 @@
 //
 //  FBXSerializer_Material.cpp
-//  interface/src/fbx
+//  libraries/model-serializers/src
 //
 //  Created by Sam Gateau on 8/27/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/model-serializers/src/FBXSerializer_Mesh.cpp

@@ -1,6 +1,6 @@
 //
 //  FBXSerializer_Mesh.cpp
-//  interface/src/fbx
+//  libraries/model-serializers/src
 //
 //  Created by Sam Gateau on 8/27/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/model-serializers/src/FBXSerializer_Node.cpp

@@ -1,6 +1,6 @@
 //
 //  FBXSerializer_Node.cpp
-//  interface/src/fbx
+//  libraries/model-serializers/src
 //
 //  Created by Sam Gateau on 8/27/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/model-serializers/src/FBXToJSON.cpp

@@ -1,6 +1,6 @@
 //
 //  FBXToJSON.cpp
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Simon Walton on 5/4/2018.
 //  Copyright 2018 High Fidelity, Inc.

libraries/model-serializers/src/FBXToJSON.h

@@ -1,6 +1,6 @@
 //
 //  FBXToJSON.h
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Simon Walton on 5/4/2018.
 //  Copyright 2018 High Fidelity, Inc.

libraries/model-serializers/src/FBXWriter.cpp

@@ -1,6 +1,6 @@
 //
 //  FBXWriter.cpp
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Ryan Huffman on 9/5/17.
 //  Copyright 2017 High Fidelity, Inc.

libraries/model-serializers/src/FBXWriter.h

@@ -1,6 +1,6 @@
 //
 //  FBXWriter.h
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Ryan Huffman on 9/5/17.
 //  Copyright 2017 High Fidelity, Inc.

libraries/model-serializers/src/GLTFSerializer.cpp

@@ -1,6 +1,6 @@
 //
 //  GLTFSerializer.cpp
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Luis Cuenca on 8/30/17.
 //  Copyright 2017 High Fidelity, Inc.

libraries/model-serializers/src/GLTFSerializer.h

@@ -1,6 +1,6 @@
 //
 //  GLTFSerializer.h
-//  libraries/fbx/src
+//  libraries/model-serializers/src
 //
 //  Created by Luis Cuenca on 8/30/17.
 //  Copyright 2017 High Fidelity, Inc.

libraries/model-serializers/src/OBJSerializer.cpp

@@ -1,6 +1,6 @@
 //
 //  OBJSerializer.cpp
-//  libraries/fbx/src/
+//  libraries/model-serializers/src
 //
 //  Created by Seth Alves on 3/7/15.
 //  Copyright 2013 High Fidelity, Inc.

libraries/model-serializers/src/OBJSerializer.h

@@ -1,6 +1,6 @@
 //
 //  OBJSerializer.h
-//  libraries/fbx/src/
+//  libraries/model-serializers/src
 //
 //  Created by Seth Alves on 3/6/15.
 //  Copyright 2015 High Fidelity, Inc.

libraries/model-serializers/src/OBJWriter.cpp

@@ -1,6 +1,6 @@
 //
 //  OBJWriter.cpp
-//  libraries/fbx/src/
+//  libraries/model-serializers/src
 //
 //  Created by Seth Alves on 2017-1-27.
 //  Copyright 2017 High Fidelity, Inc.

libraries/model-serializers/src/OBJWriter.h

@@ -1,6 +1,6 @@
 //
 //  OBJWriter.h
-//  libraries/fbx/src/
+//  libraries/model-serializers/src
 //
 //  Created by Seth Alves on 2017-1-27.
 //  Copyright 2017 High Fidelity, Inc.

libraries/physics/CMakeLists.txt

@@ -12,7 +12,7 @@ include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(hfm)
-include_hifi_library_headers(fbx)
+include_hifi_library_headers(model-serializers)
 include_hifi_library_headers(graphics)
 
 target_bullet()

libraries/render-utils/CMakeLists.txt

@@ -3,7 +3,7 @@ set(TARGET_NAME render-utils)
 # pull in the resources.qrc file
 qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
 setup_hifi_library(Gui Network Qml Quick Script)
-link_hifi_libraries(shared task ktx gpu shaders graphics graphics-scripting material-networking model-networking render animation fbx image procedural)
+link_hifi_libraries(shared task ktx gpu shaders graphics graphics-scripting material-networking model-networking render animation model-serializers image procedural)
 include_hifi_library_headers(audio)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)

libraries/script-engine/CMakeLists.txt

@@ -7,7 +7,7 @@ if (NOT ANDROID)
   target_quazip()
 endif ()
 
-link_hifi_libraries(shared networking shaders material-networking model-networking recording avatars fbx entities controllers animation audio midi)
+link_hifi_libraries(shared networking shaders material-networking model-networking recording avatars model-serializers entities controllers animation audio midi)
 include_hifi_library_headers(gl)
 include_hifi_library_headers(hfm)
 include_hifi_library_headers(gpu)

plugins/openvr/CMakeLists.txt

@@ -12,7 +12,7 @@ if ((WIN32 OR UNIX AND NOT APPLE) AND NOT USE_GLES)
     setup_hifi_plugin(Gui Qml Multimedia)
     link_hifi_libraries(shared task gl qml networking controllers ui
         plugins display-plugins ui-plugins input-plugins script-engine
-        audio-client render-utils graphics shaders gpu render material-networking model-networking model-baker hfm fbx ktx image procedural ${PLATFORM_GL_BACKEND})
+        audio-client render-utils graphics shaders gpu render material-networking model-networking model-baker hfm model-serializers ktx image procedural ${PLATFORM_GL_BACKEND})
     include_hifi_library_headers(octree)
 
     target_openvr()

tools/jsdoc/plugins/hifi.js

@@ -44,7 +44,7 @@ exports.handlers = {
             '../../libraries/controllers/src/controllers/impl/',
             '../../libraries/display-plugins/src/display-plugins/',
             '../../libraries/entities/src',
-            '../../libraries/fbx/src',
+            '../../libraries/model-serializers/src',
             '../../libraries/graphics/src/graphics/',
             '../../libraries/graphics-scripting/src/graphics-scripting/',
             '../../libraries/image/src/image',

tools/oven/CMakeLists.txt

@@ -2,7 +2,7 @@ set(TARGET_NAME oven)
 
 setup_hifi_project(Widgets Gui Concurrent)
 
-link_hifi_libraries(shared shaders image gpu ktx fbx hfm baking graphics networking procedural material-networking model-baker task)
+link_hifi_libraries(shared shaders image gpu ktx model-serializers hfm baking graphics networking procedural material-networking model-baker task)
 
 setup_memory_debugger()
 setup_thread_debugger()

tools/skeleton-dump/CMakeLists.txt

@@ -2,6 +2,6 @@ set(TARGET_NAME skeleton-dump)
 setup_hifi_project(Core)
 setup_memory_debugger()
 setup_thread_debugger()
-link_hifi_libraries(shared fbx hfm graphics gpu gl animation)
+link_hifi_libraries(shared model-serializers hfm graphics gpu gl animation)
 
 include_hifi_library_headers(image)

tools/vhacd-util/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME vhacd-util)
 setup_hifi_project(Core)
-link_hifi_libraries(shared fbx hfm graphics gpu gl)
+link_hifi_libraries(shared model-serializers hfm graphics gpu gl)
 
 include_hifi_library_headers(image)