From 7f6003085fa65f7483511e2a1d8fe3c0be25be83 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 25 Nov 2012 16:12:30 +0100 Subject: [PATCH] Fixed 3D module Former-commit-id: 91b5980f101ab55ce9313e80cbf3ece8c0da9b0f --- include/Nazara/3D/3D.hpp | 2 +- src/Nazara/3D/3D.cpp | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/Nazara/3D/3D.hpp b/include/Nazara/3D/3D.hpp index fa2961939..f1fff1471 100644 --- a/include/Nazara/3D/3D.hpp +++ b/include/Nazara/3D/3D.hpp @@ -23,7 +23,7 @@ class Nz3D static void Uninitialize(); private: - static unsigned int s_moduleReferenceCouter; + static unsigned int s_moduleReferenceCounter; }; #endif // NAZARA_3D_HPP diff --git a/src/Nazara/3D/3D.cpp b/src/Nazara/3D/3D.cpp index 0b6d201bf..a22cff0a4 100644 --- a/src/Nazara/3D/3D.cpp +++ b/src/Nazara/3D/3D.cpp @@ -2,48 +2,48 @@ // This file is part of the "Nazara Engine - 3D Module" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include #include -#include #include #include +#include bool Nz3D::Initialize() { - if (s_moduleReferenceCouter++ != 0) + if (s_moduleReferenceCounter++ != 0) return true; // Déjà initialisé // Initialisation des dépendances - if (!NzCore::Initialize()) + if (!NzRenderer::Initialize()) { - NazaraError("Failed to initialize core module"); + NazaraError("Failed to initialize renderer module"); return false; } // Initialisation du module - NazaraNotice("Initialized: ModuleName module"); + NazaraNotice("Initialized: 3D module"); return true; } bool Nz3D::IsInitialized() { - return s_moduleReferenceCouter != 0; + return s_moduleReferenceCounter != 0; } void Nz3D::Uninitialize() { - if (--s_moduleReferenceCouter != 0) + if (--s_moduleReferenceCounter != 0) return; // Encore utilisé // Libération du module - NazaraNotice("Uninitialized: ModuleName module"); + NazaraNotice("Uninitialized: 3D module"); // Libération des dépendances - NzCore::Uninitialize(); + NzRenderer::Uninitialize(); } -unsigned int Nz3D::s_moduleReferenceCouter = 0; +unsigned int Nz3D::s_moduleReferenceCounter = 0;