From 710e621c6a9736db01da7c92674d7038a955dadb Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sun, 3 Jan 2021 17:23:00 -0500 Subject: [PATCH] 3D Viewer: remove all instances of "c" prefix from file names. --- .../3d_cache/dialogs/dlg_select_3dmodel.cpp | 4 +- 3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp | 2 +- 3d-viewer/3d_cache/dialogs/panel_prev_3d.h | 2 +- 3d-viewer/3d_canvas/board_adapter.cpp | 4 +- 3d-viewer/3d_canvas/board_adapter.h | 10 +-- .../3d_canvas/create_3Dgraphic_brd_items.cpp | 8 +- 3d-viewer/3d_canvas/create_layer_items.cpp | 6 +- 3d-viewer/3d_canvas/eda_3d_canvas.cpp | 4 +- 3d-viewer/3d_canvas/eda_3d_canvas.h | 4 +- ...d_model_viewer.cpp => 3d_model_viewer.cpp} | 8 +- .../{c3d_model_viewer.h => 3d_model_viewer.h} | 2 +- .../{caccelerator.cpp => accelerator_3d.cpp} | 6 +- .../{caccelerator.h => accelerator_3d.h} | 11 ++- ...traversal.cpp => bvh_packet_traversal.cpp} | 6 +- .../{cbvh_pbrt.cpp => bvh_pbrt.cpp} | 2 +- .../accelerators/{cbvh_pbrt.h => bvh_pbrt.h} | 6 +- .../{ccontainer2d.cpp => container_2d.cpp} | 5 +- .../{ccontainer2d.h => container_2d.h} | 5 +- .../{ccontainer.cpp => container_3d.cpp} | 5 +- .../{ccontainer.h => container_3d.h} | 7 +- ...ender_createscene.cpp => create_scene.cpp} | 25 +++--- .../{cfrustum.cpp => frustum.cpp} | 7 +- .../{cfrustum.h => frustum.h} | 8 +- .../{clight.h => light.h} | 4 +- .../{cmaterial.cpp => material.cpp} | 7 +- .../{cmaterial.h => material.h} | 3 +- .../3d_render_raytracing/raypacket.h | 4 +- ..._raytracing.cpp => render_3d_raytrace.cpp} | 7 +- ...nder_raytracing.h => render_3d_raytrace.h} | 15 ++-- ...{cpolygon4pts2d.cpp => 4pt_polygon_2d.cpp} | 5 +- .../{cpolygon4pts2d.h => 4pt_polygon_2d.h} | 10 +-- .../shapes2D/{cbbox2d.cpp => bbox_2d.cpp} | 12 +-- .../shapes2D/{cbbox2d.h => bbox_2d.h} | 6 +- ...illedcircle2d.cpp => filled_circle_2d.cpp} | 4 +- .../{cfilledcircle2d.h => filled_circle_2d.h} | 6 +- ...{citemlayercsg2d.cpp => layer_item_2d.cpp} | 6 +- .../{citemlayercsg2d.h => layer_item_2d.h} | 5 +- .../shapes2D/{cobject2d.cpp => object_2d.cpp} | 5 +- .../shapes2D/{cobject2d.h => object_2d.h} | 4 +- .../{cpolygon2d.cpp => polygon_2d.cpp} | 5 +- .../shapes2D/{cpolygon2d.h => polygon_2d.h} | 9 +- .../shapes2D/{cring2d.cpp => ring_2d.cpp} | 5 +- .../shapes2D/{cring2d.h => ring_2d.h} | 6 +- ...oundsegment2d.cpp => round_segment_2d.cpp} | 5 +- .../{croundsegment2d.h => round_segment_2d.h} | 4 +- .../{ctriangle2d.cpp => triangle_2d.cpp} | 5 +- .../shapes2D/{ctriangle2d.h => triangle_2d.h} | 7 +- .../shapes3D/{cbbox.cpp => bbox_3d.cpp} | 6 +- .../shapes3D/{cbbox.h => bbox_3d.h} | 4 +- .../{cbbox_ray.cpp => bbox_3d_ray.cpp} | 6 +- .../{ccylinder.cpp => cylinder_3d.cpp} | 2 +- .../shapes3D/{ccylinder.h => cylinder_3d.h} | 7 +- .../{cdummyblock.cpp => dummy_block_3d.cpp} | 4 +- .../{cdummyblock.h => dummy_block_3d.h} | 4 +- .../{clayeritem.cpp => layer_item_3d.cpp} | 5 +- .../{clayeritem.h => layer_item_3d.h} | 8 +- .../shapes3D/{cobject.cpp => object_3d.cpp} | 2 +- .../shapes3D/{cobject.h => object_3d.h} | 6 +- .../shapes3D/{cplane.cpp => plane_3d.cpp} | 4 +- .../shapes3D/{cplane.h => plane_3d.h} | 5 +- .../{croundseg.cpp => round_segment_3d.cpp} | 4 +- .../{croundseg.h => round_segment_3d.h} | 7 +- .../{ctriangle.cpp => triangle_3d.cpp} | 7 +- .../shapes3D/{ctriangle.h => triangle_3d.h} | 4 +- .../3d_rendering/{ccamera.cpp => camera.cpp} | 5 +- .../3d_rendering/{ccamera.h => camera.h} | 4 +- .../{ccolorrgb.cpp => color_rgb.cpp} | 5 +- .../3d_rendering/{ccolorrgb.h => color_rgb.h} | 5 +- .../3d_rendering/{cimage.cpp => image.cpp} | 6 +- 3d-viewer/3d_rendering/{cimage.h => image.h} | 4 +- .../c_ogl_3dmodel.cpp => legacy/3d_model.cpp} | 2 +- .../c_ogl_3dmodel.h => legacy/3d_model.h} | 6 +- .../create_scene.cpp} | 2 +- .../layer_triangles.cpp} | 2 +- .../layer_triangles.h} | 6 +- .../ogl_legacy_utils.cpp | 0 .../ogl_legacy_utils.h | 4 +- .../render_3d_legacy.cpp} | 2 +- .../render_3d_legacy.h} | 21 +++-- .../{cpostshader.cpp => post_shader.cpp} | 14 ++-- .../{cpostshader.h => post_shader.h} | 6 +- ...stshader_ssao.cpp => post_shader_ssao.cpp} | 8 +- ...{cpostshader_ssao.h => post_shader_ssao.h} | 4 +- ...c3d_render_base.cpp => render_3d_base.cpp} | 4 +- .../{c3d_render_base.h => render_3d_base.h} | 3 +- 3d-viewer/3d_rendering/test_cases.cpp | 12 +-- .../{ctrack_ball.cpp => track_ball.cpp} | 2 +- .../{ctrack_ball.h => track_ball.h} | 4 +- 3d-viewer/3d_viewer/3d_viewer_settings.cpp | 2 +- 3d-viewer/3d_viewer/eda_3d_viewer.h | 2 +- 3d-viewer/CMakeLists.txt | 82 +++++++++---------- .../{cogl_att_list.cpp => ogl_attr_list.cpp} | 4 +- .../{cogl_att_list.h => ogl_attr_list.h} | 4 +- 3d-viewer/common_ogl/ogl_utils.h | 2 +- 94 files changed, 285 insertions(+), 323 deletions(-) rename 3d-viewer/3d_model_viewer/{c3d_model_viewer.cpp => 3d_model_viewer.cpp} (98%) rename 3d-viewer/3d_model_viewer/{c3d_model_viewer.h => 3d_model_viewer.h} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{caccelerator.cpp => accelerator_3d.cpp} (93%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{caccelerator.h => accelerator_3d.h} (92%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{cbvh_packet_traversal.cpp => bvh_packet_traversal.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{cbvh_pbrt.cpp => bvh_pbrt.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{cbvh_pbrt.h => bvh_pbrt.h} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{ccontainer2d.cpp => container_2d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{ccontainer2d.h => container_2d.h} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{ccontainer.cpp => container_3d.cpp} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/{ccontainer.h => container_3d.h} (95%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{c3d_render_createscene.cpp => create_scene.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{cfrustum.cpp => frustum.cpp} (96%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{cfrustum.h => frustum.h} (90%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{clight.h => light.h} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{cmaterial.cpp => material.cpp} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{cmaterial.h => material.h} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{c3d_render_raytracing.cpp => render_3d_raytrace.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/{c3d_render_raytracing.h => render_3d_raytrace.h} (96%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cpolygon4pts2d.cpp => 4pt_polygon_2d.cpp} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cpolygon4pts2d.h => 4pt_polygon_2d.h} (92%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cbbox2d.cpp => bbox_2d.cpp} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cbbox2d.h => bbox_2d.h} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cfilledcircle2d.cpp => filled_circle_2d.cpp} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cfilledcircle2d.h => filled_circle_2d.h} (95%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{citemlayercsg2d.cpp => layer_item_2d.cpp} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{citemlayercsg2d.h => layer_item_2d.h} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cobject2d.cpp => object_2d.cpp} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cobject2d.h => object_2d.h} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cpolygon2d.cpp => polygon_2d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cpolygon2d.h => polygon_2d.h} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cring2d.cpp => ring_2d.cpp} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{cring2d.h => ring_2d.h} (96%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{croundsegment2d.cpp => round_segment_2d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{croundsegment2d.h => round_segment_2d.h} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{ctriangle2d.cpp => triangle_2d.cpp} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/{ctriangle2d.h => triangle_2d.h} (95%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cbbox.cpp => bbox_3d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cbbox.h => bbox_3d.h} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cbbox_ray.cpp => bbox_3d_ray.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{ccylinder.cpp => cylinder_3d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{ccylinder.h => cylinder_3d.h} (96%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cdummyblock.cpp => dummy_block_3d.cpp} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cdummyblock.h => dummy_block_3d.h} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{clayeritem.cpp => layer_item_3d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{clayeritem.h => layer_item_3d.h} (93%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cobject.cpp => object_3d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cobject.h => object_3d.h} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cplane.cpp => plane_3d.cpp} (98%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{cplane.h => plane_3d.h} (97%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{croundseg.cpp => round_segment_3d.cpp} (99%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{croundseg.h => round_segment_3d.h} (96%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{ctriangle.cpp => triangle_3d.cpp} (96%) rename 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/{ctriangle.h => triangle_3d.h} (98%) rename 3d-viewer/3d_rendering/{ccamera.cpp => camera.cpp} (99%) rename 3d-viewer/3d_rendering/{ccamera.h => camera.h} (99%) rename 3d-viewer/3d_rendering/{ccolorrgb.cpp => color_rgb.cpp} (97%) rename 3d-viewer/3d_rendering/{ccolorrgb.h => color_rgb.h} (98%) rename 3d-viewer/3d_rendering/{cimage.cpp => image.cpp} (99%) rename 3d-viewer/3d_rendering/{cimage.h => image.h} (99%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/c_ogl_3dmodel.cpp => legacy/3d_model.cpp} (99%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/c_ogl_3dmodel.h => legacy/3d_model.h} (97%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp => legacy/create_scene.cpp} (99%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/clayer_triangles.cpp => legacy/layer_triangles.cpp} (99%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/clayer_triangles.h => legacy/layer_triangles.h} (98%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy => legacy}/ogl_legacy_utils.cpp (100%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy => legacy}/ogl_legacy_utils.h (95%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp => legacy/render_3d_legacy.cpp} (99%) rename 3d-viewer/3d_rendering/{3d_render_ogl_legacy/c3d_render_ogl_legacy.h => legacy/render_3d_legacy.h} (94%) rename 3d-viewer/3d_rendering/{cpostshader.cpp => post_shader.cpp} (94%) rename 3d-viewer/3d_rendering/{cpostshader.h => post_shader.h} (97%) rename 3d-viewer/3d_rendering/{cpostshader_ssao.cpp => post_shader_ssao.cpp} (98%) rename 3d-viewer/3d_rendering/{cpostshader_ssao.h => post_shader_ssao.h} (98%) rename 3d-viewer/3d_rendering/{c3d_render_base.cpp => render_3d_base.cpp} (97%) rename 3d-viewer/3d_rendering/{c3d_render_base.h => render_3d_base.h} (99%) rename 3d-viewer/3d_rendering/{ctrack_ball.cpp => track_ball.cpp} (99%) rename 3d-viewer/3d_rendering/{ctrack_ball.h => track_ball.h} (97%) rename 3d-viewer/common_ogl/{cogl_att_list.cpp => ogl_attr_list.cpp} (98%) rename 3d-viewer/common_ogl/{cogl_att_list.h => ogl_attr_list.h} (97%) diff --git a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp index 6473f2f3de..734a5f0432 100644 --- a/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp @@ -30,8 +30,8 @@ #include "3d_cache/3d_info.h" #include "3d_cache/3d_cache.h" #include "3d_cache_dialogs.h" -#include <3d_model_viewer/c3d_model_viewer.h> -#include +#include <3d_model_viewer/3d_model_viewer.h> +#include #include #include diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp index 074ebc4958..8878169863 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_3d.h b/3d-viewer/3d_cache/dialogs/panel_prev_3d.h index 9a029f5b5a..49d3397277 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_3d.h +++ b/3d-viewer/3d_cache/dialogs/panel_prev_3d.h @@ -42,7 +42,7 @@ #include #include <3d_canvas/eda_3d_canvas.h> #include <3d_viewer_id.h> -#include <3d_rendering/ctrack_ball.h> +#include <3d_rendering/track_ball.h> // Define min and max parameter values #define MAX_SCALE 10000.0 diff --git a/3d-viewer/3d_canvas/board_adapter.cpp b/3d-viewer/3d_canvas/board_adapter.cpp index c2c233a596..782abed02b 100644 --- a/3d-viewer/3d_canvas/board_adapter.cpp +++ b/3d-viewer/3d_canvas/board_adapter.cpp @@ -27,9 +27,9 @@ * @brief Handles data related with the board to be visualized */ -#include "../3d_rendering/ccamera.h" +#include "../3d_rendering/camera.h" #include "board_adapter.h" -#include <3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h> +#include <3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.h> #include #include <3d_math.h> #include "3d_fastmath.h" diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h index 9cddc76611..abb0b1c8e8 100644 --- a/3d-viewer/3d_canvas/board_adapter.h +++ b/3d-viewer/3d_canvas/board_adapter.h @@ -27,13 +27,13 @@ #include #include -#include "../3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h" -#include "../3d_rendering/3d_render_raytracing/accelerators/ccontainer.h" -#include "../3d_rendering/3d_render_raytracing/shapes3D/cbbox.h" -#include "../3d_rendering/ccamera.h" +#include "../3d_rendering/3d_render_raytracing/accelerators/container_2d.h" +#include "../3d_rendering/3d_render_raytracing/accelerators/container_3d.h" +#include "../3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.h" +#include "../3d_rendering/camera.h" #include "../3d_enums.h" #include "../3d_cache/3d_cache.h" -#include "../common_ogl/cogl_att_list.h" +#include "../common_ogl/ogl_attr_list.h" #include #include diff --git a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp index 041245ad16..ed7f3cf841 100644 --- a/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp +++ b/3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp @@ -30,10 +30,10 @@ * board_items_to_polygon_shape_transform.cpp */ -#include "../3d_rendering/3d_render_raytracing/shapes2D/cring2d.h" -#include "../3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h" -#include "../3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h" -#include "../3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h" +#include "../3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h" +#include "../3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h" +#include "../3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.h" +#include "../3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.h" #include #include #include diff --git a/3d-viewer/3d_canvas/create_layer_items.cpp b/3d-viewer/3d_canvas/create_layer_items.cpp index 3e30326729..0a311ad2d7 100644 --- a/3d-viewer/3d_canvas/create_layer_items.cpp +++ b/3d-viewer/3d_canvas/create_layer_items.cpp @@ -32,9 +32,9 @@ */ #include "board_adapter.h" -#include "../3d_rendering/3d_render_raytracing/shapes2D/cring2d.h" -#include "../3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h" -#include "../3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h" +#include "../3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h" +#include "../3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h" +#include "../3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.h" #include #include diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index b596b25d75..efde8ee38e 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -29,8 +29,8 @@ #include "../common_ogl/ogl_utils.h" #include "eda_3d_canvas.h" #include -#include <3d_rendering/3d_render_raytracing/c3d_render_raytracing.h> -#include <3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h> +#include <3d_rendering/3d_render_raytracing/render_3d_raytrace.h> +#include <3d_rendering/legacy/render_3d_legacy.h> #include <3d_viewer_id.h> #include #include diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.h b/3d-viewer/3d_canvas/eda_3d_canvas.h index aadaa9a8b0..b3a1397834 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.h +++ b/3d-viewer/3d_canvas/eda_3d_canvas.h @@ -27,8 +27,8 @@ #include #include "board_adapter.h" -#include "3d_rendering/3d_render_raytracing/accelerators/caccelerator.h" -#include "3d_rendering/c3d_render_base.h" +#include "3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.h" +#include "3d_rendering/render_3d_base.h" #include "3d_cache/3d_cache.h" #include #include diff --git a/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp b/3d-viewer/3d_model_viewer/3d_model_viewer.cpp similarity index 98% rename from 3d-viewer/3d_model_viewer/c3d_model_viewer.cpp rename to 3d-viewer/3d_model_viewer/3d_model_viewer.cpp index 982ae9f751..afb01c6d9e 100644 --- a/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp +++ b/3d-viewer/3d_model_viewer/3d_model_viewer.cpp @@ -23,16 +23,16 @@ */ /** - * @file c3d_model_viewer.cpp + * @file c3d_model_viewer.cpp * @brief Implements a model viewer canvas. The propose of model viewer is to * render 3d models that come in the original data from the files without any * transformations. */ #include -#include "3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h" -#include "c3d_model_viewer.h" -#include "../3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h" +#include "3d_rendering/legacy/3d_model.h" +#include "3d_model_viewer.h" +#include "../3d_rendering/legacy/ogl_legacy_utils.h" #include "../3d_cache/3d_cache.h" #include "common_ogl/ogl_utils.h" #include diff --git a/3d-viewer/3d_model_viewer/c3d_model_viewer.h b/3d-viewer/3d_model_viewer/3d_model_viewer.h similarity index 99% rename from 3d-viewer/3d_model_viewer/c3d_model_viewer.h rename to 3d-viewer/3d_model_viewer/3d_model_viewer.h index b20273514d..1156e78a44 100644 --- a/3d-viewer/3d_model_viewer/c3d_model_viewer.h +++ b/3d-viewer/3d_model_viewer/3d_model_viewer.h @@ -33,7 +33,7 @@ #ifndef _C3D_MODEL_VIEWER_H_ #define _C3D_MODEL_VIEWER_H_ -#include "3d_rendering/ctrack_ball.h" +#include "3d_rendering/track_ball.h" #include class S3D_CACHE; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.cpp similarity index 93% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.cpp index a8fca2d2ea..b1d46d0a93 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.cpp @@ -23,13 +23,13 @@ */ /** - * @file caccelerator.cpp + * @file accelerator_3d.cpp */ -#include "caccelerator.h" +#include "accelerator_3d.h" -ACCELERATOR_3D::ACCELERATOR_3D( ) +ACCELERATOR_3D::ACCELERATOR_3D() { m_bbox.Reset(); } diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.h b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.h similarity index 92% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.h index 4329dca961..c14389a482 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.h @@ -23,14 +23,13 @@ */ /** - * @file caccelerator.h - * @brief + * @file accelerator_3d.h */ -#ifndef _CACCELERATOR_H_ -#define _CACCELERATOR_H_ +#ifndef _ACCELERATOR_3D_H_ +#define _ACCELERATOR_3D_H_ -#include "ccontainer.h" +#include "container_3d.h" #include "../raypacket.h" @@ -54,4 +53,4 @@ protected: BBOX_3D m_bbox; }; -#endif // _CACCELERATOR_H_ +#endif // _ACCELERATOR_3D_H_ diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_packet_traversal.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_packet_traversal.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_packet_traversal.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_packet_traversal.cpp index ae5ee7caf0..e2198fe782 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_packet_traversal.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_packet_traversal.cpp @@ -23,11 +23,11 @@ */ /** - * @file cbvh_packet_traversal.cpp - * @brief This file implementes packet traversal over the BVH PBRT implementation + * @file bvh_packet_traversal.cpp + * @brief This file implementes packet traversal over the BVH PBRT implementation. */ -#include "cbvh_pbrt.h" +#include "bvh_pbrt.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.cpp index 3b1fecff91..e749b55b77 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.cpp @@ -66,7 +66,7 @@ * */ -#include "cbvh_pbrt.h" +#include "bvh_pbrt.h" #include "../../../3d_fastmath.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.h similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.h index 41b132a3d8..da9af4eb81 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.h @@ -23,9 +23,9 @@ */ /** - * @file cbvh_pbrt.h + * @file bvh_pbrt.h * @brief This BVH implementation is based on the source code implementation - * from the book "Physically Based Rendering" (v2 and v3) + * from the book "Physically Based Rendering" (v2 and v3). * * Adaptions performed: * - Types and class types adapted to KiCad project @@ -70,7 +70,7 @@ #ifndef _BVH_PBRT_H_ #define _BVH_PBRT_H_ -#include "caccelerator.h" +#include "accelerator_3d.h" #include #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.cpp index ea22f3692c..e2152c5f55 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file ccontainer2d.cpp - * @brief + * @file container_2d.cpp */ -#include "ccontainer2d.h" +#include "container_2d.h" #include #include #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.h index 1a35c536b7..4e38042459 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.h @@ -23,14 +23,13 @@ */ /** - * @file ccontainer2d.h - * @brief + * @file container_2d.h */ #ifndef _CONTAINER_2D_H_ #define _CONTAINER_2D_H_ -#include "../shapes2D/cobject2d.h" +#include "../shapes2D/object_2d.h" #include #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.cpp similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.cpp index b665825f1c..0d040e47d1 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.cpp @@ -23,11 +23,10 @@ */ /** - * @file ccontainer.cpp - * @brief + * @file container_3d.cpp */ -#include "ccontainer.h" +#include "container_3d.h" #include CONTAINER_3D_BASE::CONTAINER_3D_BASE() diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.h b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.h similarity index 95% rename from 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.h index da46cd4154..dd5c8c58b0 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.h @@ -23,14 +23,13 @@ */ /** - * @file ccontainer.h - * @brief + * @file container_3d.h */ #ifndef _CONTAINER_3D_H_ #define _CONTAINER_3D_H_ -#include "../shapes3D/cobject.h" +#include "../shapes3D/object_3d.h" #include #include @@ -46,7 +45,7 @@ public: virtual ~CONTAINER_3D_BASE(); - void Add( OBJECT_3D *aObject ) + void Add( OBJECT_3D* aObject ) { if( aObject ) { diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp index a4e6774336..2e32da9542 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp @@ -23,22 +23,21 @@ */ /** - * @file c3d_render_createscene.cpp - * @brief + * @file 3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp */ -#include "c3d_render_raytracing.h" -#include "shapes3D/cplane.h" -#include "shapes3D/croundseg.h" -#include "shapes3D/clayeritem.h" -#include "shapes3D/ccylinder.h" -#include "shapes3D/ctriangle.h" -#include "shapes2D/citemlayercsg2d.h" -#include "shapes2D/cring2d.h" -#include "shapes2D/cpolygon2d.h" -#include "shapes2D/cfilledcircle2d.h" -#include "accelerators/cbvh_pbrt.h" +#include "render_3d_raytrace.h" +#include "shapes3D/plane_3d.h" +#include "shapes3D/round_segment_3d.h" +#include "shapes3D/layer_item_3d.h" +#include "shapes3D/cylinder_3d.h" +#include "shapes3D/triangle_3d.h" +#include "shapes2D/layer_item_2d.h" +#include "shapes2D/ring_2d.h" +#include "shapes2D/polygon_2d.h" +#include "shapes2D/filled_circle_2d.h" +#include "accelerators/bvh_pbrt.h" #include "3d_fastmath.h" #include "3d_math.h" diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/frustum.cpp similarity index 96% rename from 3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/frustum.cpp index d24964e680..9dcd1ac3f7 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/frustum.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015-2017 Mario Luzeiro - * Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,12 +23,11 @@ */ /** - * @file cfrustum.cpp - * @brief + * @file frustum.cpp */ -#include "cfrustum.h" +#include "frustum.h" // !TODO: optimize wih SSE //#if(GLM_ARCH != GLM_ARCH_PURE) diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h b/3d-viewer/3d_rendering/3d_render_raytracing/frustum.h similarity index 90% rename from 3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/frustum.h index b4f8b0ac28..d0ae06c24c 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/frustum.h @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2015-2016 Mario Luzeiro - * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,14 +23,14 @@ */ /** - * @file cfrustum.h - * @brief implements a frustum that is used to test ray pack tests + * @file frustum.h + * @brief Implement a frustum that is used for ray packet tests. */ #ifndef _FRUSTUM_H_ #define _FRUSTUM_H_ -#include "shapes3D/cbbox.h" +#include "shapes3D/bbox_3d.h" #include "ray.h" // !TODO: optimize wih SSE diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/clight.h b/3d-viewer/3d_rendering/3d_render_raytracing/light.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/clight.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/light.h index a7792e80a8..abf8b29fb1 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/clight.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/light.h @@ -23,8 +23,8 @@ */ /** - * @file clight.h - * @brief declare and implement light types classes + * @file light.h + * @brief Declare and implement light sources. */ #ifndef _LIGHT_H_ diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/material.cpp similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/material.cpp index c39a0f5f48..3725bf2c0c 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/material.cpp @@ -23,11 +23,10 @@ */ /** - * @file cmaterial.cpp - * @brief + * @file material.cpp */ -#include "cmaterial.h" +#include "material.h" #include <3d_math.h> #include @@ -62,7 +61,7 @@ MATERIAL::MATERIAL() MATERIAL::MATERIAL( const SFVEC3F& aAmbient, const SFVEC3F& aEmissive, const SFVEC3F& aSpecular, - float aShinness, float aTransparency, float aReflection ) + float aShinness, float aTransparency, float aReflection ) { wxASSERT( aReflection >= 0.0f ); wxASSERT( aReflection <= 1.0f ); diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.h b/3d-viewer/3d_rendering/3d_render_raytracing/material.h similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/material.h index 379e52a0a2..498472e0d5 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/material.h @@ -23,8 +23,7 @@ */ /** - * @file cmaterial.h - * @brief + * @file material.h */ #ifndef _MATERIAL_H_ diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/raypacket.h b/3d-viewer/3d_rendering/3d_render_raytracing/raypacket.h index b90e974cbc..076dfbd65b 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/raypacket.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/raypacket.h @@ -31,8 +31,8 @@ #define _RAYPACKET_H_ #include "ray.h" -#include "cfrustum.h" -#include "../ccamera.h" +#include "frustum.h" +#include "../camera.h" #define RAYPACKET_DIM (1 << 3) #define RAYPACKET_MASK (unsigned int) ( ( RAYPACKET_DIM - 1 ) ) diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.cpp index 08f94c36b1..45e01f9286 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.cpp @@ -23,8 +23,7 @@ */ /** - * @file c3d_render_raytracing.cpp - * @brief + * @file render_3d_raytrace.cpp */ #include // Must be included first @@ -35,9 +34,9 @@ #include #include -#include "c3d_render_raytracing.h" +#include "render_3d_raytrace.h" #include "mortoncodes.h" -#include "../ccolorrgb.h" +#include "../color_rgb.h" #include "3d_fastmath.h" #include "3d_math.h" #include "../common_ogl/ogl_utils.h" diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h b/3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.h similarity index 96% rename from 3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.h index 7130ae2255..dddc5baced 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.h @@ -23,19 +23,19 @@ */ /** - * @file c3d_render_raytracing.h + * @file render_3d_raytrace.h */ #ifndef RENDER_3D_RAYTRACE_H #define RENDER_3D_RAYTRACE_H #include "../../common_ogl/openGL_includes.h" -#include "accelerators/ccontainer.h" -#include "accelerators/caccelerator.h" -#include "../c3d_render_base.h" -#include "clight.h" -#include "../cpostshader_ssao.h" -#include "cmaterial.h" +#include "accelerators/container_3d.h" +#include "accelerators/accelerator_3d.h" +#include "../render_3d_base.h" +#include "light.h" +#include "../post_shader_ssao.h" +#include "material.h" #include #include @@ -63,7 +63,6 @@ public: ~RENDER_3D_RAYTRACE(); - // Imported from RENDER_3D_BASE void SetCurWindowSize( const wxSize& aSize ) override; bool Redraw( bool aIsMoving, REPORTER* aStatusReporter, REPORTER* aWarningReporter ) override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.cpp similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.cpp index 56d4a4a764..054649aa86 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file cpolygon4pts2d.cpp - * @brief + * @file 4pt_polygon_2d.cpp */ -#include "cpolygon4pts2d.h" +#include "4pt_polygon_2d.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.h similarity index 92% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.h index 579de930d2..4400ad10fc 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.h @@ -23,20 +23,20 @@ */ /** - * @file cpolygon4pts2d.h - * @brief A simplified 4 point polygon + * @file 4pt_polygon_2d.h + * @brief A simplified non-intersecting 4 point polygon. */ #ifndef _POLYGON_4PT_2D_H_ #define _POLYGON_4PT_2D_H_ -#include "cobject2d.h" +#include "object_2d.h" /** - * Simple polygons with 4 points. + * Simple non-intersecting polygon with 4 points. * * Used for footprint pads. (rectangles, trapezoids, with rotation.etc). This is a - * simplified version of the #CPOLYGON2D class. + * simplified version of the #POLYGON_2D class. */ class POLYGON_4PT_2D : public OBJECT_2D { diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.cpp similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.cpp index 33b9c8668a..b0b0aaad08 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.cpp @@ -22,14 +22,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - /** - * @file cbbox2d.cpp - * @brief Bounding Box class implementation +/** + * @file bbox_2d.cpp + * @brief 2D bounding box class definition. */ #include "3d_fastmath.h" -#include "cbbox2d.h" +#include "bbox_2d.h" #include @@ -77,8 +77,8 @@ void BBOX_2D::Set( const BBOX_2D& aBBox ) bool BBOX_2D::IsInitialized() const { - return !( ( FLT_MAX == m_min.x) || ( FLT_MAX == m_min.y) || - (-FLT_MAX == m_max.x) || (-FLT_MAX == m_max.y) ); + return !( ( FLT_MAX == m_min.x ) || ( FLT_MAX == m_min.y ) || ( -FLT_MAX == m_max.x ) + || ( -FLT_MAX == m_max.y ) ); } diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.h index 69b90381e7..a63b5cd65e 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.h @@ -23,8 +23,8 @@ */ /** - * @file cbbox2d.h - * @brief 2D Bounding Box class definition + * @file bbox_2d.h + * @brief 2D bounding box class definition. */ #ifndef _BBOX_2D_H_ @@ -196,4 +196,4 @@ private: SFVEC2F m_max; ///< point of the higher position of the bounding box }; -#endif // CBBox2d_h +#endif // bbox_2d.h diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.cpp similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.cpp index a1759bf339..97b8fc2bd4 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.cpp @@ -23,11 +23,11 @@ */ /** - * @file cfilledcircle2d.cpp + * @file filled_circle_2d.cpp * @brief */ -#include "cfilledcircle2d.h" +#include "filled_circle_2d.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h similarity index 95% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h index faedf4a8e8..125268341d 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h @@ -23,14 +23,13 @@ */ /** - * @file cfilledcircle2d.h - * @brief + * @file filled_circle_2d.h */ #ifndef _FILLED_CIRCLE_2D_H_ #define _FILLED_CIRCLE_2D_H_ -#include "cobject2d.h" +#include "object_2d.h" class FILLED_CIRCLE_2D : public OBJECT_2D { @@ -41,7 +40,6 @@ public: const SFVEC2F& GetCenter() const { return m_center; } float GetRadiusSquared() const { return m_radius_squared; } - // Imported from OBJECT_2D bool Overlaps( const BBOX_2D& aBBox ) const override; bool Intersects( const BBOX_2D& aBBox ) const override; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.cpp similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.cpp index 046c440bfa..b279f158ed 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.cpp @@ -23,17 +23,17 @@ */ /** - * @file citemlayercsg2d.cpp + * @file layer_item_2d.cpp * @brief */ -#include "citemlayercsg2d.h" +#include "layer_item_2d.h" #include "3d_fastmath.h" #include LAYER_ITEM_2D::LAYER_ITEM_2D( const OBJECT_2D* aObjectA, std::vector* aObjectB, - const OBJECT_2D* aObjectC, const BOARD_ITEM& aBoardItem ) : + const OBJECT_2D* aObjectC, const BOARD_ITEM& aBoardItem ) : OBJECT_2D( OBJECT_2D_TYPE::CSG, aBoardItem ), m_objectA( aObjectA ), m_objectB( aObjectB ), diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.h index 445f3af076..62477f2021 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.h @@ -24,14 +24,13 @@ */ /** - * @file citemlayercsg2d.h - * @brief + * @file layer_item_2d.h */ #ifndef _LAYER_ITEM_2D_H_ #define _LAYER_ITEM_2D_H_ -#include "cobject2d.h" +#include "object_2d.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.cpp similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.cpp index e5eb71a953..6d0d213345 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file cobject2d.cpp - * @brief + * @file object_2d.cpp */ -#include "cobject2d.h" +#include "object_2d.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.h similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.h index c3de7569f7..7eab89319c 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.h @@ -23,13 +23,13 @@ */ /** - * @file cobject2d.h + * @file object_2d.h */ #ifndef _OBJECT_2D_H_ #define _OBJECT_2D_H_ -#include "cbbox2d.h" +#include "bbox_2d.h" #include #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.cpp index e130762008..9b0245d060 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file cpolygon2d.cpp - * @brief + * @file polygon_2d.cpp */ -#include "cpolygon2d.h" +#include "polygon_2d.h" #include #ifdef PRINT_STATISTICS_3D_VIEWER diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.h similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.h index 98a3d0d8a6..aebc0b7549 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.h @@ -23,15 +23,14 @@ */ /** - * @file cpolygon2d.h - * @brief + * @file polygon_2d.h */ #ifndef _CPOLYGON2D_H_ #define _CPOLYGON2D_H_ -#include "cobject2d.h" -#include "../accelerators/ccontainer2d.h" +#include "object_2d.h" +#include "../accelerators/container_2d.h" #include #include @@ -98,7 +97,6 @@ public: const OUTERS_AND_HOLES& aOuter_and_holes, const BOARD_ITEM& aBoardItem ); - // Imported from OBJECT_2D bool Overlaps( const BBOX_2D& aBBox ) const override; bool Intersects( const BBOX_2D& aBBox ) const override; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override; @@ -133,7 +131,6 @@ public: DUMMY_BLOCK_2D( const BBOX_2D& aBBox, const BOARD_ITEM& aBoardItem ); - // Imported from OBJECT_2D bool Overlaps( const BBOX_2D& aBBox ) const override; bool Intersects( const BBOX_2D& aBBox ) const override; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.cpp similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.cpp index c6328d2146..0b2e22984a 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file cring2d.cpp - * @brief + * @file ring_2d.cpp */ -#include "cring2d.h" +#include "ring_2d.h" #include "../../../3d_fastmath.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h similarity index 96% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h index b8915e5473..524794d034 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h @@ -23,14 +23,13 @@ */ /** - * @file cring2d.h - * @brief + * @file ring_2d.h */ #ifndef _RING_2D_H_ #define _RING_2D_H_ -#include "cobject2d.h" +#include "object_2d.h" class RING_2D : public OBJECT_2D { @@ -38,7 +37,6 @@ public: RING_2D( const SFVEC2F& aCenter, float aInnerRadius, float aOuterRadius, const BOARD_ITEM& aBoardItem ); - // Imported from OBJECT_2D bool Overlaps( const BBOX_2D& aBBox ) const override; bool Intersects( const BBOX_2D& aBBox ) const override; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.cpp index 5633b16fa9..4d0c97ebe8 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file croundsegment2d.cpp - * @brief + * @file round_segment_2d.cpp */ -#include "croundsegment2d.h" +#include "round_segment_2d.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.h index a5b2280391..31c19001de 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.h @@ -23,13 +23,13 @@ */ /** - * @file croundsegment2d.h + * @file round_segment_2d.h */ #ifndef _ROUND_SEGMENT_2D_H_ #define _ROUND_SEGMENT_2D_H_ -#include "cobject2d.h" +#include "object_2d.h" class ROUND_SEGMENT_2D : public OBJECT_2D { diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.cpp similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.cpp index 7ab3653ba2..83acd440aa 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.cpp @@ -23,11 +23,10 @@ */ /** - * @file ctriangle2d.cpp - * @brief + * @file triangle_2d.cpp */ -#include "ctriangle2d.h" +#include "triangle_2d.h" #include #include #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.h similarity index 95% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.h index 7af908d26d..4c87bcea57 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.h @@ -23,14 +23,14 @@ */ /** - * @file ctriangle2d.h + * @file triangle_2d.h */ #ifndef _TRIANGLE_2D_H_ #define _TRIANGLE_2D_H_ -#include "cobject2d.h" -#include "../accelerators/ccontainer2d.h" +#include "object_2d.h" +#include "../accelerators/container_2d.h" #include #include #include @@ -45,7 +45,6 @@ public: const SFVEC2F& GetP2() const { return p2; } const SFVEC2F& GetP3() const { return p3; } - // Imported from OBJECT_2D bool Overlaps( const BBOX_2D& aBBox ) const override; bool Intersects( const BBOX_2D& aBBox ) const override; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.cpp index d92030bd03..6e6b46b6b0 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.cpp @@ -23,12 +23,12 @@ */ /** - * @file cbbox.cpp - * @brief Bounding Box class implementation + * @file bbox_3d.cpp + * @brief 3D bounding box implementation. */ #include "3d_fastmath.h" -#include "cbbox.h" +#include "bbox_3d.h" #include #include #include // For the wxASSERT diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.h similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.h index c174328d46..315abc0461 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.h @@ -23,7 +23,7 @@ */ /** - * @file cbbox.h + * @file bbox_3d.h * @brief Bounding Box class definition */ @@ -240,4 +240,4 @@ private: SFVEC3F m_max; ///< (12) point of the higher position of the bounding box }; -#endif // CBBox_h +#endif // _BBOX_3D_H_ diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox_ray.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d_ray.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox_ray.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d_ray.cpp index 3b82a67eeb..9ab890553e 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox_ray.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d_ray.cpp @@ -23,11 +23,11 @@ */ /** - * @file cbbox_ray.cpp - * @brief Bounding Box - Ray test intersection + * @file bbox_3d_ray.cpp + * @brief 3D bounding box ray intersection tests. */ -#include "cbbox.h" +#include "bbox_3d.h" #include // This BBOX Ray intersection test have the following credits: diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.cpp index ba79fa749c..1387fb3419 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.cpp @@ -28,7 +28,7 @@ */ #include "3d_fastmath.h" -#include "ccylinder.h" +#include "cylinder_3d.h" CYLINDER::CYLINDER( SFVEC2F aCenterPoint, float aZmin, float aZmax, float aRadius ) diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.h similarity index 96% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.h index 1e71fe3bcf..025a789f97 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.h @@ -23,17 +23,16 @@ */ /** - * @file ccylinder.h - * @brief + * @file cylinder_3d.h */ #ifndef _CCYLINDER_H_ #define _CCYLINDER_H_ -#include "cobject.h" +#include "object_3d.h" /** - * A vertical cylinder + * A vertical cylinder. */ class CYLINDER : public OBJECT_3D { diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.cpp similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.cpp index 4988b76a51..6d0f3ce801 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.cpp @@ -23,11 +23,11 @@ */ /** - * @file cdummyblock.cpp + * @file dummy_block_3d.cpp * @brief */ -#include "cdummyblock.h" +#include "dummy_block_3d.h" DUMMY_BLOCK::DUMMY_BLOCK( const BBOX_3D& aBBox ) : OBJECT_3D( OBJECT_3D_TYPE::DUMMYBLOCK ) diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.h similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.h index 6ce038ca0f..65357af542 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.h @@ -23,13 +23,13 @@ */ /** - * @file cdummyblock.h + * @file dummy_block_3d.h */ #ifndef _DUMMY_BLOCK_H_ #define _DUMMY_BLOCK_H_ -#include "cobject.h" +#include "object_3d.h" /** * A dummy block is used to fill the polygons. It will only will be intercepted diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.cpp index be338b7c09..e0ca10d10d 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.cpp @@ -23,11 +23,10 @@ */ /** - * @file clayeritem.cpp - * @brief + * @file layer_item_3d.cpp */ -#include "clayeritem.h" +#include "layer_item_3d.h" #include "3d_fastmath.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.h similarity index 93% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.h index 08b513e3de..f38fd53d39 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.h @@ -23,15 +23,14 @@ */ /** - * @file clayeritem.h - * @brief + * @file layer_item_3d.h */ #ifndef _LAYER_ITEM_H_ #define _LAYER_ITEM_H_ -#include "cobject.h" -#include "../shapes2D/cobject2d.h" +#include "object_3d.h" +#include "../shapes2D/object_2d.h" class LAYER_ITEM : public OBJECT_3D @@ -41,7 +40,6 @@ public: void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; } - // Imported from OBJECT_3D bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override; bool IntersectP(const RAY& aRay , float aMaxDistance ) const override; bool Intersects( const BBOX_3D& aBBox ) const override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.cpp index 101c5e1bd6..445591f1de 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.cpp @@ -27,7 +27,7 @@ * @brief */ -#include "cobject.h" +#include "object_3d.h" #include #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.h index ca5d361149..3abfd87ec8 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.h @@ -23,15 +23,15 @@ */ /** - * @file cobject.h + * @file object_3d.h */ #ifndef _OBJECT_3D_H_ #define _OBJECT_3D_H_ -#include "cbbox.h" +#include "bbox_3d.h" #include "../hitinfo.h" -#include "../cmaterial.h" +#include "../material.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.cpp similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.cpp index fe5294cfe5..fc9dece54a 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.cpp @@ -23,10 +23,10 @@ */ /** - * @file cplane.cpp + * @file plane_3d.cpp */ -#include "cplane.h" +#include "plane_3d.h" XY_PLANE::XY_PLANE( const BBOX_3D& aBBox ) : OBJECT_3D( OBJECT_3D_TYPE::XYPLANE ) diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.h similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.h index 5abb3ce4c1..37efdbd977 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.h @@ -23,14 +23,13 @@ */ /** - * @file cplane.h - * @brief + * @file plane_3d.h */ #ifndef _CPLANE_H_ #define _CPLANE_H_ -#include "cobject.h" +#include "object_3d.h" /** * A plane that is parallel to XY plane diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.cpp index 1d6eb12433..f858074484 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.cpp @@ -23,10 +23,10 @@ */ /** - * @file croundseg.cpp + * @file round_segment_3d.cpp */ -#include "croundseg.h" +#include "round_segment_3d.h" ROUND_SEGMENT::ROUND_SEGMENT( const ROUND_SEGMENT_2D& aSeg2D, float aZmin, float aZmax ) : diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.h similarity index 96% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.h index ef1777fc53..735544ed01 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.h @@ -23,14 +23,14 @@ */ /** - * @file croundseg.h + * @file round_segment_3d.h */ #ifndef _ROUND_SEGMENT_H_ #define _ROUND_SEGMENT_H_ -#include "cobject.h" -#include "../shapes2D/croundsegment2d.h" +#include "object_3d.h" +#include "../shapes2D/round_segment_2d.h" class ROUND_SEGMENT : public OBJECT_3D { @@ -39,7 +39,6 @@ public: void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; } - // Imported from OBJECT_3D bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override; bool IntersectP( const RAY& aRay, float aMaxDistance ) const override; bool Intersects( const BBOX_3D& aBBox ) const override; diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.cpp b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.cpp similarity index 96% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.cpp rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.cpp index 6988e713b9..5d0089facb 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.cpp +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.cpp @@ -24,14 +24,11 @@ /** - * @file ctriangle.cpp - * @brief Implements a triangle ray intersection based on article: - * http://www.flipcode.com/archives/Raytracing_Topics_Techniques-Part_7_Kd-Trees_and_More_Speed.shtml - * by Jacco Bikker, that implement optimizations based on Ingo Wald's thesis. + * @file triangle_3d.cpp */ -#include "ctriangle.h" +#include "triangle_3d.h" void TRIANGLE::pre_calc_const() diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.h rename to 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.h index aed99d0825..3d859abcb9 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.h @@ -24,7 +24,7 @@ /** - * @file ctriangle.h + * @file triangle_3d.h * @brief Implement a triangle ray intersection based on article * http://www.flipcode.com/archives/Raytracing_Topics_Techniques-Part_7_Kd-Trees_and_More_Speed.shtml * by Jacco Bikker, that implement optimizations based on Ingo Wald's thesis. @@ -34,7 +34,7 @@ #ifndef _TRIANGLE_H_ #define _TRIANGLE_H_ -#include "cobject.h" +#include "object_3d.h" /** * A triangle object. diff --git a/3d-viewer/3d_rendering/ccamera.cpp b/3d-viewer/3d_rendering/camera.cpp similarity index 99% rename from 3d-viewer/3d_rendering/ccamera.cpp rename to 3d-viewer/3d_rendering/camera.cpp index 5a8972a099..0604cffe72 100644 --- a/3d-viewer/3d_rendering/ccamera.cpp +++ b/3d-viewer/3d_rendering/camera.cpp @@ -23,11 +23,10 @@ */ /** - * @file ccamera.cpp - * @brief + * @file camera.cpp */ -#include "ccamera.h" +#include "camera.h" #include diff --git a/3d-viewer/3d_rendering/ccamera.h b/3d-viewer/3d_rendering/camera.h similarity index 99% rename from 3d-viewer/3d_rendering/ccamera.h rename to 3d-viewer/3d_rendering/camera.h index 363eab7abc..da9c4b0c0f 100644 --- a/3d-viewer/3d_rendering/ccamera.h +++ b/3d-viewer/3d_rendering/camera.h @@ -23,8 +23,8 @@ */ /** - * @file ccamera.h - * @brief Define an abstract camera + * @file camera.h + * @brief Define an abstract camera. */ #ifndef CAMERA_H diff --git a/3d-viewer/3d_rendering/ccolorrgb.cpp b/3d-viewer/3d_rendering/color_rgb.cpp similarity index 97% rename from 3d-viewer/3d_rendering/ccolorrgb.cpp rename to 3d-viewer/3d_rendering/color_rgb.cpp index c20aa1cbb1..16f6146301 100644 --- a/3d-viewer/3d_rendering/ccolorrgb.cpp +++ b/3d-viewer/3d_rendering/color_rgb.cpp @@ -23,12 +23,11 @@ */ /** - * @file ccolorrgb.cpp - * @brief + * @file color_rgb.cpp */ -#include "ccolorrgb.h" +#include "color_rgb.h" COLOR_RGB::COLOR_RGB( const SFVEC3F& aColor ) diff --git a/3d-viewer/3d_rendering/ccolorrgb.h b/3d-viewer/3d_rendering/color_rgb.h similarity index 98% rename from 3d-viewer/3d_rendering/ccolorrgb.h rename to 3d-viewer/3d_rendering/color_rgb.h index a1418e2fac..89e7d2a008 100644 --- a/3d-viewer/3d_rendering/ccolorrgb.h +++ b/3d-viewer/3d_rendering/color_rgb.h @@ -22,9 +22,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ - /** - * @file ccolorrgb.h - * @brief +/** + * @file color_rgb.h */ #ifndef COLOR_RGB_H diff --git a/3d-viewer/3d_rendering/cimage.cpp b/3d-viewer/3d_rendering/image.cpp similarity index 99% rename from 3d-viewer/3d_rendering/cimage.cpp rename to 3d-viewer/3d_rendering/image.cpp index 4d41ce42d4..6e6702de32 100644 --- a/3d-viewer/3d_rendering/cimage.cpp +++ b/3d-viewer/3d_rendering/image.cpp @@ -23,11 +23,11 @@ */ /** - * @file cimage.cpp - * @brief one 8bit-channel image implementation + * @file image.cpp + * @brief one 8bit-channel image implementation. */ -#include "cimage.h" +#include "image.h" #include "buffers_debug.h" #include // For memcpy diff --git a/3d-viewer/3d_rendering/cimage.h b/3d-viewer/3d_rendering/image.h similarity index 99% rename from 3d-viewer/3d_rendering/cimage.h rename to 3d-viewer/3d_rendering/image.h index 3ad0775222..2757ec9b4d 100644 --- a/3d-viewer/3d_rendering/cimage.h +++ b/3d-viewer/3d_rendering/image.h @@ -23,8 +23,8 @@ */ /** - * @file cimage.h - * @brief one 8bit-channel image definition + * @file image.h + * @brief one 8bit-channel image definition. */ #ifndef IMAGE_H diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.cpp b/3d-viewer/3d_rendering/legacy/3d_model.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.cpp rename to 3d-viewer/3d_rendering/legacy/3d_model.cpp index 50155c6b2a..fc2cb370e6 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.cpp +++ b/3d-viewer/3d_rendering/legacy/3d_model.cpp @@ -30,7 +30,7 @@ #include // Must be included first -#include "c_ogl_3dmodel.h" +#include "3d_model.h" #include "ogl_legacy_utils.h" #include "../common_ogl/ogl_utils.h" #include "../3d_math.h" diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h b/3d-viewer/3d_rendering/legacy/3d_model.h similarity index 97% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h rename to 3d-viewer/3d_rendering/legacy/3d_model.h index edf0c244a8..c3c658acf3 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h +++ b/3d-viewer/3d_rendering/legacy/3d_model.h @@ -24,8 +24,8 @@ */ /** - * @file c_ogl_3dmodel.h - * @brief implement a legacy 3dmodel render + * @file 3d_model.h + * @brief Implement a legacy 3D model render. */ #ifndef _MODEL_3D_H_ @@ -34,7 +34,7 @@ #include #include #include "../../common_ogl/openGL_includes.h" -#include "../3d_render_raytracing/shapes3D/cbbox.h" +#include "../3d_render_raytracing/shapes3D/bbox_3d.h" #include "../../3d_enums.h" class MODEL_3D diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp b/3d-viewer/3d_rendering/legacy/create_scene.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp rename to 3d-viewer/3d_rendering/legacy/create_scene.cpp index e3de74d3cf..3a1b90734d 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp +++ b/3d-viewer/3d_rendering/legacy/create_scene.cpp @@ -22,7 +22,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "c3d_render_ogl_legacy.h" +#include "render_3d_legacy.h" #include "ogl_legacy_utils.h" #include #include diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp b/3d-viewer/3d_rendering/legacy/layer_triangles.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp rename to 3d-viewer/3d_rendering/legacy/layer_triangles.cpp index 9c7eeaa16f..16b1829bff 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp +++ b/3d-viewer/3d_rendering/legacy/layer_triangles.cpp @@ -27,7 +27,7 @@ */ -#include "clayer_triangles.h" +#include "layer_triangles.h" #include // For the wxASSERT #include #include diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h b/3d-viewer/3d_rendering/legacy/layer_triangles.h similarity index 98% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h rename to 3d-viewer/3d_rendering/legacy/layer_triangles.h index 3d15275e42..e98d6beeab 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h +++ b/3d-viewer/3d_rendering/legacy/layer_triangles.h @@ -23,7 +23,7 @@ */ /** - * @file clayer_triangles.h + * @file layer_triangles.h */ #ifndef TRIANGLE_DISPLAY_LIST_H_ @@ -33,7 +33,7 @@ #include #include #include -#include <3d_render_raytracing/accelerators/ccontainer2d.h> +#include <3d_render_raytracing/accelerators/container_2d.h> #include #include @@ -42,7 +42,7 @@ typedef std::vector< SFVEC3F > SFVEC3F_VECTOR; /** - * Container to manage a vector of triangles. + * Container to manage a vector of triangles. */ class TRIANGLE_LIST { diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.cpp b/3d-viewer/3d_rendering/legacy/ogl_legacy_utils.cpp similarity index 100% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.cpp rename to 3d-viewer/3d_rendering/legacy/ogl_legacy_utils.cpp diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h b/3d-viewer/3d_rendering/legacy/ogl_legacy_utils.h similarity index 95% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h rename to 3d-viewer/3d_rendering/legacy/ogl_legacy_utils.h index 7a74530dac..72bdcef931 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h +++ b/3d-viewer/3d_rendering/legacy/ogl_legacy_utils.h @@ -30,8 +30,8 @@ #ifndef OGL_LEGACY_UTILS_H_ #define OGL_LEGACY_UTILS_H_ -#include "../3d_render_raytracing/shapes3D/cbbox.h" -#include "../3d_render_raytracing/shapes2D/croundsegment2d.h" +#include "../3d_render_raytracing/shapes3D/bbox_3d.h" +#include "../3d_render_raytracing/shapes2D/round_segment_2d.h" /** * Draw a round arrow. diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp b/3d-viewer/3d_rendering/legacy/render_3d_legacy.cpp similarity index 99% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp rename to 3d-viewer/3d_rendering/legacy/render_3d_legacy.cpp index 0d02610714..57805ab38c 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp +++ b/3d-viewer/3d_rendering/legacy/render_3d_legacy.cpp @@ -24,7 +24,7 @@ #include // Must be included first -#include "c3d_render_ogl_legacy.h" +#include "render_3d_legacy.h" #include "ogl_legacy_utils.h" #include "common_ogl/ogl_utils.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h b/3d-viewer/3d_rendering/legacy/render_3d_legacy.h similarity index 94% rename from 3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h rename to 3d-viewer/3d_rendering/legacy/render_3d_legacy.h index 3ea0f3641e..a1bf565e74 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h +++ b/3d-viewer/3d_rendering/legacy/render_3d_legacy.h @@ -23,24 +23,23 @@ */ /** - * @file c3d_render_ogl_legacy.h - * @brief + * @file render_3d_legacy.h */ #ifndef RENDER_3D_LEGACY_H_ #define RENDER_3D_LEGACY_H_ -#include "../c3d_render_base.h" -#include "clayer_triangles.h" +#include "../render_3d_base.h" +#include "layer_triangles.h" -#include "../3d_render_raytracing/shapes2D/cpolygon2d.h" -#include "../3d_render_raytracing/shapes2D/ctriangle2d.h" -#include "../3d_render_raytracing/shapes2D/cpolygon4pts2d.h" -#include "../3d_render_raytracing/shapes2D/cfilledcircle2d.h" -#include "../3d_render_raytracing/shapes2D/cring2d.h" -#include "../3d_render_raytracing/shapes2D/croundsegment2d.h" +#include "../3d_render_raytracing/shapes2D/polygon_2d.h" +#include "../3d_render_raytracing/shapes2D/triangle_2d.h" +#include "../3d_render_raytracing/shapes2D/4pt_polygon_2d.h" +#include "../3d_render_raytracing/shapes2D/filled_circle_2d.h" +#include "../3d_render_raytracing/shapes2D/ring_2d.h" +#include "../3d_render_raytracing/shapes2D/round_segment_2d.h" -#include "c_ogl_3dmodel.h" +#include "3d_model.h" #include "3d_cache/3d_info.h" diff --git a/3d-viewer/3d_rendering/cpostshader.cpp b/3d-viewer/3d_rendering/post_shader.cpp similarity index 94% rename from 3d-viewer/3d_rendering/cpostshader.cpp rename to 3d-viewer/3d_rendering/post_shader.cpp index 1a220d08e4..5fc91f4839 100644 --- a/3d-viewer/3d_rendering/cpostshader.cpp +++ b/3d-viewer/3d_rendering/post_shader.cpp @@ -23,12 +23,12 @@ */ /** - * @file cpostshader.cpp - * @brief a base class to create post shaders + * @file post_shader.cpp + * @brief A base class to create post shaders. */ -#include "cpostshader.h" +#include "post_shader.h" #include "buffers_debug.h" #include @@ -202,10 +202,12 @@ void POST_SHADER::DebugBuffersOutputAsImages() const float *normalizedDepthPTr = normalizedDepth; for( unsigned int iy = 0; iy < m_size.y; ++iy ) - for( unsigned int ix = 0; ix < m_size.x; ++ix ) { - *normalizedDepthPTr = GetDepthNormalizedAt( SFVEC2I( ix, iy) ); - normalizedDepthPTr++; + for( unsigned int ix = 0; ix < m_size.x; ++ix ) + { + *normalizedDepthPTr = GetDepthNormalizedAt( SFVEC2I( ix, iy) ); + normalizedDepthPTr++; + } } DBG_SaveBuffer( "m_depthNormalized", normalizedDepth, m_size.x, m_size.y ); diff --git a/3d-viewer/3d_rendering/cpostshader.h b/3d-viewer/3d_rendering/post_shader.h similarity index 97% rename from 3d-viewer/3d_rendering/cpostshader.h rename to 3d-viewer/3d_rendering/post_shader.h index 7ad42a12a1..75fec9776e 100644 --- a/3d-viewer/3d_rendering/cpostshader.h +++ b/3d-viewer/3d_rendering/post_shader.h @@ -23,14 +23,14 @@ */ /** - * @file cpostshader.h - * @brief a base class to create post shaders + * @file post_shader.h + * @brief A base class to create post shaders. */ #ifndef POST_SHADER_H #define POST_SHADER_H -#include "ccamera.h" +#include "camera.h" class POST_SHADER { diff --git a/3d-viewer/3d_rendering/cpostshader_ssao.cpp b/3d-viewer/3d_rendering/post_shader_ssao.cpp similarity index 98% rename from 3d-viewer/3d_rendering/cpostshader_ssao.cpp rename to 3d-viewer/3d_rendering/post_shader_ssao.cpp index 59e9ff1f17..4f46e6f307 100644 --- a/3d-viewer/3d_rendering/cpostshader_ssao.cpp +++ b/3d-viewer/3d_rendering/post_shader_ssao.cpp @@ -23,11 +23,11 @@ */ /** - * @file cpostshader_ssao.cpp - * @brief Implements a post shader screen space ambient occlusion on software + * @file post_shader_ssao.cpp + * @brief Implement a post shader screen space ambient occlusion in software. */ -#include "cpostshader_ssao.h" +#include "post_shader_ssao.h" #include "../3d_fastmath.h" @@ -97,7 +97,7 @@ float POST_SHADER_SSAO::aoFF( const SFVEC2I& aShaderPos, const SFVEC3F& ddiff, const float localNormalFactor = glm::dot( cnorm, vv ); const float localNormalFactorWithThreshold = - ( glm::max( localNormalFactor, aDotThreshold ) - aDotThreshold) / + ( glm::max( localNormalFactor, aDotThreshold ) - aDotThreshold ) / ( 1.0f - aDotThreshold ); const float aoFactor = localNormalFactorWithThreshold * aoGain * attDistFactor; diff --git a/3d-viewer/3d_rendering/cpostshader_ssao.h b/3d-viewer/3d_rendering/post_shader_ssao.h similarity index 98% rename from 3d-viewer/3d_rendering/cpostshader_ssao.h rename to 3d-viewer/3d_rendering/post_shader_ssao.h index bf7ddbadc9..f6263fb952 100644 --- a/3d-viewer/3d_rendering/cpostshader_ssao.h +++ b/3d-viewer/3d_rendering/post_shader_ssao.h @@ -23,7 +23,7 @@ */ /** - * @file cpostshader_ssao.h + * @file post_shader_ssao.h * @brief Implements a post shader screen space ambient occlusion on software */ @@ -31,7 +31,7 @@ #define POST_SHADER_SSAO_H -#include "cpostshader.h" +#include "post_shader.h" class POST_SHADER_SSAO : public POST_SHADER diff --git a/3d-viewer/3d_rendering/c3d_render_base.cpp b/3d-viewer/3d_rendering/render_3d_base.cpp similarity index 97% rename from 3d-viewer/3d_rendering/c3d_render_base.cpp rename to 3d-viewer/3d_rendering/render_3d_base.cpp index 5d69d17ea4..0fe45a197a 100644 --- a/3d-viewer/3d_rendering/c3d_render_base.cpp +++ b/3d-viewer/3d_rendering/render_3d_base.cpp @@ -23,12 +23,12 @@ */ /** - * @file c3d_render_base.cpp + * @file render_3d_base.cpp * @brief implements the initialization of the base class */ -#include "c3d_render_base.h" +#include "render_3d_base.h" /** diff --git a/3d-viewer/3d_rendering/c3d_render_base.h b/3d-viewer/3d_rendering/render_3d_base.h similarity index 99% rename from 3d-viewer/3d_rendering/c3d_render_base.h rename to 3d-viewer/3d_rendering/render_3d_base.h index 651b8f0598..569a71f018 100644 --- a/3d-viewer/3d_rendering/c3d_render_base.h +++ b/3d-viewer/3d_rendering/render_3d_base.h @@ -23,8 +23,7 @@ */ /** - * @file c3d_render_base.h - * @brief + * @file render_3d_base.h */ #ifndef RENDER_3D_BASE_H diff --git a/3d-viewer/3d_rendering/test_cases.cpp b/3d-viewer/3d_rendering/test_cases.cpp index 275b3a27d9..3d6b7e9d1c 100644 --- a/3d-viewer/3d_rendering/test_cases.cpp +++ b/3d-viewer/3d_rendering/test_cases.cpp @@ -28,12 +28,12 @@ * @brief it run only once and only in debug build */ -#include "3d_render_raytracing/cfrustum.h" -#include "3d_render_raytracing/shapes2D/cbbox2d.h" -#include "3d_render_raytracing/shapes2D/cfilledcircle2d.h" -#include "3d_render_raytracing/shapes2D/cpolygon2d.h" -#include "3d_render_raytracing/shapes2D/croundsegment2d.h" -#include "3d_render_raytracing/shapes3D/cbbox.h" +#include "3d_render_raytracing/frustum.h" +#include "3d_render_raytracing/shapes2D/bbox_2d.h" +#include "3d_render_raytracing/shapes2D/filled_circle_2d.h" +#include "3d_render_raytracing/shapes2D/polygon_2d.h" +#include "3d_render_raytracing/shapes2D/round_segment_2d.h" +#include "3d_render_raytracing/shapes3D/bbox_3d.h" #include //#ifdef DEBUG diff --git a/3d-viewer/3d_rendering/ctrack_ball.cpp b/3d-viewer/3d_rendering/track_ball.cpp similarity index 99% rename from 3d-viewer/3d_rendering/ctrack_ball.cpp rename to 3d-viewer/3d_rendering/track_ball.cpp index 97cd79a712..31904707ea 100644 --- a/3d-viewer/3d_rendering/ctrack_ball.cpp +++ b/3d-viewer/3d_rendering/track_ball.cpp @@ -28,7 +28,7 @@ * center of the screen and rotates the camera. */ -#include "ctrack_ball.h" +#include "track_ball.h" #include "trackball.h" #include "../3d_math.h" #include diff --git a/3d-viewer/3d_rendering/ctrack_ball.h b/3d-viewer/3d_rendering/track_ball.h similarity index 97% rename from 3d-viewer/3d_rendering/ctrack_ball.h rename to 3d-viewer/3d_rendering/track_ball.h index a47b427bde..e8b1125fe0 100644 --- a/3d-viewer/3d_rendering/ctrack_ball.h +++ b/3d-viewer/3d_rendering/track_ball.h @@ -23,14 +23,14 @@ */ /** - * @file ctrack_ball.h + * @file track_ball.h * @brief Declaration for a track ball camera */ #ifndef TRACK_BALL_H #define TRACK_BALL_H -#include "ccamera.h" +#include "camera.h" class TRACK_BALL : public CAMERA diff --git a/3d-viewer/3d_viewer/3d_viewer_settings.cpp b/3d-viewer/3d_viewer/3d_viewer_settings.cpp index fdecaeec11..13d086c050 100644 --- a/3d-viewer/3d_viewer/3d_viewer_settings.cpp +++ b/3d-viewer/3d_viewer/3d_viewer_settings.cpp @@ -19,7 +19,7 @@ */ #include <3d_enums.h> -#include +#include #include #include diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.h b/3d-viewer/3d_viewer/eda_3d_viewer.h index ad18a2048d..04be16c1b9 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.h +++ b/3d-viewer/3d_viewer/eda_3d_viewer.h @@ -34,7 +34,7 @@ #include "3d_canvas/board_adapter.h" #include "3d_canvas/eda_3d_canvas.h" -#include "3d_rendering/ctrack_ball.h" +#include "3d_rendering/track_ball.h" #include #include #include // for CUSTOM_COLORS_LIST definition diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt index dbf217f8b9..c709321c50 100644 --- a/3d-viewer/CMakeLists.txt +++ b/3d-viewer/CMakeLists.txt @@ -40,51 +40,51 @@ set(3D-VIEWER_SRCS 3d_canvas/create_layer_poly.cpp 3d_canvas/eda_3d_canvas.cpp 3d_canvas/eda_3d_canvas_pivot.cpp - 3d_model_viewer/c3d_model_viewer.cpp - 3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.cpp - 3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.cpp - 3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp - 3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp - 3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp - ${DIR_RAY_ACC}/caccelerator.cpp - ${DIR_RAY_ACC}/cbvh_packet_traversal.cpp - ${DIR_RAY_ACC}/cbvh_pbrt.cpp - ${DIR_RAY_ACC}/ccontainer.cpp - ${DIR_RAY_ACC}/ccontainer2d.cpp + 3d_model_viewer/3d_model_viewer.cpp + 3d_rendering/legacy/3d_model.cpp + 3d_rendering/legacy/ogl_legacy_utils.cpp + 3d_rendering/legacy/create_scene.cpp + 3d_rendering/legacy/render_3d_legacy.cpp + 3d_rendering/legacy/layer_triangles.cpp + ${DIR_RAY_ACC}/accelerator_3d.cpp + ${DIR_RAY_ACC}/bvh_packet_traversal.cpp + ${DIR_RAY_ACC}/bvh_pbrt.cpp + ${DIR_RAY_ACC}/container_3d.cpp + ${DIR_RAY_ACC}/container_2d.cpp ${DIR_RAY}/PerlinNoise.cpp - ${DIR_RAY}/c3d_render_createscene.cpp - ${DIR_RAY}/c3d_render_raytracing.cpp - ${DIR_RAY}/cfrustum.cpp - ${DIR_RAY}/cmaterial.cpp + ${DIR_RAY}/create_scene.cpp + ${DIR_RAY}/render_3d_raytrace.cpp + ${DIR_RAY}/frustum.cpp + ${DIR_RAY}/material.cpp ${DIR_RAY}/mortoncodes.cpp ${DIR_RAY}/ray.cpp ${DIR_RAY}/raypacket.cpp - ${DIR_RAY_2D}/cbbox2d.cpp - ${DIR_RAY_2D}/cfilledcircle2d.cpp - ${DIR_RAY_2D}/citemlayercsg2d.cpp - ${DIR_RAY_2D}/cobject2d.cpp - ${DIR_RAY_2D}/cpolygon2d.cpp - ${DIR_RAY_2D}/cpolygon4pts2d.cpp - ${DIR_RAY_2D}/cring2d.cpp - ${DIR_RAY_2D}/croundsegment2d.cpp - ${DIR_RAY_2D}/ctriangle2d.cpp - ${DIR_RAY_3D}/cbbox.cpp - ${DIR_RAY_3D}/cbbox_ray.cpp - ${DIR_RAY_3D}/ccylinder.cpp - ${DIR_RAY_3D}/cdummyblock.cpp - ${DIR_RAY_3D}/clayeritem.cpp - ${DIR_RAY_3D}/cobject.cpp - ${DIR_RAY_3D}/cplane.cpp - ${DIR_RAY_3D}/croundseg.cpp - ${DIR_RAY_3D}/ctriangle.cpp + ${DIR_RAY_2D}/bbox_2d.cpp + ${DIR_RAY_2D}/filled_circle_2d.cpp + ${DIR_RAY_2D}/layer_item_2d.cpp + ${DIR_RAY_2D}/object_2d.cpp + ${DIR_RAY_2D}/polygon_2d.cpp + ${DIR_RAY_2D}/4pt_polygon_2d.cpp + ${DIR_RAY_2D}/ring_2d.cpp + ${DIR_RAY_2D}/round_segment_2d.cpp + ${DIR_RAY_2D}/triangle_2d.cpp + ${DIR_RAY_3D}/bbox_3d.cpp + ${DIR_RAY_3D}/bbox_3d_ray.cpp + ${DIR_RAY_3D}/cylinder_3d.cpp + ${DIR_RAY_3D}/dummy_block_3d.cpp + ${DIR_RAY_3D}/layer_item_3d.cpp + ${DIR_RAY_3D}/object_3d.cpp + ${DIR_RAY_3D}/plane_3d.cpp + ${DIR_RAY_3D}/round_segment_3d.cpp + ${DIR_RAY_3D}/triangle_3d.cpp 3d_rendering/buffers_debug.cpp - 3d_rendering/c3d_render_base.cpp - 3d_rendering/ccamera.cpp - 3d_rendering/ccolorrgb.cpp - 3d_rendering/cimage.cpp - 3d_rendering/cpostshader.cpp - 3d_rendering/cpostshader_ssao.cpp - 3d_rendering/ctrack_ball.cpp + 3d_rendering/render_3d_base.cpp + 3d_rendering/camera.cpp + 3d_rendering/color_rgb.cpp + 3d_rendering/image.cpp + 3d_rendering/post_shader.cpp + 3d_rendering/post_shader_ssao.cpp + 3d_rendering/track_ball.cpp 3d_rendering/test_cases.cpp 3d_rendering/trackball.cpp 3d_viewer/3d_menubar.cpp @@ -96,7 +96,7 @@ set(3D-VIEWER_SRCS 3d_viewer/tools/3d_controller.cpp 3d_viewer/eda_3d_viewer.cpp 3d_viewer/3d_viewer_settings.cpp - common_ogl/cogl_att_list.cpp + common_ogl/ogl_attr_list.cpp common_ogl/ogl_utils.cpp 3d_fastmath.cpp 3d_math.cpp diff --git a/3d-viewer/common_ogl/cogl_att_list.cpp b/3d-viewer/common_ogl/ogl_attr_list.cpp similarity index 98% rename from 3d-viewer/common_ogl/cogl_att_list.cpp rename to 3d-viewer/common_ogl/ogl_attr_list.cpp index 1b9cf726f9..8a567f9117 100644 --- a/3d-viewer/common_ogl/cogl_att_list.cpp +++ b/3d-viewer/common_ogl/ogl_attr_list.cpp @@ -23,11 +23,11 @@ */ /** - * @file cogl_att_list.cpp + * @file ogl_attr_list.cpp * @brief Implements a attribute list support for openGL */ -#include "cogl_att_list.h" +#include "ogl_attr_list.h" #include #include #include diff --git a/3d-viewer/common_ogl/cogl_att_list.h b/3d-viewer/common_ogl/ogl_attr_list.h similarity index 97% rename from 3d-viewer/common_ogl/cogl_att_list.h rename to 3d-viewer/common_ogl/ogl_attr_list.h index 3426f37c6b..696235bfe2 100644 --- a/3d-viewer/common_ogl/cogl_att_list.h +++ b/3d-viewer/common_ogl/ogl_attr_list.h @@ -23,8 +23,8 @@ */ /** - * @file cogl_att_list.h - * @brief Declaration of the cogl_att_list class + * @file ogl_attr_list.h + * @brief Declaration of the cogl_att_list class. */ #ifndef _OGL_ATT_LIST_H diff --git a/3d-viewer/common_ogl/ogl_utils.h b/3d-viewer/common_ogl/ogl_utils.h index 1f403cc816..6ae62a7cd5 100644 --- a/3d-viewer/common_ogl/ogl_utils.h +++ b/3d-viewer/common_ogl/ogl_utils.h @@ -32,7 +32,7 @@ #define OGL_UTILS_H_ #include -#include "3d_rendering/cimage.h" +#include "3d_rendering/image.h" #include /**