From 85e46e522ab77b7918e075b1dc659bb8f2cd09ad Mon Sep 17 00:00:00 2001
From: psperl <psperl@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Mon, 3 Sep 2007 18:54:00 +0000
Subject: [PATCH] Textured shapes == success

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@387 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/projectM-engine/Renderer.cpp | 6 +++++-
 src/projectM-engine/Renderer.hpp | 2 +-
 src/projectM-engine/projectM.cpp | 1 +
 src/projectM-engine/projectM.hpp | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index af95c5ba6..3086f2dd6 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -723,7 +723,11 @@ void Renderer::draw_shapes(PresetOutputs *presetOutputs) {
 	  if ( (*pos)->textured)
 	    {
 
-
+	      if ((*pos)->getImageUrl() !="")
+		{
+		  GLuint tex = textureManager->getTexture((*pos)->getImageUrl());
+		  if (tex != 0) glBindTexture(GL_TEXTURE_2D, tex);
+		}
 	      //glBindTexture(GL_TEXTURE_2D, texture);
 	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,  GL_MODULATE);
 
diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp
index f0f63c0c6..773c543e5 100644
--- a/src/projectM-engine/Renderer.hpp
+++ b/src/projectM-engine/Renderer.hpp
@@ -4,7 +4,6 @@
 #include "PBuffer.hpp"
 #include "PresetFrameIO.hpp"
 #include "BeatDetect.hpp"
-#include "TextureManager.hpp"
 #include <string>
 
 #ifdef USE_FTGL
@@ -14,6 +13,7 @@
 #endif /** USE_FTGL */
 
 class BeatDetect;
+class TextureManager;
 
 class Renderer
 {
diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp
index e7cfe422b..954f10701 100755
--- a/src/projectM-engine/projectM.cpp
+++ b/src/projectM-engine/projectM.cpp
@@ -54,6 +54,7 @@
 #include "Renderer.hpp"
 #include "PresetChooser.hpp"
 #include "ConfigFile.h"
+#include "TextureManager.hpp"
 
 #ifdef LINUX
 const std::string projectM::PROJECTM_PRESET_PATH ( "/usr/share/projectM/presets/" );
diff --git a/src/projectM-engine/projectM.hpp b/src/projectM-engine/projectM.hpp
index fa1a84fa4..db9faf922 100755
--- a/src/projectM-engine/projectM.hpp
+++ b/src/projectM-engine/projectM.hpp
@@ -70,7 +70,7 @@
 #include "fatal.h"
 #include "PresetFrameIO.hpp"
 #include "Renderer.hpp"
-#include "TextureManager.hpp"
+
 
 
 #include <memory>
@@ -82,6 +82,7 @@ class Preset;
 class PresetIterator;
 class PresetChooser;
 class PresetLoader;
+class TextureManager;
 
 #include <memory>
 #ifdef WIN32