source/blender/render/hydra/CMakeLists.txt

@@ -52,38 +52,38 @@ set(SRC
 
   engine.h
   engine.cc
-  finalEngine.h
-  finalEngine.cc
-  previewEngine.h
-  previewEngine.cc
-  viewportEngine.h
-  viewportEngine.cc
+  final_engine.h
+  final_engine.cc
+  preview_engine.h
+  preview_engine.cc
+  viewport_engine.h
+  viewport_engine.cc
   camera.h
   camera.cc
   utils.h
   utils.cc
 
-  renderTaskDelegate.cc
-  renderTaskDelegate.h
-  simpleLightTaskDelegate.cc
-  simpleLightTaskDelegate.h
+  render_task_delegate.cc
+  render_task_delegate.h
+  simple_light_task_delegate.cc
+  simple_light_task_delegate.h
 
-  sceneDelegate/blenderSceneDelegate.h
-  sceneDelegate/blenderSceneDelegate.cc
-  sceneDelegate/id.h
-  sceneDelegate/id.cc
-  sceneDelegate/object.h
-  sceneDelegate/object.cc
-  sceneDelegate/material.h
-  sceneDelegate/material.cc
-  sceneDelegate/mesh.h
-  sceneDelegate/mesh.cc
-  sceneDelegate/mtlxHydraAdapter.h
-  sceneDelegate/mtlxHydraAdapter.cc
-  sceneDelegate/light.h
-  sceneDelegate/light.cc
-  sceneDelegate/world.h
-  sceneDelegate/world.cc
+  scene_delegate/blender_scene_delegate.h
+  scene_delegate/blender_scene_delegate.cc
+  scene_delegate/id.h
+  scene_delegate/id.cc
+  scene_delegate/object.h
+  scene_delegate/object.cc
+  scene_delegate/material.h
+  scene_delegate/material.cc
+  scene_delegate/mesh.h
+  scene_delegate/mesh.cc
+  scene_delegate/mtlx_hydra_adapter.h
+  scene_delegate/mtlx_hydra_adapter.cc
+  scene_delegate/light.h
+  scene_delegate/light.cc
+  scene_delegate/world.h
+  scene_delegate/world.cc
 )
 
 set(LIB

source/blender/render/hydra/camera.cc

@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0
  * Copyright 2011-2022 Blender Foundation */
 
-#include "BKE_context.h"
 #include "DNA_camera_types.h"
 #include "DNA_screen_types.h"
 

source/blender/render/hydra/camera.h

@@ -8,6 +8,8 @@
 #include <pxr/base/gf/camera.h>
 #include <pxr/base/gf/vec2f.h>
 
+#include "BKE_context.h"
+
 #include "DNA_object_types.h"
 
 namespace blender::render::hydra {

source/blender/render/hydra/engine.h

@@ -15,9 +15,9 @@
 
 #include "RE_engine.h"
 
-#include "renderTaskDelegate.h"
-#include "sceneDelegate/blenderSceneDelegate.h"
-#include "simpleLightTaskDelegate.h"
+#include "render_task_delegate.h"
+#include "scene_delegate/blender_scene_delegate.h"
+#include "simple_light_task_delegate.h"
 
 namespace blender::render::hydra {
 

source/blender/render/hydra/final_engine.cc

@@ -9,7 +9,7 @@
 #include "glog/logging.h"
 
 #include "camera.h"
-#include "finalEngine.h"
+#include "final_engine.h"
 #include "utils.h"
 
 using namespace std;

source/blender/render/hydra/preview_engine.cc

@@ -4,7 +4,7 @@
 #include "DEG_depsgraph_query.h"
 
 #include "camera.h"
-#include "previewEngine.h"
+#include "preview_engine.h"
 
 using namespace pxr;
 using namespace std;

source/blender/render/hydra/preview_engine.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "finalEngine.h"
+#include "final_engine.h"
 
 namespace blender::render::hydra {
 

source/blender/render/hydra/python.cc

@@ -13,10 +13,10 @@
 
 #include "glog/logging.h"
 
-#include "finalEngine.h"
-#include "previewEngine.h"
+#include "final_engine.h"
+#include "preview_engine.h"
 #include "utils.h"
-#include "viewportEngine.h"
+#include "viewport_engine.h"
 
 using namespace std;
 

source/blender/render/hydra/render_task_delegate.cc

@@ -9,7 +9,7 @@
 
 #include "glog/logging.h"
 
-#include "renderTaskDelegate.h"
+#include "render_task_delegate.h"
 
 namespace blender::render::hydra {
 

source/blender/render/hydra/scene_delegate/blender_scene_delegate.cc

@@ -6,7 +6,7 @@
 
 #include "glog/logging.h"
 
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 
 using namespace pxr;
 using namespace std;

source/blender/render/hydra/scene_delegate/id.cc

@@ -3,7 +3,7 @@
 
 #include "BKE_lib_id.h"
 
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 #include "id.h"
 
 using namespace pxr;

source/blender/render/hydra/scene_delegate/light.cc

@@ -12,7 +12,7 @@
 #include "BKE_light.h"
 #include "DNA_light_types.h"
 
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 #include "light.h"
 
 using namespace pxr;

source/blender/render/hydra/scene_delegate/material.cc

@@ -12,9 +12,9 @@
 #include "BKE_lib_id.h"
 #include "BKE_material.h"
 
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 #include "material.h"
-#include "mtlxHydraAdapter.h"
+#include "mtlx_hydra_adapter.h"
 
 using namespace pxr;
 

source/blender/render/hydra/scene_delegate/mesh.cc

@@ -12,7 +12,7 @@
 #include "BKE_object.h"
 
 #include "../utils.h"
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 #include "mesh.h"
 
 using namespace pxr;

source/blender/render/hydra/scene_delegate/mtlx_hydra_adapter.cc

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0
  * Copyright 2011-2022 Blender Foundation */
 
-#include "mtlxHydraAdapter.h"
-
 #include <pxr/base/arch/fileSystem.h>
 
 #include <pxr/usd/ar/resolver.h>
@@ -20,6 +18,8 @@
 #include <pxr/imaging/hd/material.h>
 #include <pxr/imaging/hd/tokens.h>
 
+#include "mtlx_hydra_adapter.h"
+
 namespace mx = MaterialX;
 
 PXR_NAMESPACE_OPEN_SCOPE

source/blender/render/hydra/scene_delegate/object.cc

@@ -4,7 +4,7 @@
 #include "BKE_object.h"
 
 #include "../utils.h"
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 #include "light.h"
 #include "mesh.h"
 #include "object.h"

source/blender/render/hydra/scene_delegate/world.cc

@@ -23,7 +23,7 @@
 #include "glog/logging.h"
 
 #include "../utils.h"
-#include "blenderSceneDelegate.h"
+#include "blender_scene_delegate.h"
 #include "world.h"
 
 /* TODO : add custom tftoken "transparency"? */

source/blender/render/hydra/simple_light_task_delegate.cc

@@ -3,7 +3,7 @@
 
 #include <pxr/imaging/hdx/simpleLightTask.h>
 
-#include "simpleLightTaskDelegate.h"
+#include "simple_light_task_delegate.h"
 
 namespace blender::render::hydra {
 

source/blender/render/hydra/viewport_engine.cc

@@ -7,6 +7,7 @@
 #include <pxr/imaging/glf/drawTarget.h>
 #include <pxr/usd/usdGeom/camera.h>
 
+#include "DNA_vec_types.h"
 #include "BKE_camera.h"
 #include "BLI_math_matrix.h"
 #include "DEG_depsgraph_query.h"
@@ -16,9 +17,10 @@
 
 #include "glog/logging.h"
 
+#include "viewport_engine.h"
 #include "camera.h"
 #include "utils.h"
-#include "viewportEngine.h"
+
 
 using namespace std;
 using namespace pxr;