3D Viewer: remove all instances of "c" prefix from file names.
This commit is contained in:
parent
dc65166ee7
commit
710e621c6a
|
@ -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 <common_ogl/cogl_att_list.h>
|
||||
#include <3d_model_viewer/3d_model_viewer.h>
|
||||
#include <common_ogl/ogl_attr_list.h>
|
||||
#include <filename_resolver.h>
|
||||
#include <pcbnew/footprint.h>
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <base_units.h>
|
||||
#include <bitmaps.h>
|
||||
#include <board.h>
|
||||
#include <common_ogl/cogl_att_list.h>
|
||||
#include <common_ogl/ogl_attr_list.h>
|
||||
#include <gal/dpi_scaling.h>
|
||||
#include <pgm_base.h>
|
||||
#include <project.h>
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include <tool/tools_holder.h>
|
||||
#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
|
||||
|
|
|
@ -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 <board.h>
|
||||
#include <3d_math.h>
|
||||
#include "3d_fastmath.h"
|
||||
|
|
|
@ -27,13 +27,13 @@
|
|||
|
||||
#include <array>
|
||||
#include <vector>
|
||||
#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 <layers_id_colors_and_visibility.h>
|
||||
#include <pad.h>
|
||||
|
|
|
@ -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 <board_adapter.h>
|
||||
#include <board.h>
|
||||
#include <footprint.h>
|
||||
|
|
|
@ -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 <board.h>
|
||||
#include <footprint.h>
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
#include "../common_ogl/ogl_utils.h"
|
||||
#include "eda_3d_canvas.h"
|
||||
#include <eda_3d_viewer.h>
|
||||
#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 <board.h>
|
||||
#include <reporter.h>
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
|
||||
#include <atomic>
|
||||
#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 <gal/hidpi_gl_canvas.h>
|
||||
#include <wx/image.h>
|
||||
|
|
|
@ -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 <iostream>
|
||||
#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 <wx/dcclient.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 <gal/hidpi_gl_canvas.h>
|
||||
|
||||
class S3D_CACHE;
|
|
@ -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();
|
||||
}
|
|
@ -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_
|
|
@ -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 <wx/debug.h>
|
||||
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "cbvh_pbrt.h"
|
||||
#include "bvh_pbrt.h"
|
||||
#include "../../../3d_fastmath.h"
|
||||
#include <macros.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 <cstdint>
|
||||
#include <list>
|
||||
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file ccontainer2d.cpp
|
||||
* @brief
|
||||
* @file container_2d.cpp
|
||||
*/
|
||||
|
||||
#include "ccontainer2d.h"
|
||||
#include "container_2d.h"
|
||||
#include <vector>
|
||||
#include <mutex>
|
||||
#include <boost/range/algorithm/partition.hpp>
|
|
@ -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 <list>
|
||||
#include <mutex>
|
||||
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file ccontainer.cpp
|
||||
* @brief
|
||||
* @file container_3d.cpp
|
||||
*/
|
||||
|
||||
#include "ccontainer.h"
|
||||
#include "container_3d.h"
|
||||
#include <cstdio>
|
||||
|
||||
CONTAINER_3D_BASE::CONTAINER_3D_BASE()
|
|
@ -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 <list>
|
||||
#include <vector>
|
||||
|
||||
|
@ -46,7 +45,7 @@ public:
|
|||
|
||||
virtual ~CONTAINER_3D_BASE();
|
||||
|
||||
void Add( OBJECT_3D *aObject )
|
||||
void Add( OBJECT_3D* aObject )
|
||||
{
|
||||
if( aObject )
|
||||
{
|
|
@ -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"
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
* 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) 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)
|
|
@ -2,7 +2,7 @@
|
|||
* 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) 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
|
|
@ -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_
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cmaterial.cpp
|
||||
* @brief
|
||||
* @file material.cpp
|
||||
*/
|
||||
|
||||
#include "cmaterial.h"
|
||||
#include "material.h"
|
||||
#include <3d_math.h>
|
||||
#include <wx/debug.h>
|
||||
|
||||
|
@ -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 );
|
|
@ -23,8 +23,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cmaterial.h
|
||||
* @brief
|
||||
* @file material.h
|
||||
*/
|
||||
|
||||
#ifndef _MATERIAL_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 ) )
|
||||
|
|
|
@ -23,8 +23,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file c3d_render_raytracing.cpp
|
||||
* @brief
|
||||
* @file render_3d_raytrace.cpp
|
||||
*/
|
||||
|
||||
#include <gal/opengl/kiglew.h> // Must be included first
|
||||
|
@ -35,9 +34,9 @@
|
|||
#include <climits>
|
||||
#include <thread>
|
||||
|
||||
#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"
|
|
@ -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 <plugins/3dapi/c3dmodel.h>
|
||||
|
||||
#include <map>
|
||||
|
@ -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;
|
||||
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cpolygon4pts2d.cpp
|
||||
* @brief
|
||||
* @file 4pt_polygon_2d.cpp
|
||||
*/
|
||||
|
||||
#include "cpolygon4pts2d.h"
|
||||
#include "4pt_polygon_2d.h"
|
||||
#include <wx/debug.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
|
||||
{
|
|
@ -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 <wx/debug.h>
|
||||
|
||||
|
||||
|
@ -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 ) );
|
||||
}
|
||||
|
||||
|
|
@ -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
|
|
@ -23,11 +23,11 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cfilledcircle2d.cpp
|
||||
* @file filled_circle_2d.cpp
|
||||
* @brief
|
||||
*/
|
||||
|
||||
#include "cfilledcircle2d.h"
|
||||
#include "filled_circle_2d.h"
|
||||
#include <wx/debug.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;
|
|
@ -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 <wx/debug.h>
|
||||
|
||||
|
||||
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 ),
|
||||
m_objectA( aObjectA ),
|
||||
m_objectB( aObjectB ),
|
|
@ -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 <vector>
|
||||
|
||||
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cobject2d.cpp
|
||||
* @brief
|
||||
* @file object_2d.cpp
|
||||
*/
|
||||
|
||||
#include "cobject2d.h"
|
||||
#include "object_2d.h"
|
||||
#include <cstdio>
|
||||
|
||||
|
|
@ -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 <cstring>
|
||||
|
||||
#include <board_item.h>
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cpolygon2d.cpp
|
||||
* @brief
|
||||
* @file polygon_2d.cpp
|
||||
*/
|
||||
|
||||
#include "cpolygon2d.h"
|
||||
#include "polygon_2d.h"
|
||||
#include <wx/debug.h>
|
||||
|
||||
#ifdef PRINT_STATISTICS_3D_VIEWER
|
|
@ -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 <geometry/shape_poly_set.h>
|
||||
#include <vector>
|
||||
|
||||
|
@ -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;
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file cring2d.cpp
|
||||
* @brief
|
||||
* @file ring_2d.cpp
|
||||
*/
|
||||
|
||||
#include "cring2d.h"
|
||||
#include "ring_2d.h"
|
||||
#include "../../../3d_fastmath.h"
|
||||
#include <wx/debug.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;
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file croundsegment2d.cpp
|
||||
* @brief
|
||||
* @file round_segment_2d.cpp
|
||||
*/
|
||||
|
||||
#include "croundsegment2d.h"
|
||||
#include "round_segment_2d.h"
|
||||
#include <wx/debug.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
|
||||
{
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file ctriangle2d.cpp
|
||||
* @brief
|
||||
* @file triangle_2d.cpp
|
||||
*/
|
||||
|
||||
#include "ctriangle2d.h"
|
||||
#include "triangle_2d.h"
|
||||
#include <map>
|
||||
#include <boost/smart_ptr/shared_ptr.hpp>
|
||||
#include <boost/smart_ptr/shared_array.hpp>
|
|
@ -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 <geometry/shape_line_chain.h>
|
||||
#include <geometry/shape_poly_set.h>
|
||||
#include <clipper.hpp>
|
||||
|
@ -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;
|
|
@ -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 <cstdio>
|
||||
#include <wx/log.h>
|
||||
#include <wx/debug.h> // For the wxASSERT
|
|
@ -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_
|
|
@ -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 <wx/debug.h>
|
||||
|
||||
// This BBOX Ray intersection test have the following credits:
|
|
@ -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 )
|
|
@ -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
|
||||
{
|
|
@ -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 )
|
|
@ -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
|
|
@ -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 <wx/debug.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;
|
|
@ -27,7 +27,7 @@
|
|||
* @brief
|
||||
*/
|
||||
|
||||
#include "cobject.h"
|
||||
#include "object_3d.h"
|
||||
#include <cstdio>
|
||||
#include <map>
|
||||
|
|
@ -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 <board_item.h>
|
||||
|
|
@ -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 )
|
|
@ -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
|
|
@ -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 ) :
|
|
@ -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;
|
|
@ -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()
|
|
@ -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.
|
|
@ -23,11 +23,10 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file ccamera.cpp
|
||||
* @brief
|
||||
* @file camera.cpp
|
||||
*/
|
||||
|
||||
#include "ccamera.h"
|
||||
#include "camera.h"
|
||||
#include <wx/log.h>
|
||||
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file ccamera.h
|
||||
* @brief Define an abstract camera
|
||||
* @file camera.h
|
||||
* @brief Define an abstract camera.
|
||||
*/
|
||||
|
||||
#ifndef CAMERA_H
|
|
@ -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 )
|
|
@ -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
|
|
@ -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 <cstring> // For memcpy
|
||||
|
|
@ -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
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include <gal/opengl/kiglew.h> // 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"
|
|
@ -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 <vector>
|
||||
#include <plugins/3dapi/c3dmodel.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"
|
||||
|
||||
class MODEL_3D
|
|
@ -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 <board.h>
|
||||
#include <footprint.h>
|
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "clayer_triangles.h"
|
||||
#include "layer_triangles.h"
|
||||
#include <wx/debug.h> // For the wxASSERT
|
||||
#include <mutex>
|
||||
#include <thread>
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file clayer_triangles.h
|
||||
* @file layer_triangles.h
|
||||
*/
|
||||
|
||||
#ifndef TRIANGLE_DISPLAY_LIST_H_
|
||||
|
@ -33,7 +33,7 @@
|
|||
#include <plugins/3dapi/xv3d_types.h>
|
||||
#include <geometry/shape_line_chain.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 <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
|
||||
{
|
|
@ -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.
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#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 "common_ogl/ogl_utils.h"
|
||||
#include <footprint.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"
|
||||
|
|
@ -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 <wx/debug.h>
|
||||
|
||||
|
@ -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 );
|
|
@ -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
|
||||
{
|
|
@ -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;
|
|
@ -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
|
|
@ -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"
|
||||
|
||||
|
||||
/**
|
|
@ -23,8 +23,7 @@
|
|||
*/
|
||||
|
||||
/**
|
||||
* @file c3d_render_base.h
|
||||
* @brief
|
||||
* @file render_3d_base.h
|
||||
*/
|
||||
|
||||
#ifndef RENDER_3D_BASE_H
|
|
@ -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 <wx/debug.h>
|
||||
|
||||
//#ifdef DEBUG
|
||||
|
|
|
@ -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 <wx/log.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
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
|
||||
#include <3d_enums.h>
|
||||
#include <common_ogl/cogl_att_list.h>
|
||||
#include <common_ogl/ogl_attr_list.h>
|
||||
#include <settings/parameters.h>
|
||||
#include <wx/config.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 <kiway_player.h>
|
||||
#include <wx/colourdata.h>
|
||||
#include <dialogs/dialog_color_picker.h> // for CUSTOM_COLORS_LIST definition
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 <wx/glcanvas.h>
|
||||
#include <wx/debug.h>
|
||||
#include <core/arraydim.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
|
|
@ -32,7 +32,7 @@
|
|||
#define OGL_UTILS_H_
|
||||
|
||||
#include <wx/image.h>
|
||||
#include "3d_rendering/cimage.h"
|
||||
#include "3d_rendering/image.h"
|
||||
#include <plugins/3dapi/c3dmodel.h>
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue