7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-18 20:59:17 +00:00

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
3d-viewer
3d_cache/dialogs
3d_canvas
3d_model_viewer
3d_rendering
3d_viewer
CMakeLists.txt
common_ogl

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -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"

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

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
* 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>

View File

@ -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;

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();
}

View File

@ -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_

View File

@ -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>

View File

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

View File

@ -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>

View File

@ -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>

View File

@ -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()

View File

@ -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 )
{

View File

@ -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"

View File

@ -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)

View File

@ -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

View File

@ -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_

View File

@ -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 );

Some files were not shown because too many files have changed in this diff Show More