rename libraries/model(src/model) -> libraries/graphics(src/graphics)

android/app/CMakeLists.txt

@@ -11,7 +11,7 @@ link_hifi_libraries(
     physics
     audio audio-client
     ui midi controllers pointers
-    model model-networking fbx animation
+    graphics model-networking fbx animation
     entities entities-renderer
     avatars avatars-renderer
     ui-plugins input-plugins

assignment-client/CMakeLists.txt

@@ -11,7 +11,7 @@ setup_memory_debugger()
 
 # link in the shared libraries
 link_hifi_libraries(
-  audio avatars octree gpu model fbx entities
+  audio avatars octree gpu graphics fbx entities
   networking animation recording shared script-engine embedded-webserver
   controllers physics plugins midi image
 )

interface/CMakeLists.txt

@@ -201,7 +201,7 @@ endif()
 
 # link required hifi libraries
 link_hifi_libraries(
-  shared octree ktx gpu gl procedural model render
+  shared octree ktx gpu gl procedural graphics render
   pointers
   recording fbx networking model-networking entities avatars trackers
   audio audio-client animation script-engine physics

interface/src/Application.h

@@ -71,7 +71,7 @@
 #include "UndoStackScriptingInterface.h"
 
 #include <procedural/ProceduralSkybox.h>
-#include <model/Skybox.h>
+#include <graphics/Skybox.h>
 #include <ModelScriptingInterface.h>
 #include "FrameTimingsScriptingInterface.h"
 

libraries/animation/CMakeLists.txt

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

libraries/avatars-renderer/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(TARGET_NAME avatars-renderer)
-AUTOSCRIBE_SHADER_LIB(gpu model render render-utils)
+AUTOSCRIBE_SHADER_LIB(gpu graphics render render-utils)
 setup_hifi_library(Widgets Network Script)
-link_hifi_libraries(shared gpu model animation model-networking script-engine render render-utils image trackers entities-renderer)
+link_hifi_libraries(shared gpu graphics animation model-networking script-engine render render-utils image trackers entities-renderer)
 include_hifi_library_headers(avatars)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(fbx)

libraries/baking/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(TARGET_NAME baking)
 setup_hifi_library(Concurrent)
 
-link_hifi_libraries(shared model networking ktx image fbx)
+link_hifi_libraries(shared graphics networking ktx image fbx)
 include_hifi_library_headers(gpu)
 
 add_dependency_external_projects(draco)

libraries/display-plugins/CMakeLists.txt

@@ -5,7 +5,7 @@ link_hifi_libraries(shared plugins ui-plugins gl ui render-utils ${PLATFORM_GL_B
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(model-networking)
 include_hifi_library_headers(networking)
-include_hifi_library_headers(model)
+include_hifi_library_headers(graphics)
 include_hifi_library_headers(fbx)
 include_hifi_library_headers(image)
 include_hifi_library_headers(ktx)

libraries/entities-renderer/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(TARGET_NAME entities-renderer)
-AUTOSCRIBE_SHADER_LIB(gpu model procedural render render-utils)
+AUTOSCRIBE_SHADER_LIB(gpu graphics procedural render render-utils)
 setup_hifi_library(Widgets Network Script)
-link_hifi_libraries(shared gpu procedural model model-networking script-engine render render-utils image ui pointers)
+link_hifi_libraries(shared gpu procedural graphics model-networking script-engine render render-utils image ui pointers)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(gl)
 include_hifi_library_headers(ktx)

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp

@@ -65,7 +65,7 @@
 #pragma warning(pop)
 #endif
 
-#include "model/Geometry.h"
+#include "graphics/Geometry.h"
 
 #include "StencilMaskPass.h"
 

libraries/entities-renderer/src/RenderablePolyVoxEntityItem.h

@@ -21,8 +21,8 @@
 
 #include <gpu/Forward.h>
 #include <gpu/Context.h>
-#include <model/Forward.h>
+#include <graphics/Forward.h>
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
 #include <TextureCache.h>
 #include <PolyVoxEntityItem.h>
 

libraries/entities-renderer/src/RenderableZoneEntityItem.cpp

@@ -13,7 +13,7 @@
 
 #include <gpu/Batch.h>
 
-#include <model/Stage.h>
+#include <graphics/Stage.h>
 
 #include <DependencyManager.h>
 #include <GeometryCache.h>

libraries/entities-renderer/src/RenderableZoneEntityItem.h

@@ -13,9 +13,9 @@
 #define hifi_RenderableZoneEntityItem_h
 
 #include <ZoneEntityItem.h>
-#include <model/Skybox.h>
+#include <graphics/Skybox.h>
-#include <model/Haze.h>
+#include <graphics/Haze.h>
-#include <model/Stage.h>
+#include <graphics/Stage.h>
 #include <LightStage.h>
 #include <BackgroundStage.h>
 #include <HazeStage.h>

libraries/entities-renderer/src/polyvox.slf

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 <@include DeferredBufferWrite.slh@>
 
 in vec3 _normal;

libraries/entities-renderer/src/polyvox_fade.slf

@@ -11,7 +11,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 <@include DeferredBufferWrite.slh@>
 
 <@include Fade.slh@>

libraries/entities/CMakeLists.txt

@@ -1,4 +1,4 @@
 set(TARGET_NAME entities)
 setup_hifi_library(Network Script)
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
-link_hifi_libraries(shared networking octree avatars model)
+link_hifi_libraries(shared networking octree avatars graphics)

libraries/fbx/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(TARGET_NAME fbx)
 setup_hifi_library()
 
-link_hifi_libraries(shared model networking image)
+link_hifi_libraries(shared graphics networking image)
 include_hifi_library_headers(gpu image)
 
 target_draco()

libraries/fbx/src/FBX.h

@@ -25,8 +25,8 @@
 #include <Extents.h>
 #include <Transform.h>
 
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
-#include <model/Material.h>
+#include <graphics/Material.h>
 
 static const QByteArray FBX_BINARY_PROLOG = "Kaydara FBX Binary  ";
 static const int FBX_HEADER_BYTES_BEFORE_VERSION = 23;

libraries/fbx/src/FBXReader.h

@@ -27,8 +27,8 @@
 #include <Extents.h>
 #include <Transform.h>
 
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
-#include <model/Material.h>
+#include <graphics/Material.h>
 
 class QIODevice;
 class FBXNode;

libraries/fbx/src/OBJWriter.cpp

@@ -11,7 +11,7 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include "model/Geometry.h"
+#include "graphics/Geometry.h"
 #include "OBJWriter.h"
 #include "ModelFormatLogging.h"
 

libraries/fbx/src/OBJWriter.h

@@ -15,7 +15,7 @@
 
 #include <QString>
 #include <QList>
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
 
 using MeshPointer = std::shared_ptr<model::Mesh>;
 

libraries/graphics/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(TARGET_NAME model)
+set(TARGET_NAME graphics)
-AUTOSCRIBE_SHADER_LIB(gpu model)
+AUTOSCRIBE_SHADER_LIB(gpu graphics)
 setup_hifi_library()
 link_hifi_libraries(shared ktx gpu image)

libraries/graphics/src/graphics/Asset.cpp

@@ -1,6 +1,6 @@
 //
 //  Asset.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 08/21/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/graphics/src/graphics/Asset.h

@@ -1,6 +1,6 @@
 //
 //  Asset.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 08/21/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/graphics/src/graphics/Forward.h

@@ -1,6 +1,6 @@
 //
 //  Forward.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Bradley Austin Davis on 2017/06/21
 //  Copyright 2013-2017 High Fidelity, Inc.

libraries/graphics/src/graphics/Geometry.cpp

@@ -1,6 +1,6 @@
 //
 //  Geometry.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 12/5/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Geometry.h

@@ -1,6 +1,6 @@
 //
 //  Geometry.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 12/5/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/GraphicsLogging.cpp

@@ -6,6 +6,6 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ModelLogging.h"
+#include "GraphicsLogging.h"
 
-Q_LOGGING_CATEGORY(modelLog, "hifi.model")
+Q_LOGGING_CATEGORY(graphicsLog, "hifi.graphics")

libraries/graphics/src/graphics/GraphicsLogging.h

@@ -1,5 +1,5 @@
 //
-//  ModelLogging.h
+//  GraphicsLogging.h
 //  hifi
 //
 //  Created by Sam Gateau on 9/20/15.
@@ -11,4 +11,4 @@
 
 #include <QLoggingCategory>
 
-Q_DECLARE_LOGGING_CATEGORY(modelLog)
+Q_DECLARE_LOGGING_CATEGORY(graphicsLog)

libraries/graphics/src/graphics/Haze.cpp

@@ -1,6 +1,6 @@
 //
 //  Haze.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Nissim Hadar on 9/13/2017.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Haze.h

@@ -1,6 +1,6 @@
 //
 //  MakeHaze.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Nissim Hadar on 9/13/2017.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Light.cpp

@@ -1,6 +1,6 @@
 //
 //  Light.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 1/26/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Light.h

@@ -1,6 +1,6 @@
 //
 //  Light.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 12/10/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Light.slh

@@ -11,8 +11,8 @@
 <@if not MODEL_LIGHT_SLH@>
 <@def MODEL_LIGHT_SLH@>
 
-<@include model/LightVolume.shared.slh@>
+<@include graphics/LightVolume.shared.slh@>
-<@include model/LightIrradiance.shared.slh@>
+<@include graphics/LightIrradiance.shared.slh@>
 
 // NOw lets define Light
 struct Light {
@@ -30,7 +30,7 @@ float getLightIntensity(Light l) { return lightIrradiance_getIntensity(l.irradia
 vec3 getLightIrradiance(Light l) { return lightIrradiance_getIrradiance(l.irradiance); }
 
 // AMbient lighting needs extra info provided from a different Buffer
-<@include model/SphericalHarmonics.shared.slh@>
+<@include graphics/SphericalHarmonics.shared.slh@>
 // Light Ambient
 struct LightAmbient {
     vec4 _ambient;

libraries/graphics/src/graphics/LightVolume.shared.slh

@@ -3,7 +3,7 @@
 #define LightVolume_Shared_slh
 
 //  Light.shared.slh
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 14/9/2016.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Material.cpp

@@ -1,6 +1,6 @@
 //
 //  Material.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 12/10/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Material.h

@@ -1,6 +1,6 @@
 //
 //  Material.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 12/10/2014.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Skybox.cpp

@@ -1,6 +1,6 @@
 //
 //  Skybox.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 5/4/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/graphics/src/graphics/Skybox.h

@@ -1,6 +1,6 @@
 //
 //  Skybox.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 5/4/2015.
 //  Copyright 2015 High Fidelity, Inc.

libraries/graphics/src/graphics/SphericalHarmonics.shared.slh

@@ -3,7 +3,7 @@
 #define SphericalHarmonics_Shared_slh
 
 //  SphericalHarmonics.shared.slh
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 14/9/2016.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Stage.cpp

@@ -1,6 +1,6 @@
 //
 //  Stage.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 2/24/2015.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/Stage.h

@@ -1,6 +1,6 @@
 //
 //  Stage.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 2/24/2015.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/TextureMap.cpp

@@ -1,6 +1,6 @@
 //
 //  TextureMap.cpp
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 5/6/2015.
 //  Copyright 2014 High Fidelity, Inc.

libraries/graphics/src/graphics/TextureMap.h

@@ -1,6 +1,6 @@
 //
 //  TextureMap.h
-//  libraries/model/src/model
+//  libraries/graphics/src/graphics
 //
 //  Created by Sam Gateau on 5/6/2015.
 //  Copyright 2014 High Fidelity, Inc.

libraries/model-networking/CMakeLists.txt

@@ -1,4 +1,4 @@
 set(TARGET_NAME model-networking)
 setup_hifi_library()
-link_hifi_libraries(shared networking model fbx ktx image)
+link_hifi_libraries(shared networking graphics fbx ktx image)
 include_hifi_library_headers(gpu)

libraries/model-networking/src/model-networking/ModelCache.h

@@ -15,8 +15,8 @@
 #include <DependencyManager.h>
 #include <ResourceCache.h>
 
-#include <model/Material.h>
+#include <graphics/Material.h>
-#include <model/Asset.h>
+#include <graphics/Asset.h>
 
 #include "FBXReader.h"
 #include "TextureCache.h"

libraries/model-networking/src/model-networking/SimpleMeshProxy.cpp

@@ -11,7 +11,7 @@
 
 #include "SimpleMeshProxy.h"
 
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
 
 MeshPointer SimpleMeshProxy::getMeshPointer() const {
     return _mesh;

libraries/model-networking/src/model-networking/TextureCache.h

@@ -21,7 +21,7 @@
 
 #include <DependencyManager.h>
 #include <ResourceCache.h>
-#include <model/TextureMap.h>
+#include <graphics/TextureMap.h>
 #include <image/Image.h>
 #include <ktx/KTX.h>
 

libraries/physics/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME physics)
 setup_hifi_library()
-link_hifi_libraries(shared fbx entities model)
+link_hifi_libraries(shared fbx entities graphics)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(gpu)
 include_hifi_library_headers(avatars)

libraries/physics/src/CollisionRenderMeshCache.h

@@ -16,7 +16,7 @@
 #include <vector>
 #include <unordered_map>
 
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
 
 
 class CollisionRenderMeshCache {

libraries/procedural/CMakeLists.txt

@@ -1,5 +1,5 @@
 set(TARGET_NAME procedural)
-AUTOSCRIBE_SHADER_LIB(gpu model)
+AUTOSCRIBE_SHADER_LIB(gpu graphics)
 setup_hifi_library()
-link_hifi_libraries(shared gpu networking model model-networking ktx image)
+link_hifi_libraries(shared gpu networking graphics model-networking ktx image)
 

libraries/procedural/src/procedural/ProceduralSkybox.cpp

@@ -15,8 +15,8 @@
 #include <gpu/Context.h>
 #include <ViewFrustum.h>
 
-#include <model/skybox_vert.h>
+#include <graphics/skybox_vert.h>
-#include <model/skybox_frag.h>
+#include <graphics/skybox_frag.h>
 
 ProceduralSkybox::ProceduralSkybox() : model::Skybox() {
     _procedural._vertexSource = skybox_vert;

libraries/procedural/src/procedural/ProceduralSkybox.h

@@ -13,7 +13,7 @@
 #ifndef hifi_ProceduralSkybox_h
 #define hifi_ProceduralSkybox_h
 
-#include <model/Skybox.h>
+#include <graphics/Skybox.h>
 
 #include "Procedural.h"
 

libraries/render-utils/CMakeLists.txt

@@ -1,9 +1,9 @@
 set(TARGET_NAME render-utils)
-AUTOSCRIBE_SHADER_LIB(gpu model render)
+AUTOSCRIBE_SHADER_LIB(gpu graphics render)
 # pull in the resources.qrc file
 qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc")
 setup_hifi_library(Widgets OpenGL Network Qml Quick Script)
-link_hifi_libraries(shared ktx gpu model model-networking render animation fbx image procedural)
+link_hifi_libraries(shared ktx gpu graphics model-networking render animation fbx image procedural)
 include_hifi_library_headers(networking)
 include_hifi_library_headers(octree)
 include_hifi_library_headers(audio)

libraries/render-utils/src/BackgroundStage.h

@@ -11,7 +11,7 @@
 #ifndef hifi_render_utils_BackgroundStage_h
 #define hifi_render_utils_BackgroundStage_h
 
-#include <model/Stage.h>
+#include <graphics/Stage.h>
 #include <set>
 #include <unordered_map>
 #include <render/IndexedContainer.h>

libraries/render-utils/src/DeferredGlobalLight.slh

@@ -11,7 +11,7 @@
 <@if not DEFERRED_GLOBAL_LIGHT_SLH@>
 <@def DEFERRED_GLOBAL_LIGHT_SLH@>
 
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 
 <@include LightingModel.slh@>
 <$declareLightBuffer()$>

libraries/render-utils/src/DeferredLightingEffect.h

@@ -17,8 +17,8 @@
 #include <DependencyManager.h>
 #include <NumericalConstants.h>
 
-#include "model/Light.h"
+#include "graphics/Light.h"
-#include "model/Geometry.h"
+#include "graphics/Geometry.h"
 
 #include <procedural/ProceduralSkybox.h>
 

libraries/render-utils/src/DrawHaze.h

@@ -19,7 +19,7 @@
 #include <gpu/Pipeline.h>
 #include <render/Forward.h>
 #include <render/DrawTask.h>
-#include <model/Haze.h>
+#include <graphics/Haze.h>
 
 #include "SurfaceGeometryPass.h"
 

libraries/render-utils/src/ForwardGlobalLight.slh

@@ -11,7 +11,7 @@
 <@if not DEFERRED_GLOBAL_LIGHT_SLH@>
 <@def DEFERRED_GLOBAL_LIGHT_SLH@>
 
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 
 <@include LightingModel.slh@>
 <$declareLightBuffer()$>

libraries/render-utils/src/GeometryCache.cpp

@@ -31,7 +31,7 @@
 
 #include "gpu/StandardShaderLib.h"
 
-#include "model/TextureMap.h"
+#include "graphics/TextureMap.h"
 #include "render/Args.h"
 
 #include "standardTransformPNTC_vert.h"

libraries/render-utils/src/GeometryCache.h

@@ -28,8 +28,8 @@
 
 #include <render/ShapePipeline.h>
 
-#include <model/Material.h>
+#include <graphics/Material.h>
-#include <model/Asset.h>
+#include <graphics/Asset.h>
 
 class SimpleProgramKey;
 

libraries/render-utils/src/Haze.slf

@@ -12,7 +12,7 @@
 <@include DeferredTransform.slh@>
 <$declareDeferredFrameTransform()$>
 
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 
 <@include LightingModel.slh@>
 <$declareLightBuffer()$>

libraries/render-utils/src/HazeStage.h

@@ -11,7 +11,7 @@
 #ifndef hifi_render_utils_HazeStage_h
 #define hifi_render_utils_HazeStage_h
 
-#include <model/Stage.h>
+#include <graphics/Stage.h>
 #include <set>
 #include <unordered_map>
 #include <render/IndexedContainer.h>
@@ -19,7 +19,7 @@
 
 #include <render/Forward.h>
 #include <render/DrawTask.h>
-#include <model/Haze.h>
+#include <graphics/Haze.h>
 
 // Haze stage to set up haze-related rendering tasks
 class HazeStage : public render::Stage {

libraries/render-utils/src/LightPayload.h

@@ -12,7 +12,7 @@
 #define hifi_LightPayload_h
 
 
-#include <model/Light.h>
+#include <graphics/Light.h>
 #include <render/Item.h>
 #include "LightStage.h"
 #include "TextureCache.h"

libraries/render-utils/src/LightStage.h

@@ -17,7 +17,7 @@
 
 #include <gpu/Framebuffer.h>
 
-#include <model/Light.h>
+#include <graphics/Light.h>
 
 #include <render/IndexedContainer.h>
 #include <render/Stage.h>

libraries/render-utils/src/MeshPartPayload.h

@@ -19,7 +19,7 @@
 #include <render/Scene.h>
 #include <render/ShapePipeline.h>
 
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
 
 #include "Model.h"
 

libraries/render-utils/src/StencilMaskPass.cpp

@@ -129,7 +129,7 @@ void PrepareStencil::testNoAA(gpu::State& state) {
 }
 
 // Pass if this area WAS marked as BACKGROUND
-// (see: model/src/Skybox.cpp, procedural/src/ProceduralSkybox.cpp)
+// (see: graphics/src/Skybox.cpp, procedural/src/ProceduralSkybox.cpp)
 void PrepareStencil::testBackground(gpu::State& state) {
     state.setStencilTest(true, 0x00, gpu::State::StencilTest(STENCIL_BACKGROUND, 0xFF, gpu::EQUAL,
         gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));

libraries/render-utils/src/StencilMaskPass.h

@@ -14,7 +14,7 @@
 
 #include <render/Engine.h>
 #include <gpu/Pipeline.h>
-#include <model/Geometry.h>
+#include <graphics/Geometry.h>
 
 class PrepareStencilConfig : public render::Job::Config {
     Q_OBJECT

libraries/render-utils/src/deferred_light_point.slv

@@ -18,7 +18,7 @@
 
 <$declareStandardTransform()$>
 
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 
 <$declareLightBuffer(256)$>
 

libraries/render-utils/src/deferred_light_spot.slv

@@ -18,7 +18,7 @@
 
 <$declareStandardTransform()$>
 
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 <$declareLightBuffer(256)$>
 
 uniform lightIndexBuffer {

libraries/render-utils/src/forward_model.slf

@@ -16,7 +16,7 @@
 <@include ForwardGlobalLight.slh@>
 <$declareEvalSkyboxGlobalColor()$>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include gpu/Transform.slh@>
 <$declareStandardCameraTransform()$>

libraries/render-utils/src/forward_model_normal_map.slf

@@ -14,7 +14,7 @@
 
 <@include ForwardBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, _SCRIBE_NULL, EMISSIVE, OCCLUSION, SCATTERING)$>

libraries/render-utils/src/forward_model_normal_specular_map.slf

@@ -14,7 +14,7 @@
 
 <@include ForwardBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/forward_model_specular_map.slf

@@ -14,7 +14,7 @@
 
 <@include ForwardBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/forward_model_translucent.slf

@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include ForwardGlobalLight.slh@>
 

libraries/render-utils/src/forward_model_unlit.slf

@@ -14,7 +14,7 @@
 
 <@include ForwardBufferWrite.slh@>
 <@include LightingModel.slh@>
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO)$>

libraries/render-utils/src/lightClusters_drawClusterContent.slf

@@ -15,7 +15,7 @@
 <@include DeferredBufferRead.slh@>
 
 
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 <$declareLightBuffer(256)$>
 
 <@include LightClusterGrid.slh@>

libraries/render-utils/src/local_lights_drawOutline.slf

@@ -18,7 +18,7 @@
 <$declareDeferredCurvature()$>
 
 // Everything about light
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 <$declareLightBuffer(128)$>
 <@include LightingModel.slh@>
 

libraries/render-utils/src/local_lights_shading.slf

@@ -18,7 +18,7 @@
 <$declareDeferredCurvature()$>
 
 // Everything about light
-<@include model/Light.slh@>
+<@include graphics/Light.slh@>
 <$declareLightBuffer(256)$>
 <@include LightingModel.slh@>
 

libraries/render-utils/src/model.slf

@@ -13,7 +13,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/model_fade.slf

@@ -13,7 +13,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, _SCRIBE_NULL, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/model_lightmap.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS)$>

libraries/render-utils/src/model_lightmap_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS)$>

libraries/render-utils/src/model_lightmap_normal_map.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL)$>

libraries/render-utils/src/model_lightmap_normal_map_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL)$>

libraries/render-utils/src/model_lightmap_normal_specular_map.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC)$>

libraries/render-utils/src/model_lightmap_normal_specular_map_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC)$>

libraries/render-utils/src/model_lightmap_specular_map.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC)$>

libraries/render-utils/src/model_lightmap_specular_map_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC)$>

libraries/render-utils/src/model_normal_map.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, _SCRIBE_NULL, EMISSIVE, OCCLUSION, SCATTERING)$>

libraries/render-utils/src/model_normal_map_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, _SCRIBE_NULL, EMISSIVE, OCCLUSION, SCATTERING)$>

libraries/render-utils/src/model_normal_specular_map.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/model_normal_specular_map_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, NORMAL, METALLIC, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/model_specular_map.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/model_specular_map_fade.slf

@@ -14,7 +14,7 @@
 
 <@include DeferredBufferWrite.slh@>
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include MaterialTextures.slh@>
 <$declareMaterialTextures(ALBEDO, ROUGHNESS, _SCRIBE_NULL, METALLIC, EMISSIVE, OCCLUSION)$>

libraries/render-utils/src/model_translucent.slf

@@ -12,7 +12,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-<@include model/Material.slh@>
+<@include graphics/Material.slh@>
 
 <@include DeferredGlobalLight.slh@>