diff --git a/CMakeLists.txt b/CMakeLists.txt index 369f0ce..6b899a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,7 @@ include_directories( ${INCLUDE_ROOT} ${INCLUDE_ROOT}/bullet ${PROJECT_SOURCE_DIR}/../sparrowinput + ${PROJECT_SOURCE_DIR}/../SparrowInput ${PROJECT_SOURCE_DIR}/../sparrowrenderer ) diff --git a/scene.h b/scene.h index 0a219e3..3dd8761 100644 --- a/scene.h +++ b/scene.h @@ -33,7 +33,7 @@ private: //general Node -class ObjectNode : public SceneNode, public PhongEntity +class ObjectNode : public SceneNode//, public PhongEntity { //add bullet rigidbody public: @@ -51,13 +51,13 @@ class ItemNode: public ObjectNode }; // Node -class GUINode : public SceneNode, public GUIEntity +class GUINode : public SceneNode//, public GUIEntity { public: virtual void update(); }; -class PlayerNode: public SceneNode, public FPSCamera +class PlayerNode: public SceneNode//, public FPSCamera { public: virtual void update(); @@ -87,6 +87,6 @@ class ChunkNode: public SceneNode public: virtual void update(); // map -======= +}; #endif // SCENE_H