mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-02 05:25:41 +00:00
Code Issues Projects Releases Wiki Activity

Textured shapes == success

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@387 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-09-03 18:54:00 +00:00
parent 98726406ad
commit 85e46e522a
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/projectM-engine/Renderer.cpp
View File

@ -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);

2
src/projectM-engine/Renderer.hpp
View File

@ -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
{

1
src/projectM-engine/projectM.cpp
View File

@ -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/" );

3
src/projectM-engine/projectM.hpp
View File

@ -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