From d57e0d48422541780a9ccc23a774e4e4d82f04c0 Mon Sep 17 00:00:00 2001 From: Antoine Chavasse Date: Sun, 14 Jun 2009 18:15:14 +0200 Subject: [PATCH] Fixed a few issues, everything now works again. --- src/idl/parser/actions_class.h | 1 + src/math/Matrix44f.cpp | 2 +- src/math/{math.h => failmath.h} | 1 + src/scenegraph/scenegraph.fidl | 2 +- src/scenegraph/shapes/Cone.cpp | 2 +- src/scenegraph/shapes/Cylinder.cpp | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) rename src/math/{math.h => failmath.h} (98%) diff --git a/src/idl/parser/actions_class.h b/src/idl/parser/actions_class.h index 1e6eed5..1e07c66 100644 --- a/src/idl/parser/actions_class.h +++ b/src/idl/parser/actions_class.h @@ -46,6 +46,7 @@ namespace fail { namespace idlparser s.pCurrentNamespace->addStruct( s.pCurrentClass ); s.pCurrentClass->setFlags( s.ClassFlags ); + s.pCurrentClass->setFlag( "ValueType", true ); s.MembersFlags.clear(); s.pCurrentFlags = &s.MembersFlags; } diff --git a/src/math/Matrix44f.cpp b/src/math/Matrix44f.cpp index dd8c9dc..72ae1c9 100644 --- a/src/math/Matrix44f.cpp +++ b/src/math/Matrix44f.cpp @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "math/math.h" +#include "math/failmath.h" using namespace fail; using namespace fail::math; diff --git a/src/math/math.h b/src/math/failmath.h similarity index 98% rename from src/math/math.h rename to src/math/failmath.h index 85995cf..491c1d2 100644 --- a/src/math/math.h +++ b/src/math/failmath.h @@ -19,6 +19,7 @@ #ifndef FAIL_MATH_MATH_H_ #define FAIL_MATH_MATH_H_ +#include #include "core/core.h" #include "Vector2f.h" #include "Vector3f.h" diff --git a/src/scenegraph/scenegraph.fidl b/src/scenegraph/scenegraph.fidl index d81cccc..73d990c 100644 --- a/src/scenegraph/scenegraph.fidl +++ b/src/scenegraph/scenegraph.fidl @@ -63,7 +63,7 @@ namespace fail { namespace scenegraph // It can be a simple mesh, a composite mesh, a character, a world sector, // a terrain, a culling object, a portal etc. // The root object for the world is a Renderable. - [ !Abstract ] + [ Abstract ] class Renderable : Persistable { virtual void evaluate( shared_ptr< RenderPass > pPass ); diff --git a/src/scenegraph/shapes/Cone.cpp b/src/scenegraph/shapes/Cone.cpp index b8982da..fa1f5b0 100644 --- a/src/scenegraph/shapes/Cone.cpp +++ b/src/scenegraph/shapes/Cone.cpp @@ -19,7 +19,7 @@ #include "scenegraph/shapes/Cone.h" #include "scenegraph/RenderPass.h" #include "scenegraph/IndexBuffer16.h" -#include "math/math.h" +#include "math/failmath.h" using namespace fail; using namespace fail::scenegraph; diff --git a/src/scenegraph/shapes/Cylinder.cpp b/src/scenegraph/shapes/Cylinder.cpp index 6b6ad52..548e0e8 100644 --- a/src/scenegraph/shapes/Cylinder.cpp +++ b/src/scenegraph/shapes/Cylinder.cpp @@ -19,7 +19,7 @@ #include "scenegraph/shapes/Cylinder.h" #include "scenegraph/RenderPass.h" #include "scenegraph/IndexBuffer16.h" -#include "math/math.h" +#include "math/failmath.h" using namespace fail; using namespace fail::scenegraph; -- 2.11.4.GIT