From 19f97c27c1c93c4db5a8f6542ae9e0b9d45cafe9 Mon Sep 17 00:00:00 2001 From: <> Date: Fri, 7 Apr 2017 08:19:51 -0700 Subject: [PATCH] Separated planes functions to its own file --- ReflexToQ3/Makefile | 17 ++++- ReflexToQ3/includes/planes.cpp | 125 +++++++++++++++++++++++++++++++ ReflexToQ3/includes/planes.h | 31 ++++++++ ReflexToQ3/main.cpp | 133 +-------------------------------- 4 files changed, 170 insertions(+), 136 deletions(-) create mode 100644 ReflexToQ3/includes/planes.cpp create mode 100644 ReflexToQ3/includes/planes.h diff --git a/ReflexToQ3/Makefile b/ReflexToQ3/Makefile index b85d6a8..0cd680a 100644 --- a/ReflexToQ3/Makefile +++ b/ReflexToQ3/Makefile @@ -5,8 +5,17 @@ CFLAGS=-std=c++11 -I"includes" -I"/usr/include/eigen3" all: v6 v8 -v6: - $(CC) includes/mapparser.cpp main.cpp $(CFLAGS) -o $(EXV6) 2>error6.log +v6: planes.o mapparser.o + $(CC) $^ main.cpp $(CFLAGS) -o $(EXV6) 2>error6.log -v8: - $(CC) includes/v8mapparser.cpp main.cpp $(CFLAGS) -o $(EXV8) 2>error8.log +v8: planes.o v8mapparser.o + $(CC) $^ main.cpp $(CFLAGS) -o $(EXV8) 2>error8.log + +mapparser.o: + $(CC) -c includes/mapparser.cpp $(CFLAGS) + +v8mapparser.o: + $(CC) -c includes/v8mapparser.cpp $(CFLAGS) + +planes.o: + $(CC) -c includes/planes.cpp $(CFLAGS) \ No newline at end of file diff --git a/ReflexToQ3/includes/planes.cpp b/ReflexToQ3/includes/planes.cpp new file mode 100644 index 0000000..96db707 --- /dev/null +++ b/ReflexToQ3/includes/planes.cpp @@ -0,0 +1,125 @@ +#include "libraries.h" +#include "planes.h" + +//-------------------------------------------------------+ +// Component functions of fn 'GetPlanePoints' + +// will need these functions to test whether the outputs used from Eigen +// are the same as the outputs from ckmath + +Eigen::Vector3f get_polygon_normal(const Eigen::Vector3f* vertices, const size_t nvertices) { + Eigen::Vector3f x = {0.0f, 0.0f, 0.0f}; + for (size_t i = 0; i < nvertices; ++i) { + const size_t kIndexA = ((nvertices - 1) + i) % nvertices; + const size_t kIndexB = i; + + const Eigen::Vector3f& krA = vertices[kIndexA]; + const Eigen::Vector3f& krB = vertices[kIndexB]; + + const Eigen::Vector3f kCrossProduct = krA.cross(krB); + x += kCrossProduct; + } + x.normalize(); + return x; +} + +inline Eigen::Vector3f get_center(const Eigen::Vector3f* kppoints, + const size_t npoints) { + Eigen::Vector3f result{0.0f, 0.0f, 0.0f}; + for(size_t i = 0; i < npoints; ++i) + { + result += kppoints[i]; + } + result *= (1.0f / (float)npoints); + return result; +} + +inline float get_width(const Eigen::Vector3f* kppoints, + const size_t npoints, + const Eigen::Vector3f center) { + float width = 1.0f; + for(size_t i = 0; i < npoints; ++i) { + // norm() = vector magnitude in Eigen. + width = std::max(width, (kppoints[i] - center).norm()); + } + return width; +} + +inline Eigen::Vector3f get_tangent(const Eigen::Vector3f* x, + float width) { + Eigen::Vector3f t = (x[1] - x[0]); + t.normalize(); + return (t * (width * 10.0f)); +} + +inline Eigen::Vector3f get_bitangent(const Eigen::Vector3f& tan, + const Eigen::Vector3f& norm, + float width) { + Eigen::Vector3f x = norm.cross(tan); + x.normalize(); + return (x * (width * 10.0f)); +} + +//-------------------------------------------------------+ + +TPlanePoints GetPlanePoints(const Eigen::Vector3f* _kpPoints, const size_t _kNumPoints) +{ + TPlanePoints PlanePoints; + const Eigen::Vector3f kNormal = get_polygon_normal(_kpPoints, _kNumPoints); + const Eigen::Vector3f kCenter = get_center(_kpPoints, _kNumPoints); + float fWidth = get_width(_kpPoints, _kNumPoints, kCenter); + const Eigen::Vector3f kTangent = get_tangent(_kpPoints, fWidth); + const Eigen::Vector3f kBiTangent = get_bitangent(kTangent, kNormal, fWidth); + + PlanePoints.m_A = kCenter + kBiTangent; + PlanePoints.m_B = kCenter; + PlanePoints.m_C = kCenter + kTangent; + + return(PlanePoints); +} + +std::vector GetBrushPlanes(const TBrush& _krBrush) +{ + std::vector Planes; + for(const TFace& krFace : _krBrush.m_Faces) + { + std::vector Verts(krFace.m_Indices.size()); + for(size_t i = 0; i < krFace.m_Indices.size(); ++i) + { + Verts[i] = _krBrush.m_Vertices[krFace.m_Indices[i]]; + } + TPlanePoints PP = GetPlanePoints(Verts.data(), Verts.size()); + PP.m_material = krFace.m_Material; + Planes.push_back(PP); + } + + return(Planes); +} + +std::string GetBrushString(const TBrush& _krBrush) +{ + std::vector Planes = GetBrushPlanes(_krBrush); + std::stringstream ssOutput; + + if(Planes.size()) + { + ssOutput << "{" << std::endl; + for(const TPlanePoints& krPlane : Planes) + { + ssOutput << "( " << krPlane.m_A[X] << " " << krPlane.m_A[Z] << " " << krPlane.m_A[Y] << " ) "; + ssOutput << "( " << krPlane.m_B[X] << " " << krPlane.m_B[Z] << " " << krPlane.m_B[Y] << " ) "; + ssOutput << "( " << krPlane.m_C[X] << " " << krPlane.m_C[Z] << " " << krPlane.m_C[Y] << " ) "; + if(krPlane.m_material.length()) + { + ssOutput << krPlane.m_material << " 0 0 0 0.500000 0.500000" << std::endl; + } + else + { + ssOutput << "common/caulk 0 0 0 0.500000 0.500000" << std::endl; + } + } + ssOutput << "}" << std::endl; + } + + return(ssOutput.str()); +} diff --git a/ReflexToQ3/includes/planes.h b/ReflexToQ3/includes/planes.h new file mode 100644 index 0000000..90fa61b --- /dev/null +++ b/ReflexToQ3/includes/planes.h @@ -0,0 +1,31 @@ +#include "worldspawn.h" +#include +#include + +#ifndef __PLANES_H__ +#define __PLANES_H__ + +struct TPlanePoints { + Eigen::Vector3f m_A; + Eigen::Vector3f m_B; + Eigen::Vector3f m_C; + std::string m_material; +}; + +Eigen::Vector3f get_polygon_normal(const Eigen::Vector3f*, const size_t); + +Eigen::Vector3f get_center(const Eigen::Vector3f*, const size_t); + +float get_width(const Eigen::Vector3f*, const size_t, const Eigen::Vector3f); + +Eigen::Vector3f get_tangent(const Eigen::Vector3f*, float); + +Eigen::Vector3f get_bitangent(const Eigen::Vector3f&, const Eigen::Vector3f&, float); + +TPlanePoints GetPlanePoints(const Eigen::Vector3f*, const size_t); + +std::vector GetBrushPlanes(const TBrush&); + +std::string GetBrushString(const TBrush&); + +#endif \ No newline at end of file diff --git a/ReflexToQ3/main.cpp b/ReflexToQ3/main.cpp index e155347..cf9f653 100644 --- a/ReflexToQ3/main.cpp +++ b/ReflexToQ3/main.cpp @@ -7,138 +7,7 @@ #include "libraries.h" // Local Includes #include "mapparser.h" - -// Structs -struct TPlanePoints -{ - Eigen::Vector3f m_A; - Eigen::Vector3f m_B; - Eigen::Vector3f m_C; - std::string m_material; -}; - -//-------------------------------------------------------+ -// Component functions of fn 'GetPlanePoints' - -// will need these functions to test whether the outputs used from Eigen -// are the same as the outputs from ckmath - -Eigen::Vector3f get_polygon_normal(const Eigen::Vector3f* vertices, const size_t nvertices) { - Eigen::Vector3f x = {0.0f, 0.0f, 0.0f}; - for (size_t i = 0; i < nvertices; ++i) { - const size_t kIndexA = ((nvertices - 1) + i) % nvertices; - const size_t kIndexB = i; - - const Eigen::Vector3f& krA = vertices[kIndexA]; - const Eigen::Vector3f& krB = vertices[kIndexB]; - - const Eigen::Vector3f kCrossProduct = krA.cross(krB); - x += kCrossProduct; - } - x.normalize(); - return x; -} - -inline Eigen::Vector3f get_center(const Eigen::Vector3f* kppoints, - const size_t npoints) { - Eigen::Vector3f result{0.0f, 0.0f, 0.0f}; - for(size_t i = 0; i < npoints; ++i) - { - result += kppoints[i]; - } - result *= (1.0f / (float)npoints); - return result; -} - -inline float get_width(const Eigen::Vector3f* kppoints, - const size_t npoints, - const Eigen::Vector3f center) { - float width = 1.0f; - for(size_t i = 0; i < npoints; ++i) { - // norm() = vector magnitude in Eigen. - width = std::max(width, (kppoints[i] - center).norm()); - } - return width; -} - -inline Eigen::Vector3f get_tangent(const Eigen::Vector3f* x, - float width) { - Eigen::Vector3f t = (x[1] - x[0]); - t.normalize(); - return (t * (width * 10.0f)); -} - -inline Eigen::Vector3f get_bitangent(const Eigen::Vector3f& tan, - const Eigen::Vector3f& norm, - float width) { - Eigen::Vector3f x = norm.cross(tan); - x.normalize(); - return (x * (width * 10.0f)); -} - -//-------------------------------------------------------+ - -TPlanePoints GetPlanePoints(const Eigen::Vector3f* _kpPoints, const size_t _kNumPoints) -{ - TPlanePoints PlanePoints; - const Eigen::Vector3f kNormal = get_polygon_normal(_kpPoints, _kNumPoints); - const Eigen::Vector3f kCenter = get_center(_kpPoints, _kNumPoints); - float fWidth = get_width(_kpPoints, _kNumPoints, kCenter); - const Eigen::Vector3f kTangent = get_tangent(_kpPoints, fWidth); - const Eigen::Vector3f kBiTangent = get_bitangent(kTangent, kNormal, fWidth); - - PlanePoints.m_A = kCenter + kBiTangent; - PlanePoints.m_B = kCenter; - PlanePoints.m_C = kCenter + kTangent; - - return(PlanePoints); -} - -std::vector GetBrushPlanes(const TBrush& _krBrush) -{ - std::vector Planes; - for(const TFace& krFace : _krBrush.m_Faces) - { - std::vector Verts(krFace.m_Indices.size()); - for(size_t i = 0; i < krFace.m_Indices.size(); ++i) - { - Verts[i] = _krBrush.m_Vertices[krFace.m_Indices[i]]; - } - TPlanePoints PP = GetPlanePoints(Verts.data(), Verts.size()); - PP.m_material = krFace.m_Material; - Planes.push_back(PP); - } - - return(Planes); -} - -std::string GetBrushString(const TBrush& _krBrush) -{ - std::vector Planes = GetBrushPlanes(_krBrush); - std::stringstream ssOutput; - - if(Planes.size()) - { - ssOutput << "{" << std::endl; - for(const TPlanePoints& krPlane : Planes) - { - ssOutput << "( " << krPlane.m_A[X] << " " << krPlane.m_A[Z] << " " << krPlane.m_A[Y] << " ) "; - ssOutput << "( " << krPlane.m_B[X] << " " << krPlane.m_B[Z] << " " << krPlane.m_B[Y] << " ) "; - ssOutput << "( " << krPlane.m_C[X] << " " << krPlane.m_C[Z] << " " << krPlane.m_C[Y] << " ) "; - if(krPlane.m_material.length()) - { - ssOutput << krPlane.m_material << " 0 0 0 0.500000 0.500000" << std::endl; - } - else - { - ssOutput << "common/caulk 0 0 0 0.500000 0.500000" << std::endl; - } - } - ssOutput << "}" << std::endl; - } - - return(ssOutput.str()); -} +#include "planes.h" int main(const int _kiArgC, const char** _kppcArgv) {