From becfa7ec89dcf1180d55556b3a7baf274f3e67c6 Mon Sep 17 00:00:00 2001 From: Maxime Curioni Date: Sun, 18 Oct 2009 17:06:29 +0000 Subject: forgotten files of last commit --- .../blender_interface/BlenderTextureManager.cpp | 71 ++++++++++++++++++++++ .../blender_interface/BlenderTextureManager.h | 23 +++++++ 2 files changed, 94 insertions(+) create mode 100644 source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp create mode 100644 source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp new file mode 100644 index 00000000000..d731af42d0e --- /dev/null +++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.cpp @@ -0,0 +1,71 @@ +#include "BlenderTextureManager.h" + + +BlenderTextureManager::BlenderTextureManager () +: TextureManager() +{ + //_brushes_path = Config::getInstance()... +} + +BlenderTextureManager::~BlenderTextureManager () +{ +} + +void BlenderTextureManager::loadStandardBrushes() +{ + // getBrushTextureIndex(TEXTURES_DIR "/brushes/charcoalAlpha.bmp", Stroke::HUMID_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/washbrushAlpha.bmp", Stroke::HUMID_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/oil.bmp", Stroke::HUMID_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/oilnoblend.bmp", Stroke::HUMID_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/charcoalAlpha.bmp", Stroke::DRY_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/washbrushAlpha.bmp", Stroke::DRY_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/opaqueDryBrushAlpha.bmp", Stroke::OPAQUE_MEDIUM); + // getBrushTextureIndex(TEXTURES_DIR "/brushes/opaqueBrushAlpha.bmp", Stroke::OPAQUE_MEDIUM); + //_defaultTextureId = getBrushTextureIndex("smoothAlpha.bmp", Stroke::OPAQUE_MEDIUM); +} + + +unsigned +BlenderTextureManager::loadBrush(string sname, Stroke::MediumType mediumType) +{ +// GLuint texId; +// glGenTextures(1, &texId); +// bool found = false; +// vector pathnames; +// string path; //soc +// StringUtils::getPathName(TextureManager::Options::getBrushesPath(), +// sname, +// pathnames); +// for (vector::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) { +// path = j->c_str(); +// //soc if(QFile::exists(path)){ +// if( BLI_exists( const_cast(path.c_str()) ) ) { +// found = true; +// break; +// } +// } +// if(!found) +// return 0; +// // Brush texture +// cout << "Loading brush texture..." << endl; +// switch(mediumType){ +// case Stroke::DRY_MEDIUM: +// //soc prepareTextureLuminance((const char*)path.toAscii(), texId); +// prepareTextureLuminance(StringUtils::toAscii(path), texId); +// break; +// case Stroke::HUMID_MEDIUM: +// case Stroke::OPAQUE_MEDIUM: +// default: +// //soc prepareTextureAlpha((const char*)path.toAscii(), texId); +// prepareTextureAlpha(StringUtils::toAscii(path), texId); +// break; +// } +// cout << "Done." << endl << endl; +// +// return texId; +// + return 0; +} + + + diff --git a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h new file mode 100644 index 00000000000..d49ab9cf008 --- /dev/null +++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h @@ -0,0 +1,23 @@ +#ifndef BLENDERTEXTUREMANAGER_H +#define BLENDERTEXTUREMANAGER_H + +# include "../system/FreestyleConfig.h" +# include "../stroke/StrokeRenderer.h" +# include "../stroke/StrokeRep.h" + +/*! Class to load textures + */ +class LIB_RENDERING_EXPORT BlenderTextureManager : public TextureManager +{ + public: + BlenderTextureManager (); + virtual ~BlenderTextureManager (); +protected: + virtual unsigned loadBrush(string fileName, Stroke::MediumType = Stroke::OPAQUE_MEDIUM); + + protected: + virtual void loadStandardBrushes(); + +}; + +#endif // BLENDERTEXTUREMANAGER_H -- cgit v1.2.3