Fixed last commit

Yep, forgot to test it :D

It should be okay now


Former-commit-id: 3392523240affb4151f5121decb0e458500878a3

include/Nazara/3D.hpp

@@ -1,43 +0,0 @@
-// This file was automatically generated on 13 Mar 2013 at 23:20:31
-
-/*
-	Nazara Engine - 3D module
-
-	Copyright (C) 2013 Jérôme "Lynix" Leclercq (Lynix680@gmail.com)
-
-	Permission is hereby granted, free of charge, to any person obtaining a copy of
-	this software and associated documentation files (the "Software"), to deal in
-	the Software without restriction, including without limitation the rights to
-	use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-	of the Software, and to permit persons to whom the Software is furnished to do
-	so, subject to the following conditions:
-
-	The above copyright notice and this permission notice shall be included in all
-	copies or substantial portions of the Software.
-
-	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-	SOFTWARE.
-*/
-
-#pragma once
-
-#ifndef NAZARA_GLOBAL_3D_HPP
-#define NAZARA_GLOBAL_3D_HPP
-
-#include <Nazara/3D/3D.hpp>
-#include <Nazara/3D/Camera.hpp>
-#include <Nazara/3D/Config.hpp>
-#include <Nazara/3D/Enums.hpp>
-#include <Nazara/3D/Light.hpp>
-#include <Nazara/3D/Model.hpp>
-#include <Nazara/3D/RenderQueue.hpp>
-#include <Nazara/3D/Scene.hpp>
-#include <Nazara/3D/SceneNode.hpp>
-#include <Nazara/3D/SceneRoot.hpp>
-
-#endif // NAZARA_GLOBAL_3D_HPP

include/Nazara/Graphics.hpp

@@ -29,13 +29,13 @@
 #ifndef NAZARA_GLOBAL_GRAPHICS_HPP
 #define NAZARA_GLOBAL_GRAPHICS_HPP
 
-#include <Nazara/Graphics/3D.hpp>
 #include <Nazara/Graphics/Background.hpp>
 #include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/ColorBackground.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/Drawable.hpp>
 #include <Nazara/Graphics/Enums.hpp>
+#include <Nazara/Graphics/Graphics.hpp>
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Graphics/RenderQueue.hpp>

include/Nazara/Graphics/Camera.hpp

@@ -8,7 +8,7 @@
 #define NAZARA_CAMERA_HPP
 
 #include <Nazara/Prerequesites.hpp>
-#include <Nazara/3D/SceneNode.hpp>
+#include <Nazara/Graphics/SceneNode.hpp>
 #include <Nazara/Math/Frustum.hpp>
 #include <Nazara/Math/Matrix4.hpp>
 #include <Nazara/Math/Rect.hpp>

include/Nazara/Utility/Enums.hpp

@@ -142,7 +142,7 @@ enum nzImageType
 enum nzNodeType
 {
 	nzNodeType_Default,  // NzNode
-	nzNodeType_Scene,    // NzSceneNode (3D)
+	nzNodeType_Scene,    // NzSceneNode (Graphics)
 	nzNodeType_Skeletal, ///TODO
 
 	nzNodeType_Max = nzNodeType_Skeletal