now moved from mesh to geometry - file renamed and includes fixed

This commit is contained in:
Hartmut Seichter 2020-12-03 00:16:34 +01:00
parent 5833691cb7
commit 425072bdec
10 changed files with 14 additions and 13 deletions

View file

@ -5,7 +5,7 @@
#include "pw/core/size.hpp" #include "pw/core/size.hpp"
#include "pw/core/point.hpp" #include "pw/core/point.hpp"
#include "pw/core/time.hpp" #include "pw/core/time.hpp"
#include "pw/core/mesh.hpp" #include "pw/core/geometry.hpp"
#include "pw/core/image.hpp" #include "pw/core/image.hpp"
#include "runtime_lua.hpp" #include "runtime_lua.hpp"

View file

@ -17,7 +17,7 @@ set(hdrs
include/pw/core/serialize.hpp include/pw/core/serialize.hpp
include/pw/core/size.hpp include/pw/core/size.hpp
include/pw/core/time.hpp include/pw/core/time.hpp
include/pw/core/mesh.hpp include/pw/core/geometry.hpp
include/pw/core/image.hpp include/pw/core/image.hpp
include/pw/core/vector.hpp include/pw/core/vector.hpp
include/pw/core/matrix_transform.hpp include/pw/core/matrix_transform.hpp
@ -34,7 +34,7 @@ set(srcs
src/core.cpp src/core.cpp
src/image.cpp src/image.cpp
src/debug.cpp src/debug.cpp
src/mesh.cpp src/geometry.cpp
src/resource.cpp src/resource.cpp
src/serialize.cpp src/serialize.cpp
src/time.cpp src/time.cpp

View file

@ -20,8 +20,8 @@
* SOFTWARE. * SOFTWARE.
* *
*/ */
#ifndef PW_CORE_MESH_HPP #ifndef PW_CORE_GEOMETRY_HPP
#define PW_CORE_MESH_HPP #define PW_CORE_GEOMETRY_HPP
#include <pw/core/globals.hpp> #include <pw/core/globals.hpp>
#include <pw/core/vector.hpp> #include <pw/core/vector.hpp>
@ -43,7 +43,7 @@ public:
points points
}; };
using index_t = uint32_t; using index_t = uint32_t; //< needs to be compatible with GL_UNSIGNED_INT
using valuearray_t = std::vector<real_t> ; using valuearray_t = std::vector<real_t> ;
using indexarray_t = std::vector<index_t> ; using indexarray_t = std::vector<index_t> ;

View file

@ -1,4 +1,4 @@
#include "pw/core/mesh.hpp" #include "pw/core/geometry.hpp"
#include "pw/core/debug.hpp" #include "pw/core/debug.hpp"
#include "pw/core/serialize.hpp" #include "pw/core/serialize.hpp"

View file

@ -1,7 +1,7 @@
#include <pw/core/vector.hpp> #include <pw/core/vector.hpp>
#include <pw/core/serialize.hpp> #include <pw/core/serialize.hpp>
#include <pw/core/matrix_transform.hpp> #include <pw/core/matrix_transform.hpp>
#include <pw/core/mesh.hpp> #include <pw/core/geometry.hpp>
#include <pw/core/axisangle.hpp> #include <pw/core/axisangle.hpp>
#include <iostream> #include <iostream>

View file

@ -1,7 +1,7 @@
#ifndef PW_GEOMETRY_PRIMITIVES_HPP #ifndef PW_GEOMETRY_PRIMITIVES_HPP
#define PW_GEOMETRY_PRIMITIVES_HPP #define PW_GEOMETRY_PRIMITIVES_HPP
#include <pw/core/mesh.hpp> #include <pw/core/geometry.hpp>
namespace pw { namespace pw {

View file

@ -3,7 +3,7 @@
#include <pw/core/size.hpp> #include <pw/core/size.hpp>
#include <pw/core/matrix.hpp> #include <pw/core/matrix.hpp>
#include <pw/core/mesh.hpp> #include <pw/core/geometry.hpp>
#include <map> #include <map>

View file

@ -2,12 +2,13 @@
#define PW_VISUAL_MESH_RENDERER_HPP #define PW_VISUAL_MESH_RENDERER_HPP
#include <pw/core/matrix.hpp> #include <pw/core/matrix.hpp>
#include <pw/core/mesh.hpp>
#include <map> #include <map>
namespace pw { namespace pw {
class geometry;
/** /**
* @brief Connects mesh data with the render backend * @brief Connects mesh data with the render backend
*/ */

View file

@ -1,6 +1,6 @@
#include "pw/core/size.hpp" #include "pw/core/size.hpp"
#include "pw/core/matrix.hpp" #include "pw/core/matrix.hpp"
#include "pw/core/mesh.hpp" #include "pw/core/geometry.hpp"
#include "pw/core/time.hpp" #include "pw/core/time.hpp"
#include "pw/core/axisangle.hpp" #include "pw/core/axisangle.hpp"
#include "pw/core/serialize.hpp" #include "pw/core/serialize.hpp"

View file

@ -1,6 +1,6 @@
#include "pw/visual/vertex_array.hpp" #include "pw/visual/vertex_array.hpp"
#include "pw/core/mesh.hpp" #include "pw/core/geometry.hpp"
#include "pw/core/size.hpp" #include "pw/core/size.hpp"
#include "pw/core/debug.hpp" #include "pw/core/debug.hpp"