Added RenderTextures (And many others things)

-Added Forward, left and up vector (Vector3) -Added Matrix4::ConcatenateAffine shortcut -Added Quaternion::GetInverse() and Quaternion::Inverse() -Added Resource listeners -Added Depth and stencil pixel formats -All enums now have an ending "max" entry -Animation/Mesh::Add[Sequence/Skin/SubMesh] now returns a boolean -Contexts are now resources -Enhanced AnimatedMesh demo -Fixed MD2 facing -Fixed Vector3::CrossProduct -Made Resource thread-safe -Made OpenGL translation table global -Many bugfixes -MLT will now write malloc failure to the log -Most of the strcpy were replaced with faster memcpy -Occlusion queries availability is now always tested -OpenGL-related includes now requires NAZARA_RENDERER_OPENGL to be defined to have any effect -Pixel formats now have a type -Renamed RenderTarget::IsValid to IsRenderable -Renamed Quaternion::GetNormalized() to GetNormal() -Renamed Texture::Bind() to Prepare() -Renamed VectorX::Make[Ceil|Floor] to Maximize/Minimize -Removed MATH_MATRIX_COLUMN_MAJOR option (all matrices are column-major) -Removed RENDERER_ACTIVATE_RENDERWINDOW_ON_CREATION option (Render windows are active upon their creation) Former-commit-id: 0d1da1e32c156a958221edf04a5315c75b354450
2012-09-20 22:07:30 +02:00
parent a6ed70123b
commit cd5a1b7a5e
65 changed files with 24385 additions and 22703 deletions
--- a/src/Nazara/Core/Resource.cpp
+++ b/src/Nazara/Core/Resource.cpp
@@ -1,54 +1,138 @@
-// Copyright (C) 2012 Jérôme Leclercq
-// This file is part of the "Nazara Engine - Core module"
-// For conditions of distribution and use, see copyright notice in Config.hpp
-
-#include <Nazara/Core/Resource.hpp>
-#include <Nazara/Core/Config.hpp>
-#include <Nazara/Core/Error.hpp>
-#include <Nazara/Core/Debug.hpp>
-
-NzResource::NzResource(bool persistent) :
-m_resourcePersistent(persistent),
-m_resourceReferenceCount(0)
-{
-}
-
-NzResource::NzResource(const NzResource& resource) :
-m_resourcePersistent(resource.m_resourcePersistent),
-m_resourceReferenceCount(0)
-{
-}
-
-NzResource::~NzResource() = default;
-
-void NzResource::AddResourceReference() const
-{
-	m_resourceReferenceCount++;
-}
-
-bool NzResource::IsPersistent() const
-{
-	return m_resourcePersistent;
-}
-
-void NzResource::RemoveResourceReference() const
-{
-	#if NAZARA_CORE_SAFE
-	if (m_resourceReferenceCount == 0)
-	{
-		NazaraError("Impossible to remove reference (Ref. counter is already 0)");
-		return;
-	}
-	#endif
-
-	if (--m_resourceReferenceCount == 0 && !m_resourcePersistent)
-		delete this;
-}
-
-void NzResource::SetPersistent(bool persistent)
-{
-	m_resourcePersistent = persistent;
-
-	if (!persistent && m_resourceReferenceCount == 0)
-		delete this;
-}
+// Copyright (C) 2012 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Core module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Core/Resource.hpp>
+#include <Nazara/Core/Config.hpp>
+#include <Nazara/Core/Error.hpp>
+#include <Nazara/Core/ResourceListener.hpp>
+#include <Nazara/Core/Debug.hpp>
+
+NzResource::NzResource(bool persistent) :
+m_resourcePersistent(persistent),
+m_resourceReferenceCount(0)
+{
+}
+
+NzResource::NzResource(const NzResource& resource) :
+m_resourcePersistent(resource.m_resourcePersistent),
+m_resourceReferenceCount(0)
+{
+}
+
+NzResource::~NzResource()
+{
+	EnsureResourceListenerUpdate();
+
+	for (auto it = m_resourceListenersCache.begin(); it != m_resourceListenersCache.end(); ++it)
+		(*it).listener->OnResourceReleased(this, (*it).index);
+}
+
+void NzResource::AddResourceListener(NzResourceListener* listener, int index) const
+{
+	NazaraLock(m_mutex)
+
+	if (m_resourceListeners.insert(NzResourceEntry(listener, index)).second)
+	{
+		m_resourceListenerUpdated = false;
+
+		// AddResourceReference()
+		m_resourceReferenceCount++;
+	}
+}
+
+void NzResource::AddResourceReference() const
+{
+	NazaraLock(m_mutex)
+
+	m_resourceReferenceCount++;
+}
+
+bool NzResource::IsPersistent() const
+{
+	NazaraLock(m_mutex)
+
+	return m_resourcePersistent;
+}
+
+void NzResource::RemoveResourceListener(NzResourceListener* listener) const
+{
+	NazaraLock(m_mutex)
+
+	if (m_resourceListeners.erase(listener) != 0)
+		m_resourceListenerUpdated = false;
+	else
+		NazaraError(NzString::Pointer(listener) + " is not listening to " + NzString::Pointer(this));
+
+	RemoveResourceReference();
+}
+
+void NzResource::RemoveResourceReference() const
+{
+	NazaraMutexLock(m_mutex);
+
+	#if NAZARA_CORE_SAFE
+	if (m_resourceReferenceCount == 0)
+	{
+		NazaraError("Impossible to remove reference (Ref. counter is already 0)");
+		return;
+	}
+	#endif
+
+	if (--m_resourceReferenceCount == 0 && !m_resourcePersistent)
+	{
+		NazaraMutexUnlock(m_mutex);
+		delete this;
+	}
+	else
+	{
+		NazaraMutexUnlock(m_mutex);
+	}
+}
+
+void NzResource::SetPersistent(bool persistent)
+{
+	NazaraMutexLock(m_mutex);
+
+	m_resourcePersistent = persistent;
+
+	if (!persistent && m_resourceReferenceCount == 0)
+	{
+		NazaraMutexUnlock(m_mutex);
+		delete this;
+	}
+	else
+	{
+		NazaraMutexUnlock(m_mutex);
+	}
+}
+
+void NzResource::NotifyCreated()
+{
+	NazaraLock(m_mutex)
+
+	EnsureResourceListenerUpdate();
+
+	for (auto it = m_resourceListenersCache.begin(); it != m_resourceListenersCache.end(); ++it)
+		(*it).listener->OnResourceCreated(this, (*it).index);
+}
+
+void NzResource::NotifyDestroy()
+{
+	NazaraLock(m_mutex)
+
+	EnsureResourceListenerUpdate();
+
+	for (auto it = m_resourceListenersCache.begin(); it != m_resourceListenersCache.end(); ++it)
+		(*it).listener->OnResourceDestroy(this, (*it).index);
+}
+
+void NzResource::EnsureResourceListenerUpdate() const
+{
+	// Déjà bloqué par une mutex
+	if (!m_resourceListenerUpdated)
+	{
+		m_resourceListenersCache = m_resourceListeners;
+		m_resourceListenerUpdated = true;
+	}
+}