haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3D Viewer: remove all instances of "c" prefix from file names.

This commit is contained in:
Wayne Stambaugh 2021-01-03 17:23:00 -05:00
parent dc65166ee7
commit 710e621c6a
94 changed files with 285 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.cpp
View File

@ -30,8 +30,8 @@
#include "3d_cache/3d_info.h" #include "3d_cache/3d_info.h"
#include "3d_cache/3d_cache.h" #include "3d_cache/3d_cache.h"
#include "3d_cache_dialogs.h" #include "3d_cache_dialogs.h"
#include <3d_model_viewer/c3d_model_viewer.h> #include <3d_model_viewer/3d_model_viewer.h>
#include <common_ogl/cogl_att_list.h> #include <common_ogl/ogl_attr_list.h>
#include <filename_resolver.h> #include <filename_resolver.h>
#include <pcbnew/footprint.h> #include <pcbnew/footprint.h>

2
3d-viewer/3d_cache/dialogs/panel_prev_3d.cpp
View File

@ -33,7 +33,7 @@
#include <base_units.h> #include <base_units.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <board.h> #include <board.h>
#include <common_ogl/cogl_att_list.h> #include <common_ogl/ogl_attr_list.h>
#include <gal/dpi_scaling.h> #include <gal/dpi_scaling.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <project.h> #include <project.h>

2
3d-viewer/3d_cache/dialogs/panel_prev_3d.h
View File

@ -42,7 +42,7 @@
#include <tool/tools_holder.h> #include <tool/tools_holder.h>
#include <3d_canvas/eda_3d_canvas.h> #include <3d_canvas/eda_3d_canvas.h>
#include <3d_viewer_id.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 min and max parameter values
#define MAX_SCALE 10000.0 #define MAX_SCALE 10000.0

4
3d-viewer/3d_canvas/board_adapter.cpp
View File

@ -27,9 +27,9 @@
* @brief Handles data related with the board to be visualized * @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 "board_adapter.h"
#include <3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h> #include <3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.h>
#include <board.h> #include <board.h>
#include <3d_math.h> #include <3d_math.h>
#include "3d_fastmath.h" #include "3d_fastmath.h"

10
3d-viewer/3d_canvas/board_adapter.h
View File

@ -27,13 +27,13 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include "../3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h" #include "../3d_rendering/3d_render_raytracing/accelerators/container_2d.h"
#include "../3d_rendering/3d_render_raytracing/accelerators/ccontainer.h" #include "../3d_rendering/3d_render_raytracing/accelerators/container_3d.h"
#include "../3d_rendering/3d_render_raytracing/shapes3D/cbbox.h" #include "../3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.h"
#include "../3d_rendering/ccamera.h" #include "../3d_rendering/camera.h"
#include "../3d_enums.h" #include "../3d_enums.h"
#include "../3d_cache/3d_cache.h" #include "../3d_cache/3d_cache.h"
#include "../common_ogl/cogl_att_list.h" #include "../common_ogl/ogl_attr_list.h"
#include <layers_id_colors_and_visibility.h> #include <layers_id_colors_and_visibility.h>
#include <pad.h> #include <pad.h>

8
3d-viewer/3d_canvas/create_3Dgraphic_brd_items.cpp
View File

@ -30,10 +30,10 @@
* board_items_to_polygon_shape_transform.cpp * board_items_to_polygon_shape_transform.cpp
*/ */
#include "../3d_rendering/3d_render_raytracing/shapes2D/cring2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h"
#include "../3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h"
#include "../3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.h"
#include "../3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.h"
#include <board_adapter.h> #include <board_adapter.h>
#include <board.h> #include <board.h>
#include <footprint.h> #include <footprint.h>

6
3d-viewer/3d_canvas/create_layer_items.cpp
View File

@ -32,9 +32,9 @@
*/ */
#include "board_adapter.h" #include "board_adapter.h"
#include "../3d_rendering/3d_render_raytracing/shapes2D/cring2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h"
#include "../3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h" #include "../3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h"
#include "../3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h" #include "../3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.h"
#include <board.h> #include <board.h>
#include <footprint.h> #include <footprint.h>

4
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -29,8 +29,8 @@
#include "../common_ogl/ogl_utils.h" #include "../common_ogl/ogl_utils.h"
#include "eda_3d_canvas.h" #include "eda_3d_canvas.h"
#include <eda_3d_viewer.h> #include <eda_3d_viewer.h>
#include <3d_rendering/3d_render_raytracing/c3d_render_raytracing.h> #include <3d_rendering/3d_render_raytracing/render_3d_raytrace.h>
#include <3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h> #include <3d_rendering/legacy/render_3d_legacy.h>
#include <3d_viewer_id.h> #include <3d_viewer_id.h>
#include <board.h> #include <board.h>
#include <reporter.h> #include <reporter.h>

4
3d-viewer/3d_canvas/eda_3d_canvas.h
View File

@ -27,8 +27,8 @@
#include <atomic> #include <atomic>
#include "board_adapter.h" #include "board_adapter.h"
#include "3d_rendering/3d_render_raytracing/accelerators/caccelerator.h" #include "3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.h"
#include "3d_rendering/c3d_render_base.h" #include "3d_rendering/render_3d_base.h"
#include "3d_cache/3d_cache.h" #include "3d_cache/3d_cache.h"
#include <gal/hidpi_gl_canvas.h> #include <gal/hidpi_gl_canvas.h>
#include <wx/image.h> #include <wx/image.h>

8
3d-viewer/3d_model_viewer/c3d_model_viewer.cpp → 3d-viewer/3d_model_viewer/3d_model_viewer.cpp
View File

@ -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 * @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 * render 3d models that come in the original data from the files without any
* transformations. * transformations.
*/ */
#include <iostream> #include <iostream>
#include "3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h" #include "3d_rendering/legacy/3d_model.h"
#include "c3d_model_viewer.h" #include "3d_model_viewer.h"
#include "../3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h" #include "../3d_rendering/legacy/ogl_legacy_utils.h"
#include "../3d_cache/3d_cache.h" #include "../3d_cache/3d_cache.h"
#include "common_ogl/ogl_utils.h" #include "common_ogl/ogl_utils.h"
#include <wx/dcclient.h> #include <wx/dcclient.h>

2
3d-viewer/3d_model_viewer/c3d_model_viewer.h → 3d-viewer/3d_model_viewer/3d_model_viewer.h
View File

@ -33,7 +33,7 @@
#ifndef _C3D_MODEL_VIEWER_H_ #ifndef _C3D_MODEL_VIEWER_H_
#define _C3D_MODEL_VIEWER_H_ #define _C3D_MODEL_VIEWER_H_
#include "3d_rendering/ctrack_ball.h" #include "3d_rendering/track_ball.h"
#include <gal/hidpi_gl_canvas.h> #include <gal/hidpi_gl_canvas.h>
class S3D_CACHE; class S3D_CACHE;

6
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.cpp
View File

@ -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(); m_bbox.Reset();
} }

11
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/caccelerator.h → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/accelerator_3d.h
View File

@ -23,14 +23,13 @@
*/ */
/** /**
* @file caccelerator.h * @file accelerator_3d.h
* @brief
*/ */
#ifndef _CACCELERATOR_H_ #ifndef _ACCELERATOR_3D_H_
#define _CACCELERATOR_H_ #define _ACCELERATOR_3D_H_
#include "ccontainer.h" #include "container_3d.h"
#include "../raypacket.h" #include "../raypacket.h"
@ -54,4 +53,4 @@ protected:
BBOX_3D m_bbox; BBOX_3D m_bbox;
}; };
#endif // _CACCELERATOR_H_ #endif // _ACCELERATOR_3D_H_

6
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_packet_traversal.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_packet_traversal.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cbvh_packet_traversal.cpp * @file bvh_packet_traversal.cpp
* @brief This file implementes packet traversal over the BVH PBRT implementation * @brief This file implementes packet traversal over the BVH PBRT implementation.
*/ */
#include "cbvh_pbrt.h" #include "bvh_pbrt.h"
#include <wx/debug.h> #include <wx/debug.h>

2
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.cpp
View File

@ -66,7 +66,7 @@
* *
*/ */
#include "cbvh_pbrt.h" #include "bvh_pbrt.h"
#include "../../../3d_fastmath.h" #include "../../../3d_fastmath.h"
#include <macros.h> #include <macros.h>

6
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/bvh_pbrt.h
View File

@ -23,9 +23,9 @@
*/ */
/** /**
* @file cbvh_pbrt.h * @file bvh_pbrt.h
* @brief This BVH implementation is based on the source code implementation * @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: * Adaptions performed:
* - Types and class types adapted to KiCad project * - Types and class types adapted to KiCad project
@ -70,7 +70,7 @@
#ifndef _BVH_PBRT_H_ #ifndef _BVH_PBRT_H_
#define _BVH_PBRT_H_ #define _BVH_PBRT_H_
#include "caccelerator.h" #include "accelerator_3d.h"
#include <cstdint> #include <cstdint>
#include <list> #include <list>

5
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file ccontainer2d.cpp * @file container_2d.cpp
* @brief
*/ */
#include "ccontainer2d.h" #include "container_2d.h"
#include <vector> #include <vector>
#include <mutex> #include <mutex>
#include <boost/range/algorithm/partition.hpp> #include <boost/range/algorithm/partition.hpp>

5
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_2d.h
View File

@ -23,14 +23,13 @@
*/ */
/** /**
* @file ccontainer2d.h * @file container_2d.h
* @brief
*/ */
#ifndef _CONTAINER_2D_H_ #ifndef _CONTAINER_2D_H_
#define _CONTAINER_2D_H_ #define _CONTAINER_2D_H_
#include "../shapes2D/cobject2d.h" #include "../shapes2D/object_2d.h"
#include <list> #include <list>
#include <mutex> #include <mutex>

5
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file ccontainer.cpp * @file container_3d.cpp
* @brief
*/ */
#include "ccontainer.h" #include "container_3d.h"
#include <cstdio> #include <cstdio>
CONTAINER_3D_BASE::CONTAINER_3D_BASE() CONTAINER_3D_BASE::CONTAINER_3D_BASE()

7
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.h → 3d-viewer/3d_rendering/3d_render_raytracing/accelerators/container_3d.h
View File

@ -23,14 +23,13 @@
*/ */
/** /**
* @file ccontainer.h * @file container_3d.h
* @brief
*/ */
#ifndef _CONTAINER_3D_H_ #ifndef _CONTAINER_3D_H_
#define _CONTAINER_3D_H_ #define _CONTAINER_3D_H_
#include "../shapes3D/cobject.h" #include "../shapes3D/object_3d.h"
#include <list> #include <list>
#include <vector> #include <vector>
@ -46,7 +45,7 @@ public:
virtual ~CONTAINER_3D_BASE(); virtual ~CONTAINER_3D_BASE();
void Add( OBJECT_3D *aObject ) void Add( OBJECT_3D* aObject )
{ {
if( aObject ) if( aObject )
{ {

25
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_createscene.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp
View File

@ -23,22 +23,21 @@
*/ */
/** /**
* @file c3d_render_createscene.cpp * @file 3d-viewer/3d_rendering/3d_render_raytracing/create_scene.cpp
* @brief
*/ */
#include "c3d_render_raytracing.h" #include "render_3d_raytrace.h"
#include "shapes3D/cplane.h" #include "shapes3D/plane_3d.h"
#include "shapes3D/croundseg.h" #include "shapes3D/round_segment_3d.h"
#include "shapes3D/clayeritem.h" #include "shapes3D/layer_item_3d.h"
#include "shapes3D/ccylinder.h" #include "shapes3D/cylinder_3d.h"
#include "shapes3D/ctriangle.h" #include "shapes3D/triangle_3d.h"
#include "shapes2D/citemlayercsg2d.h" #include "shapes2D/layer_item_2d.h"
#include "shapes2D/cring2d.h" #include "shapes2D/ring_2d.h"
#include "shapes2D/cpolygon2d.h" #include "shapes2D/polygon_2d.h"
#include "shapes2D/cfilledcircle2d.h" #include "shapes2D/filled_circle_2d.h"
#include "accelerators/cbvh_pbrt.h" #include "accelerators/bvh_pbrt.h"
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include "3d_math.h" #include "3d_math.h"

7
3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/frustum.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015-2017 Mario Luzeiro <mrluzeiro@ua.pt> * Copyright (C) 2015-2017 Mario Luzeiro <mrluzeiro@ua.pt>
* 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -23,12 +23,11 @@
*/ */
/** /**
* @file cfrustum.cpp * @file frustum.cpp
* @brief
*/ */
#include "cfrustum.h" #include "frustum.h"
// !TODO: optimize wih SSE // !TODO: optimize wih SSE
//#if(GLM_ARCH != GLM_ARCH_PURE) //#if(GLM_ARCH != GLM_ARCH_PURE)

8
3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h → 3d-viewer/3d_rendering/3d_render_raytracing/frustum.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt> * Copyright (C) 2015-2016 Mario Luzeiro <mrluzeiro@ua.pt>
* 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 * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -23,14 +23,14 @@
*/ */
/** /**
* @file cfrustum.h * @file frustum.h
* @brief implements a frustum that is used to test ray pack tests * @brief Implement a frustum that is used for ray packet tests.
*/ */
#ifndef _FRUSTUM_H_ #ifndef _FRUSTUM_H_
#define _FRUSTUM_H_ #define _FRUSTUM_H_
#include "shapes3D/cbbox.h" #include "shapes3D/bbox_3d.h"
#include "ray.h" #include "ray.h"
// !TODO: optimize wih SSE // !TODO: optimize wih SSE

4
3d-viewer/3d_rendering/3d_render_raytracing/clight.h → 3d-viewer/3d_rendering/3d_render_raytracing/light.h
View File

@ -23,8 +23,8 @@
*/ */
/** /**
* @file clight.h * @file light.h
* @brief declare and implement light types classes * @brief Declare and implement light sources.
*/ */
#ifndef _LIGHT_H_ #ifndef _LIGHT_H_

7
3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/material.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file cmaterial.cpp * @file material.cpp
* @brief
*/ */
#include "cmaterial.h" #include "material.h"
#include <3d_math.h> #include <3d_math.h>
#include <wx/debug.h> #include <wx/debug.h>
@ -62,7 +61,7 @@ MATERIAL::MATERIAL()
MATERIAL::MATERIAL( const SFVEC3F& aAmbient, const SFVEC3F& aEmissive, const SFVEC3F& aSpecular, 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 >= 0.0f );
wxASSERT( aReflection <= 1.0f ); wxASSERT( aReflection <= 1.0f );

3
3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.h → 3d-viewer/3d_rendering/3d_render_raytracing/material.h
View File

@ -23,8 +23,7 @@
*/ */
/** /**
* @file cmaterial.h * @file material.h
* @brief
*/ */
#ifndef _MATERIAL_H_ #ifndef _MATERIAL_H_

4
3d-viewer/3d_rendering/3d_render_raytracing/raypacket.h
View File

@ -31,8 +31,8 @@
#define _RAYPACKET_H_ #define _RAYPACKET_H_
#include "ray.h" #include "ray.h"
#include "cfrustum.h" #include "frustum.h"
#include "../ccamera.h" #include "../camera.h"
#define RAYPACKET_DIM (1 << 3) #define RAYPACKET_DIM (1 << 3)
#define RAYPACKET_MASK (unsigned int) ( ( RAYPACKET_DIM - 1 ) ) #define RAYPACKET_MASK (unsigned int) ( ( RAYPACKET_DIM - 1 ) )

7
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.cpp
View File

@ -23,8 +23,7 @@
*/ */
/** /**
* @file c3d_render_raytracing.cpp * @file render_3d_raytrace.cpp
* @brief
*/ */
#include <gal/opengl/kiglew.h> // Must be included first #include <gal/opengl/kiglew.h> // Must be included first
@ -35,9 +34,9 @@
#include <climits> #include <climits>
#include <thread> #include <thread>
#include "c3d_render_raytracing.h" #include "render_3d_raytrace.h"
#include "mortoncodes.h" #include "mortoncodes.h"
#include "../ccolorrgb.h" #include "../color_rgb.h"
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include "3d_math.h" #include "3d_math.h"
#include "../common_ogl/ogl_utils.h" #include "../common_ogl/ogl_utils.h"

15
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h → 3d-viewer/3d_rendering/3d_render_raytracing/render_3d_raytrace.h
View File

@ -23,19 +23,19 @@
*/ */
/** /**
* @file c3d_render_raytracing.h * @file render_3d_raytrace.h
*/ */
#ifndef RENDER_3D_RAYTRACE_H #ifndef RENDER_3D_RAYTRACE_H
#define RENDER_3D_RAYTRACE_H #define RENDER_3D_RAYTRACE_H
#include "../../common_ogl/openGL_includes.h" #include "../../common_ogl/openGL_includes.h"
#include "accelerators/ccontainer.h" #include "accelerators/container_3d.h"
#include "accelerators/caccelerator.h" #include "accelerators/accelerator_3d.h"
#include "../c3d_render_base.h" #include "../render_3d_base.h"
#include "clight.h" #include "light.h"
#include "../cpostshader_ssao.h" #include "../post_shader_ssao.h"
#include "cmaterial.h" #include "material.h"
#include <plugins/3dapi/c3dmodel.h> #include <plugins/3dapi/c3dmodel.h>
#include <map> #include <map>
@ -63,7 +63,6 @@ public:
~RENDER_3D_RAYTRACE(); ~RENDER_3D_RAYTRACE();
// Imported from RENDER_3D_BASE
void SetCurWindowSize( const wxSize& aSize ) override; void SetCurWindowSize( const wxSize& aSize ) override;
bool Redraw( bool aIsMoving, REPORTER* aStatusReporter, REPORTER* aWarningReporter ) override; bool Redraw( bool aIsMoving, REPORTER* aStatusReporter, REPORTER* aWarningReporter ) override;

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file cpolygon4pts2d.cpp * @file 4pt_polygon_2d.cpp
* @brief
*/ */
#include "cpolygon4pts2d.h" #include "4pt_polygon_2d.h"
#include <wx/debug.h> #include <wx/debug.h>

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/4pt_polygon_2d.h
View File

@ -23,20 +23,20 @@
*/ */
/** /**
* @file cpolygon4pts2d.h * @file 4pt_polygon_2d.h
* @brief A simplified 4 point polygon * @brief A simplified non-intersecting 4 point polygon.
*/ */
#ifndef _POLYGON_4PT_2D_H_ #ifndef _POLYGON_4PT_2D_H_
#define _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 * 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 class POLYGON_4PT_2D : public OBJECT_2D
{ {

12
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.cpp
View File

@ -22,14 +22,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/** /**
* @file cbbox2d.cpp * @file bbox_2d.cpp
* @brief Bounding Box class implementation * @brief 2D bounding box class definition.
*/ */
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include "cbbox2d.h" #include "bbox_2d.h"
#include <wx/debug.h> #include <wx/debug.h>
@ -77,8 +77,8 @@ void BBOX_2D::Set( const BBOX_2D& aBBox )
bool BBOX_2D::IsInitialized() const bool BBOX_2D::IsInitialized() const
{ {
return !( ( FLT_MAX == m_min.x) || ( FLT_MAX == m_min.y) || return !( ( FLT_MAX == m_min.x ) || ( FLT_MAX == m_min.y ) || ( -FLT_MAX == m_max.x )
(-FLT_MAX == m_max.x) || (-FLT_MAX == m_max.y) ); || ( -FLT_MAX == m_max.y ) );
} }

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/bbox_2d.h
View File

@ -23,8 +23,8 @@
*/ */
/** /**
* @file cbbox2d.h * @file bbox_2d.h
* @brief 2D Bounding Box class definition * @brief 2D bounding box class definition.
*/ */
#ifndef _BBOX_2D_H_ #ifndef _BBOX_2D_H_
@ -196,4 +196,4 @@ private:
SFVEC2F m_max; ///< point of the higher position of the bounding box SFVEC2F m_max; ///< point of the higher position of the bounding box
}; };
#endif // CBBox2d_h #endif // bbox_2d.h

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cfilledcircle2d.cpp * @file filled_circle_2d.cpp
* @brief * @brief
*/ */
#include "cfilledcircle2d.h" #include "filled_circle_2d.h"
#include <wx/debug.h> #include <wx/debug.h>

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/filled_circle_2d.h
View File

@ -23,14 +23,13 @@
*/ */
/** /**
* @file cfilledcircle2d.h * @file filled_circle_2d.h
* @brief
*/ */
#ifndef _FILLED_CIRCLE_2D_H_ #ifndef _FILLED_CIRCLE_2D_H_
#define _FILLED_CIRCLE_2D_H_ #define _FILLED_CIRCLE_2D_H_
#include "cobject2d.h" #include "object_2d.h"
class FILLED_CIRCLE_2D : public OBJECT_2D class FILLED_CIRCLE_2D : public OBJECT_2D
{ {
@ -41,7 +40,6 @@ public:
const SFVEC2F& GetCenter() const { return m_center; } const SFVEC2F& GetCenter() const { return m_center; }
float GetRadiusSquared() const { return m_radius_squared; } float GetRadiusSquared() const { return m_radius_squared; }
// Imported from OBJECT_2D
bool Overlaps( const BBOX_2D& aBBox ) const override; bool Overlaps( const BBOX_2D& aBBox ) const override;
bool Intersects( 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; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override;

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.cpp
View File

@ -23,17 +23,17 @@
*/ */
/** /**
* @file citemlayercsg2d.cpp * @file layer_item_2d.cpp
* @brief * @brief
*/ */
#include "citemlayercsg2d.h" #include "layer_item_2d.h"
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include <wx/debug.h> #include <wx/debug.h>
LAYER_ITEM_2D::LAYER_ITEM_2D( const OBJECT_2D* aObjectA, std::vector<const OBJECT_2D*>* aObjectB, LAYER_ITEM_2D::LAYER_ITEM_2D( const OBJECT_2D* aObjectA, std::vector<const OBJECT_2D*>* aObjectB,
const OBJECT_2D* aObjectC, const BOARD_ITEM& aBoardItem ) : const OBJECT_2D* aObjectC, const BOARD_ITEM& aBoardItem ) :
OBJECT_2D( OBJECT_2D_TYPE::CSG, aBoardItem ), OBJECT_2D( OBJECT_2D_TYPE::CSG, aBoardItem ),
m_objectA( aObjectA ), m_objectA( aObjectA ),
m_objectB( aObjectB ), m_objectB( aObjectB ),

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/layer_item_2d.h
View File

@ -24,14 +24,13 @@
*/ */
/** /**
* @file citemlayercsg2d.h * @file layer_item_2d.h
* @brief
*/ */
#ifndef _LAYER_ITEM_2D_H_ #ifndef _LAYER_ITEM_2D_H_
#define _LAYER_ITEM_2D_H_ #define _LAYER_ITEM_2D_H_
#include "cobject2d.h" #include "object_2d.h"
#include <vector> #include <vector>

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file cobject2d.cpp * @file object_2d.cpp
* @brief
*/ */
#include "cobject2d.h" #include "object_2d.h"
#include <cstdio> #include <cstdio>

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/object_2d.h
View File

@ -23,13 +23,13 @@
*/ */
/** /**
* @file cobject2d.h * @file object_2d.h
*/ */
#ifndef _OBJECT_2D_H_ #ifndef _OBJECT_2D_H_
#define _OBJECT_2D_H_ #define _OBJECT_2D_H_
#include "cbbox2d.h" #include "bbox_2d.h"
#include <cstring> #include <cstring>
#include <board_item.h> #include <board_item.h>

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file cpolygon2d.cpp * @file polygon_2d.cpp
* @brief
*/ */
#include "cpolygon2d.h" #include "polygon_2d.h"
#include <wx/debug.h> #include <wx/debug.h>
#ifdef PRINT_STATISTICS_3D_VIEWER #ifdef PRINT_STATISTICS_3D_VIEWER

9
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/polygon_2d.h
View File

@ -23,15 +23,14 @@
*/ */
/** /**
* @file cpolygon2d.h * @file polygon_2d.h
* @brief
*/ */
#ifndef _CPOLYGON2D_H_ #ifndef _CPOLYGON2D_H_
#define _CPOLYGON2D_H_ #define _CPOLYGON2D_H_
#include "cobject2d.h" #include "object_2d.h"
#include "../accelerators/ccontainer2d.h" #include "../accelerators/container_2d.h"
#include <geometry/shape_poly_set.h> #include <geometry/shape_poly_set.h>
#include <vector> #include <vector>
@ -98,7 +97,6 @@ public:
const OUTERS_AND_HOLES& aOuter_and_holes, const OUTERS_AND_HOLES& aOuter_and_holes,
const BOARD_ITEM& aBoardItem ); const BOARD_ITEM& aBoardItem );
// Imported from OBJECT_2D
bool Overlaps( const BBOX_2D& aBBox ) const override; bool Overlaps( const BBOX_2D& aBBox ) const override;
bool Intersects( 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; 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 ); DUMMY_BLOCK_2D( const BBOX_2D& aBBox, const BOARD_ITEM& aBoardItem );
// Imported from OBJECT_2D
bool Overlaps( const BBOX_2D& aBBox ) const override; bool Overlaps( const BBOX_2D& aBBox ) const override;
bool Intersects( 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; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override;

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file cring2d.cpp * @file ring_2d.cpp
* @brief
*/ */
#include "cring2d.h" #include "ring_2d.h"
#include "../../../3d_fastmath.h" #include "../../../3d_fastmath.h"
#include <wx/debug.h> #include <wx/debug.h>

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ring_2d.h
View File

@ -23,14 +23,13 @@
*/ */
/** /**
* @file cring2d.h * @file ring_2d.h
* @brief
*/ */
#ifndef _RING_2D_H_ #ifndef _RING_2D_H_
#define _RING_2D_H_ #define _RING_2D_H_
#include "cobject2d.h" #include "object_2d.h"
class RING_2D : public OBJECT_2D class RING_2D : public OBJECT_2D
{ {
@ -38,7 +37,6 @@ public:
RING_2D( const SFVEC2F& aCenter, float aInnerRadius, float aOuterRadius, RING_2D( const SFVEC2F& aCenter, float aInnerRadius, float aOuterRadius,
const BOARD_ITEM& aBoardItem ); const BOARD_ITEM& aBoardItem );
// Imported from OBJECT_2D
bool Overlaps( const BBOX_2D& aBBox ) const override; bool Overlaps( const BBOX_2D& aBBox ) const override;
bool Intersects( 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; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override;

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file croundsegment2d.cpp * @file round_segment_2d.cpp
* @brief
*/ */
#include "croundsegment2d.h" #include "round_segment_2d.h"
#include <wx/debug.h> #include <wx/debug.h>

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/round_segment_2d.h
View File

@ -23,13 +23,13 @@
*/ */
/** /**
* @file croundsegment2d.h * @file round_segment_2d.h
*/ */
#ifndef _ROUND_SEGMENT_2D_H_ #ifndef _ROUND_SEGMENT_2D_H_
#define _ROUND_SEGMENT_2D_H_ #define _ROUND_SEGMENT_2D_H_
#include "cobject2d.h" #include "object_2d.h"
class ROUND_SEGMENT_2D : public OBJECT_2D class ROUND_SEGMENT_2D : public OBJECT_2D
{ {

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file ctriangle2d.cpp * @file triangle_2d.cpp
* @brief
*/ */
#include "ctriangle2d.h" #include "triangle_2d.h"
#include <map> #include <map>
#include <boost/smart_ptr/shared_ptr.hpp> #include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/smart_ptr/shared_array.hpp> #include <boost/smart_ptr/shared_array.hpp>

7
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/triangle_2d.h
View File

@ -23,14 +23,14 @@
*/ */
/** /**
* @file ctriangle2d.h * @file triangle_2d.h
*/ */
#ifndef _TRIANGLE_2D_H_ #ifndef _TRIANGLE_2D_H_
#define _TRIANGLE_2D_H_ #define _TRIANGLE_2D_H_
#include "cobject2d.h" #include "object_2d.h"
#include "../accelerators/ccontainer2d.h" #include "../accelerators/container_2d.h"
#include <geometry/shape_line_chain.h> #include <geometry/shape_line_chain.h>
#include <geometry/shape_poly_set.h> #include <geometry/shape_poly_set.h>
#include <clipper.hpp> #include <clipper.hpp>
@ -45,7 +45,6 @@ public:
const SFVEC2F& GetP2() const { return p2; } const SFVEC2F& GetP2() const { return p2; }
const SFVEC2F& GetP3() const { return p3; } const SFVEC2F& GetP3() const { return p3; }
// Imported from OBJECT_2D
bool Overlaps( const BBOX_2D& aBBox ) const override; bool Overlaps( const BBOX_2D& aBBox ) const override;
bool Intersects( 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; bool Intersect( const RAYSEG2D& aSegRay, float* aOutT, SFVEC2F* aNormalOut ) const override;

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.cpp
View File

@ -23,12 +23,12 @@
*/ */
/** /**
* @file cbbox.cpp * @file bbox_3d.cpp
* @brief Bounding Box class implementation * @brief 3D bounding box implementation.
*/ */
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include "cbbox.h" #include "bbox_3d.h"
#include <cstdio> #include <cstdio>
#include <wx/log.h> #include <wx/log.h>
#include <wx/debug.h> // For the wxASSERT #include <wx/debug.h> // For the wxASSERT

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d.h
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file cbbox.h * @file bbox_3d.h
* @brief Bounding Box class definition * @brief Bounding Box class definition
*/ */
@ -240,4 +240,4 @@ private:
SFVEC3F m_max; ///< (12) point of the higher position of the bounding box SFVEC3F m_max; ///< (12) point of the higher position of the bounding box
}; };
#endif // CBBox_h #endif // _BBOX_3D_H_

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox_ray.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/bbox_3d_ray.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cbbox_ray.cpp * @file bbox_3d_ray.cpp
* @brief Bounding Box - Ray test intersection * @brief 3D bounding box ray intersection tests.
*/ */
#include "cbbox.h" #include "bbox_3d.h"
#include <wx/debug.h> #include <wx/debug.h>
// This BBOX Ray intersection test have the following credits: // This BBOX Ray intersection test have the following credits:

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.cpp
View File

@ -28,7 +28,7 @@
*/ */
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include "ccylinder.h" #include "cylinder_3d.h"
CYLINDER::CYLINDER( SFVEC2F aCenterPoint, float aZmin, float aZmax, float aRadius ) CYLINDER::CYLINDER( SFVEC2F aCenterPoint, float aZmin, float aZmax, float aRadius )

7
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ccylinder.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cylinder_3d.h
View File

@ -23,17 +23,16 @@
*/ */
/** /**
* @file ccylinder.h * @file cylinder_3d.h
* @brief
*/ */
#ifndef _CCYLINDER_H_ #ifndef _CCYLINDER_H_
#define _CCYLINDER_H_ #define _CCYLINDER_H_
#include "cobject.h" #include "object_3d.h"
/** /**
* A vertical cylinder * A vertical cylinder.
*/ */
class CYLINDER : public OBJECT_3D class CYLINDER : public OBJECT_3D
{ {

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cdummyblock.cpp * @file dummy_block_3d.cpp
* @brief * @brief
*/ */
#include "cdummyblock.h" #include "dummy_block_3d.h"
DUMMY_BLOCK::DUMMY_BLOCK( const BBOX_3D& aBBox ) : OBJECT_3D( OBJECT_3D_TYPE::DUMMYBLOCK ) DUMMY_BLOCK::DUMMY_BLOCK( const BBOX_3D& aBBox ) : OBJECT_3D( OBJECT_3D_TYPE::DUMMYBLOCK )

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cdummyblock.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/dummy_block_3d.h
View File

@ -23,13 +23,13 @@
*/ */
/** /**
* @file cdummyblock.h * @file dummy_block_3d.h
*/ */
#ifndef _DUMMY_BLOCK_H_ #ifndef _DUMMY_BLOCK_H_
#define _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 * A dummy block is used to fill the polygons. It will only will be intercepted

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file clayeritem.cpp * @file layer_item_3d.cpp
* @brief
*/ */
#include "clayeritem.h" #include "layer_item_3d.h"
#include "3d_fastmath.h" #include "3d_fastmath.h"
#include <wx/debug.h> #include <wx/debug.h>

8
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/clayeritem.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/layer_item_3d.h
View File

@ -23,15 +23,14 @@
*/ */
/** /**
* @file clayeritem.h * @file layer_item_3d.h
* @brief
*/ */
#ifndef _LAYER_ITEM_H_ #ifndef _LAYER_ITEM_H_
#define _LAYER_ITEM_H_ #define _LAYER_ITEM_H_
#include "cobject.h" #include "object_3d.h"
#include "../shapes2D/cobject2d.h" #include "../shapes2D/object_2d.h"
class LAYER_ITEM : public OBJECT_3D class LAYER_ITEM : public OBJECT_3D
@ -41,7 +40,6 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; } void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from OBJECT_3D
bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override; bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override;
bool IntersectP(const RAY& aRay , float aMaxDistance ) const override; bool IntersectP(const RAY& aRay , float aMaxDistance ) const override;
bool Intersects( const BBOX_3D& aBBox ) const override; bool Intersects( const BBOX_3D& aBBox ) const override;

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.cpp
View File

@ -27,7 +27,7 @@
* @brief * @brief
*/ */
#include "cobject.h" #include "object_3d.h"
#include <cstdio> #include <cstdio>
#include <map> #include <map>

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/object_3d.h
View File

@ -23,15 +23,15 @@
*/ */
/** /**
* @file cobject.h * @file object_3d.h
*/ */
#ifndef _OBJECT_3D_H_ #ifndef _OBJECT_3D_H_
#define _OBJECT_3D_H_ #define _OBJECT_3D_H_
#include "cbbox.h" #include "bbox_3d.h"
#include "../hitinfo.h" #include "../hitinfo.h"
#include "../cmaterial.h" #include "../material.h"
#include <board_item.h> #include <board_item.h>

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.cpp
View File

@ -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 ) XY_PLANE::XY_PLANE( const BBOX_3D& aBBox ) : OBJECT_3D( OBJECT_3D_TYPE::XYPLANE )

5
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cplane.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/plane_3d.h
View File

@ -23,14 +23,13 @@
*/ */
/** /**
* @file cplane.h * @file plane_3d.h
* @brief
*/ */
#ifndef _CPLANE_H_ #ifndef _CPLANE_H_
#define _CPLANE_H_ #define _CPLANE_H_
#include "cobject.h" #include "object_3d.h"
/** /**
* A plane that is parallel to XY plane * A plane that is parallel to XY plane

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.cpp
View File

@ -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 ) : ROUND_SEGMENT::ROUND_SEGMENT( const ROUND_SEGMENT_2D& aSeg2D, float aZmin, float aZmax ) :

7
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/croundseg.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/round_segment_3d.h
View File

@ -23,14 +23,14 @@
*/ */
/** /**
* @file croundseg.h * @file round_segment_3d.h
*/ */
#ifndef _ROUND_SEGMENT_H_ #ifndef _ROUND_SEGMENT_H_
#define _ROUND_SEGMENT_H_ #define _ROUND_SEGMENT_H_
#include "cobject.h" #include "object_3d.h"
#include "../shapes2D/croundsegment2d.h" #include "../shapes2D/round_segment_2d.h"
class ROUND_SEGMENT : public OBJECT_3D class ROUND_SEGMENT : public OBJECT_3D
{ {
@ -39,7 +39,6 @@ public:
void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; } void SetColor( SFVEC3F aObjColor ) { m_diffusecolor = aObjColor; }
// Imported from OBJECT_3D
bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override; bool Intersect( const RAY& aRay, HITINFO& aHitInfo ) const override;
bool IntersectP( const RAY& aRay, float aMaxDistance ) const override; bool IntersectP( const RAY& aRay, float aMaxDistance ) const override;
bool Intersects( const BBOX_3D& aBBox ) const override; bool Intersects( const BBOX_3D& aBBox ) const override;

7
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.cpp → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.cpp
View File

@ -24,14 +24,11 @@
/** /**
* @file ctriangle.cpp * @file triangle_3d.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.
*/ */
#include "ctriangle.h" #include "triangle_3d.h"
void TRIANGLE::pre_calc_const() void TRIANGLE::pre_calc_const()

4
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/ctriangle.h → 3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/triangle_3d.h
View File

@ -24,7 +24,7 @@
/** /**
* @file ctriangle.h * @file triangle_3d.h
* @brief Implement a triangle ray intersection based on article * @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 * 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. * by Jacco Bikker, that implement optimizations based on Ingo Wald's thesis.
@ -34,7 +34,7 @@
#ifndef _TRIANGLE_H_ #ifndef _TRIANGLE_H_
#define _TRIANGLE_H_ #define _TRIANGLE_H_
#include "cobject.h" #include "object_3d.h"
/** /**
* A triangle object. * A triangle object.

5
3d-viewer/3d_rendering/ccamera.cpp → 3d-viewer/3d_rendering/camera.cpp
View File

@ -23,11 +23,10 @@
*/ */
/** /**
* @file ccamera.cpp * @file camera.cpp
* @brief
*/ */
#include "ccamera.h" #include "camera.h"
#include <wx/log.h> #include <wx/log.h>

4
3d-viewer/3d_rendering/ccamera.h → 3d-viewer/3d_rendering/camera.h
View File

@ -23,8 +23,8 @@
*/ */
/** /**
* @file ccamera.h * @file camera.h
* @brief Define an abstract camera * @brief Define an abstract camera.
*/ */
#ifndef CAMERA_H #ifndef CAMERA_H

5
3d-viewer/3d_rendering/ccolorrgb.cpp → 3d-viewer/3d_rendering/color_rgb.cpp
View File

@ -23,12 +23,11 @@
*/ */
/** /**
* @file ccolorrgb.cpp * @file color_rgb.cpp
* @brief
*/ */
#include "ccolorrgb.h" #include "color_rgb.h"
COLOR_RGB::COLOR_RGB( const SFVEC3F& aColor ) COLOR_RGB::COLOR_RGB( const SFVEC3F& aColor )

5
3d-viewer/3d_rendering/ccolorrgb.h → 3d-viewer/3d_rendering/color_rgb.h
View File

@ -22,9 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/** /**
* @file ccolorrgb.h * @file color_rgb.h
* @brief
*/ */
#ifndef COLOR_RGB_H #ifndef COLOR_RGB_H

6
3d-viewer/3d_rendering/cimage.cpp → 3d-viewer/3d_rendering/image.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cimage.cpp * @file image.cpp
* @brief one 8bit-channel image implementation * @brief one 8bit-channel image implementation.
*/ */
#include "cimage.h" #include "image.h"
#include "buffers_debug.h" #include "buffers_debug.h"
#include <cstring> // For memcpy #include <cstring> // For memcpy

4
3d-viewer/3d_rendering/cimage.h → 3d-viewer/3d_rendering/image.h
View File

@ -23,8 +23,8 @@
*/ */
/** /**
* @file cimage.h * @file image.h
* @brief one 8bit-channel image definition * @brief one 8bit-channel image definition.
*/ */
#ifndef IMAGE_H #ifndef IMAGE_H

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.cpp → 3d-viewer/3d_rendering/legacy/3d_model.cpp
View File

@ -30,7 +30,7 @@
#include <gal/opengl/kiglew.h> // Must be included first #include <gal/opengl/kiglew.h> // Must be included first
#include "c_ogl_3dmodel.h" #include "3d_model.h"
#include "ogl_legacy_utils.h" #include "ogl_legacy_utils.h"
#include "../common_ogl/ogl_utils.h" #include "../common_ogl/ogl_utils.h"
#include "../3d_math.h" #include "../3d_math.h"

6
3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h → 3d-viewer/3d_rendering/legacy/3d_model.h
View File

@ -24,8 +24,8 @@
*/ */
/** /**
* @file c_ogl_3dmodel.h * @file 3d_model.h
* @brief implement a legacy 3dmodel render * @brief Implement a legacy 3D model render.
*/ */
#ifndef _MODEL_3D_H_ #ifndef _MODEL_3D_H_
@ -34,7 +34,7 @@
#include <vector> #include <vector>
#include <plugins/3dapi/c3dmodel.h> #include <plugins/3dapi/c3dmodel.h>
#include "../../common_ogl/openGL_includes.h" #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" #include "../../3d_enums.h"
class MODEL_3D class MODEL_3D

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp → 3d-viewer/3d_rendering/legacy/create_scene.cpp
View File

@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 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 "ogl_legacy_utils.h"
#include <board.h> #include <board.h>
#include <footprint.h> #include <footprint.h>

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp → 3d-viewer/3d_rendering/legacy/layer_triangles.cpp
View File

@ -27,7 +27,7 @@
*/ */
#include "clayer_triangles.h" #include "layer_triangles.h"
#include <wx/debug.h> // For the wxASSERT #include <wx/debug.h> // For the wxASSERT
#include <mutex> #include <mutex>
#include <thread> #include <thread>

6
3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h → 3d-viewer/3d_rendering/legacy/layer_triangles.h
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file clayer_triangles.h * @file layer_triangles.h
*/ */
#ifndef TRIANGLE_DISPLAY_LIST_H_ #ifndef TRIANGLE_DISPLAY_LIST_H_
@ -33,7 +33,7 @@
#include <plugins/3dapi/xv3d_types.h> #include <plugins/3dapi/xv3d_types.h>
#include <geometry/shape_line_chain.h> #include <geometry/shape_line_chain.h>
#include <geometry/shape_poly_set.h> #include <geometry/shape_poly_set.h>
#include <3d_render_raytracing/accelerators/ccontainer2d.h> #include <3d_render_raytracing/accelerators/container_2d.h>
#include <vector> #include <vector>
#include <mutex> #include <mutex>
@ -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 class TRIANGLE_LIST
{ {

0
3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.cpp → 3d-viewer/3d_rendering/legacy/ogl_legacy_utils.cpp
View File

4
3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h → 3d-viewer/3d_rendering/legacy/ogl_legacy_utils.h
View File

@ -30,8 +30,8 @@
#ifndef OGL_LEGACY_UTILS_H_ #ifndef OGL_LEGACY_UTILS_H_
#define OGL_LEGACY_UTILS_H_ #define OGL_LEGACY_UTILS_H_
#include "../3d_render_raytracing/shapes3D/cbbox.h" #include "../3d_render_raytracing/shapes3D/bbox_3d.h"
#include "../3d_render_raytracing/shapes2D/croundsegment2d.h" #include "../3d_render_raytracing/shapes2D/round_segment_2d.h"
/** /**
* Draw a round arrow. * Draw a round arrow.

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp → 3d-viewer/3d_rendering/legacy/render_3d_legacy.cpp
View File

@ -24,7 +24,7 @@
#include <gal/opengl/kiglew.h> // Must be included first #include <gal/opengl/kiglew.h> // Must be included first
#include "c3d_render_ogl_legacy.h" #include "render_3d_legacy.h"
#include "ogl_legacy_utils.h" #include "ogl_legacy_utils.h"
#include "common_ogl/ogl_utils.h" #include "common_ogl/ogl_utils.h"
#include <footprint.h> #include <footprint.h>

21
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h → 3d-viewer/3d_rendering/legacy/render_3d_legacy.h
View File

@ -23,24 +23,23 @@
*/ */
/** /**
* @file c3d_render_ogl_legacy.h * @file render_3d_legacy.h
* @brief
*/ */
#ifndef RENDER_3D_LEGACY_H_ #ifndef RENDER_3D_LEGACY_H_
#define RENDER_3D_LEGACY_H_ #define RENDER_3D_LEGACY_H_
#include "../c3d_render_base.h" #include "../render_3d_base.h"
#include "clayer_triangles.h" #include "layer_triangles.h"
#include "../3d_render_raytracing/shapes2D/cpolygon2d.h" #include "../3d_render_raytracing/shapes2D/polygon_2d.h"
#include "../3d_render_raytracing/shapes2D/ctriangle2d.h" #include "../3d_render_raytracing/shapes2D/triangle_2d.h"
#include "../3d_render_raytracing/shapes2D/cpolygon4pts2d.h" #include "../3d_render_raytracing/shapes2D/4pt_polygon_2d.h"
#include "../3d_render_raytracing/shapes2D/cfilledcircle2d.h" #include "../3d_render_raytracing/shapes2D/filled_circle_2d.h"
#include "../3d_render_raytracing/shapes2D/cring2d.h" #include "../3d_render_raytracing/shapes2D/ring_2d.h"
#include "../3d_render_raytracing/shapes2D/croundsegment2d.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" #include "3d_cache/3d_info.h"

14
3d-viewer/3d_rendering/cpostshader.cpp → 3d-viewer/3d_rendering/post_shader.cpp
View File

@ -23,12 +23,12 @@
*/ */
/** /**
* @file cpostshader.cpp * @file post_shader.cpp
* @brief a base class to create post shaders * @brief A base class to create post shaders.
*/ */
#include "cpostshader.h" #include "post_shader.h"
#include "buffers_debug.h" #include "buffers_debug.h"
#include <wx/debug.h> #include <wx/debug.h>
@ -202,10 +202,12 @@ void POST_SHADER::DebugBuffersOutputAsImages() const
float *normalizedDepthPTr = normalizedDepth; float *normalizedDepthPTr = normalizedDepth;
for( unsigned int iy = 0; iy < m_size.y; ++iy ) 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) ); for( unsigned int ix = 0; ix < m_size.x; ++ix )
normalizedDepthPTr++; {
*normalizedDepthPTr = GetDepthNormalizedAt( SFVEC2I( ix, iy) );
normalizedDepthPTr++;
}
} }
DBG_SaveBuffer( "m_depthNormalized", normalizedDepth, m_size.x, m_size.y ); DBG_SaveBuffer( "m_depthNormalized", normalizedDepth, m_size.x, m_size.y );

6
3d-viewer/3d_rendering/cpostshader.h → 3d-viewer/3d_rendering/post_shader.h
View File

@ -23,14 +23,14 @@
*/ */
/** /**
* @file cpostshader.h * @file post_shader.h
* @brief a base class to create post shaders * @brief A base class to create post shaders.
*/ */
#ifndef POST_SHADER_H #ifndef POST_SHADER_H
#define POST_SHADER_H #define POST_SHADER_H
#include "ccamera.h" #include "camera.h"
class POST_SHADER class POST_SHADER
{ {

8
3d-viewer/3d_rendering/cpostshader_ssao.cpp → 3d-viewer/3d_rendering/post_shader_ssao.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cpostshader_ssao.cpp * @file post_shader_ssao.cpp
* @brief Implements a post shader screen space ambient occlusion on software * @brief Implement a post shader screen space ambient occlusion in software.
*/ */
#include "cpostshader_ssao.h" #include "post_shader_ssao.h"
#include "../3d_fastmath.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 localNormalFactor = glm::dot( cnorm, vv );
const float localNormalFactorWithThreshold = const float localNormalFactorWithThreshold =
( glm::max( localNormalFactor, aDotThreshold ) - aDotThreshold) / ( glm::max( localNormalFactor, aDotThreshold ) - aDotThreshold ) /
( 1.0f - aDotThreshold ); ( 1.0f - aDotThreshold );
const float aoFactor = localNormalFactorWithThreshold * aoGain * attDistFactor; const float aoFactor = localNormalFactorWithThreshold * aoGain * attDistFactor;

4
3d-viewer/3d_rendering/cpostshader_ssao.h → 3d-viewer/3d_rendering/post_shader_ssao.h
View File

@ -23,7 +23,7 @@
*/ */
/** /**
* @file cpostshader_ssao.h * @file post_shader_ssao.h
* @brief Implements a post shader screen space ambient occlusion on software * @brief Implements a post shader screen space ambient occlusion on software
*/ */
@ -31,7 +31,7 @@
#define POST_SHADER_SSAO_H #define POST_SHADER_SSAO_H
#include "cpostshader.h" #include "post_shader.h"
class POST_SHADER_SSAO : public POST_SHADER class POST_SHADER_SSAO : public POST_SHADER

4
3d-viewer/3d_rendering/c3d_render_base.cpp → 3d-viewer/3d_rendering/render_3d_base.cpp
View File

@ -23,12 +23,12 @@
*/ */
/** /**
* @file c3d_render_base.cpp * @file render_3d_base.cpp
* @brief implements the initialization of the base class * @brief implements the initialization of the base class
*/ */
#include "c3d_render_base.h" #include "render_3d_base.h"
/** /**

3
3d-viewer/3d_rendering/c3d_render_base.h → 3d-viewer/3d_rendering/render_3d_base.h
View File

@ -23,8 +23,7 @@
*/ */
/** /**
* @file c3d_render_base.h * @file render_3d_base.h
* @brief
*/ */
#ifndef RENDER_3D_BASE_H #ifndef RENDER_3D_BASE_H

12
3d-viewer/3d_rendering/test_cases.cpp
View File

@ -28,12 +28,12 @@
* @brief it run only once and only in debug build * @brief it run only once and only in debug build
*/ */
#include "3d_render_raytracing/cfrustum.h" #include "3d_render_raytracing/frustum.h"
#include "3d_render_raytracing/shapes2D/cbbox2d.h" #include "3d_render_raytracing/shapes2D/bbox_2d.h"
#include "3d_render_raytracing/shapes2D/cfilledcircle2d.h" #include "3d_render_raytracing/shapes2D/filled_circle_2d.h"
#include "3d_render_raytracing/shapes2D/cpolygon2d.h" #include "3d_render_raytracing/shapes2D/polygon_2d.h"
#include "3d_render_raytracing/shapes2D/croundsegment2d.h" #include "3d_render_raytracing/shapes2D/round_segment_2d.h"
#include "3d_render_raytracing/shapes3D/cbbox.h" #include "3d_render_raytracing/shapes3D/bbox_3d.h"
#include <wx/debug.h> #include <wx/debug.h>
//#ifdef DEBUG //#ifdef DEBUG

2
3d-viewer/3d_rendering/ctrack_ball.cpp → 3d-viewer/3d_rendering/track_ball.cpp
View File

@ -28,7 +28,7 @@
* center of the screen and rotates the camera. * center of the screen and rotates the camera.
*/ */
#include "ctrack_ball.h" #include "track_ball.h"
#include "trackball.h" #include "trackball.h"
#include "../3d_math.h" #include "../3d_math.h"
#include <wx/log.h> #include <wx/log.h>

4
3d-viewer/3d_rendering/ctrack_ball.h → 3d-viewer/3d_rendering/track_ball.h
View File

@ -23,14 +23,14 @@
*/ */
/** /**
* @file ctrack_ball.h * @file track_ball.h
* @brief Declaration for a track ball camera * @brief Declaration for a track ball camera
*/ */
#ifndef TRACK_BALL_H #ifndef TRACK_BALL_H
#define TRACK_BALL_H #define TRACK_BALL_H
#include "ccamera.h" #include "camera.h"
class TRACK_BALL : public CAMERA class TRACK_BALL : public CAMERA

2
3d-viewer/3d_viewer/3d_viewer_settings.cpp
View File

@ -19,7 +19,7 @@
*/ */
#include <3d_enums.h> #include <3d_enums.h>
#include <common_ogl/cogl_att_list.h> #include <common_ogl/ogl_attr_list.h>
#include <settings/parameters.h> #include <settings/parameters.h>
#include <wx/config.h> #include <wx/config.h>

2
3d-viewer/3d_viewer/eda_3d_viewer.h
View File

@ -34,7 +34,7 @@
#include "3d_canvas/board_adapter.h" #include "3d_canvas/board_adapter.h"
#include "3d_canvas/eda_3d_canvas.h" #include "3d_canvas/eda_3d_canvas.h"
#include "3d_rendering/ctrack_ball.h" #include "3d_rendering/track_ball.h"
#include <kiway_player.h> #include <kiway_player.h>
#include <wx/colourdata.h> #include <wx/colourdata.h>
#include <dialogs/dialog_color_picker.h> // for CUSTOM_COLORS_LIST definition #include <dialogs/dialog_color_picker.h> // for CUSTOM_COLORS_LIST definition

82
3d-viewer/CMakeLists.txt
View File

@ -40,51 +40,51 @@ set(3D-VIEWER_SRCS
3d_canvas/create_layer_poly.cpp 3d_canvas/create_layer_poly.cpp
3d_canvas/eda_3d_canvas.cpp 3d_canvas/eda_3d_canvas.cpp
3d_canvas/eda_3d_canvas_pivot.cpp 3d_canvas/eda_3d_canvas_pivot.cpp
3d_model_viewer/c3d_model_viewer.cpp 3d_model_viewer/3d_model_viewer.cpp
3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.cpp 3d_rendering/legacy/3d_model.cpp
3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.cpp 3d_rendering/legacy/ogl_legacy_utils.cpp
3d_rendering/3d_render_ogl_legacy/c3d_render_createscene_ogl_legacy.cpp 3d_rendering/legacy/create_scene.cpp
3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.cpp 3d_rendering/legacy/render_3d_legacy.cpp
3d_rendering/3d_render_ogl_legacy/clayer_triangles.cpp 3d_rendering/legacy/layer_triangles.cpp
${DIR_RAY_ACC}/caccelerator.cpp ${DIR_RAY_ACC}/accelerator_3d.cpp
${DIR_RAY_ACC}/cbvh_packet_traversal.cpp ${DIR_RAY_ACC}/bvh_packet_traversal.cpp
${DIR_RAY_ACC}/cbvh_pbrt.cpp ${DIR_RAY_ACC}/bvh_pbrt.cpp
${DIR_RAY_ACC}/ccontainer.cpp ${DIR_RAY_ACC}/container_3d.cpp
${DIR_RAY_ACC}/ccontainer2d.cpp ${DIR_RAY_ACC}/container_2d.cpp
${DIR_RAY}/PerlinNoise.cpp ${DIR_RAY}/PerlinNoise.cpp
${DIR_RAY}/c3d_render_createscene.cpp ${DIR_RAY}/create_scene.cpp
${DIR_RAY}/c3d_render_raytracing.cpp ${DIR_RAY}/render_3d_raytrace.cpp
${DIR_RAY}/cfrustum.cpp ${DIR_RAY}/frustum.cpp
${DIR_RAY}/cmaterial.cpp ${DIR_RAY}/material.cpp
${DIR_RAY}/mortoncodes.cpp ${DIR_RAY}/mortoncodes.cpp
${DIR_RAY}/ray.cpp ${DIR_RAY}/ray.cpp
${DIR_RAY}/raypacket.cpp ${DIR_RAY}/raypacket.cpp
${DIR_RAY_2D}/cbbox2d.cpp ${DIR_RAY_2D}/bbox_2d.cpp
${DIR_RAY_2D}/cfilledcircle2d.cpp ${DIR_RAY_2D}/filled_circle_2d.cpp
${DIR_RAY_2D}/citemlayercsg2d.cpp ${DIR_RAY_2D}/layer_item_2d.cpp
${DIR_RAY_2D}/cobject2d.cpp ${DIR_RAY_2D}/object_2d.cpp
${DIR_RAY_2D}/cpolygon2d.cpp ${DIR_RAY_2D}/polygon_2d.cpp
${DIR_RAY_2D}/cpolygon4pts2d.cpp ${DIR_RAY_2D}/4pt_polygon_2d.cpp
${DIR_RAY_2D}/cring2d.cpp ${DIR_RAY_2D}/ring_2d.cpp
${DIR_RAY_2D}/croundsegment2d.cpp ${DIR_RAY_2D}/round_segment_2d.cpp
${DIR_RAY_2D}/ctriangle2d.cpp ${DIR_RAY_2D}/triangle_2d.cpp
${DIR_RAY_3D}/cbbox.cpp ${DIR_RAY_3D}/bbox_3d.cpp
${DIR_RAY_3D}/cbbox_ray.cpp ${DIR_RAY_3D}/bbox_3d_ray.cpp
${DIR_RAY_3D}/ccylinder.cpp ${DIR_RAY_3D}/cylinder_3d.cpp
${DIR_RAY_3D}/cdummyblock.cpp ${DIR_RAY_3D}/dummy_block_3d.cpp
${DIR_RAY_3D}/clayeritem.cpp ${DIR_RAY_3D}/layer_item_3d.cpp
${DIR_RAY_3D}/cobject.cpp ${DIR_RAY_3D}/object_3d.cpp
${DIR_RAY_3D}/cplane.cpp ${DIR_RAY_3D}/plane_3d.cpp
${DIR_RAY_3D}/croundseg.cpp ${DIR_RAY_3D}/round_segment_3d.cpp
${DIR_RAY_3D}/ctriangle.cpp ${DIR_RAY_3D}/triangle_3d.cpp
3d_rendering/buffers_debug.cpp 3d_rendering/buffers_debug.cpp
3d_rendering/c3d_render_base.cpp 3d_rendering/render_3d_base.cpp
3d_rendering/ccamera.cpp 3d_rendering/camera.cpp
3d_rendering/ccolorrgb.cpp 3d_rendering/color_rgb.cpp
3d_rendering/cimage.cpp 3d_rendering/image.cpp
3d_rendering/cpostshader.cpp 3d_rendering/post_shader.cpp
3d_rendering/cpostshader_ssao.cpp 3d_rendering/post_shader_ssao.cpp
3d_rendering/ctrack_ball.cpp 3d_rendering/track_ball.cpp
3d_rendering/test_cases.cpp 3d_rendering/test_cases.cpp
3d_rendering/trackball.cpp 3d_rendering/trackball.cpp
3d_viewer/3d_menubar.cpp 3d_viewer/3d_menubar.cpp
@ -96,7 +96,7 @@ set(3D-VIEWER_SRCS
3d_viewer/tools/3d_controller.cpp 3d_viewer/tools/3d_controller.cpp
3d_viewer/eda_3d_viewer.cpp 3d_viewer/eda_3d_viewer.cpp
3d_viewer/3d_viewer_settings.cpp 3d_viewer/3d_viewer_settings.cpp
common_ogl/cogl_att_list.cpp common_ogl/ogl_attr_list.cpp
common_ogl/ogl_utils.cpp common_ogl/ogl_utils.cpp
3d_fastmath.cpp 3d_fastmath.cpp
3d_math.cpp 3d_math.cpp

4
3d-viewer/common_ogl/cogl_att_list.cpp → 3d-viewer/common_ogl/ogl_attr_list.cpp
View File

@ -23,11 +23,11 @@
*/ */
/** /**
* @file cogl_att_list.cpp * @file ogl_attr_list.cpp
* @brief Implements a attribute list support for openGL * @brief Implements a attribute list support for openGL
*/ */
#include "cogl_att_list.h" #include "ogl_attr_list.h"
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
#include <wx/debug.h> #include <wx/debug.h>
#include <core/arraydim.h> #include <core/arraydim.h>

4
3d-viewer/common_ogl/cogl_att_list.h → 3d-viewer/common_ogl/ogl_attr_list.h
View File

@ -23,8 +23,8 @@
*/ */
/** /**
* @file cogl_att_list.h * @file ogl_attr_list.h
* @brief Declaration of the cogl_att_list class * @brief Declaration of the cogl_att_list class.
*/ */
#ifndef _OGL_ATT_LIST_H #ifndef _OGL_ATT_LIST_H

2
3d-viewer/common_ogl/ogl_utils.h
View File

@ -32,7 +32,7 @@
#define OGL_UTILS_H_ #define OGL_UTILS_H_
#include <wx/image.h> #include <wx/image.h>
#include "3d_rendering/cimage.h" #include "3d_rendering/image.h"
#include <plugins/3dapi/c3dmodel.h> #include <plugins/3dapi/c3dmodel.h>
/** /**