archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Another mega (literally :p) code clean-up patch by Bastien Montagne, thanks again!

Browse Source
This commit is contained in:
Tamito Kajiyama
2012-12-28 20:21:05 +00:00
parent 9fe9c1d643
commit e5791cf48e
104 changed files with 17403 additions and 15356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
View File

@@ -1,26 +1,41 @@
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* The Original Code is Copyright (C) 2010 Blender Foundation.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): none yet.
*
* ***** END GPL LICENSE BLOCK *****
*/
//
// Copyright (C) : Please refer to the COPYRIGHT file distributed
// with this source distribution.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
///////////////////////////////////////////////////////////////////////////////
/** \file blender/freestyle/intern/stroke/StrokeRenderer.cpp
* \ingroup freestyle
* \brief Classes to render a stroke with OpenGL
* \author Fredo Durand
* \date 09/09/2002
*/
#include "StrokeRenderer.h"
#include "../geometry/GeomUtils.h"
using namespace std;
/**********************************/
@@ -34,18 +49,14 @@ using namespace std;
LIB_STROKE_EXPORT
TextureManager *StrokeRenderer::_textureManager = 0;
StrokeRenderer::StrokeRenderer ()
{
}
StrokeRenderer::StrokeRenderer() {}
StrokeRenderer::~StrokeRenderer ()
{
}
StrokeRenderer::~StrokeRenderer() {}
bool StrokeRenderer::loadTextures()
{
_textureManager->load();
return true;
_textureManager->load();
return true;
}
@@ -67,55 +78,61 @@ string TextureManager::_patterns_path;
LIB_STROKE_EXPORT
string TextureManager::_brushes_path;
TextureManager::TextureManager ()
TextureManager::TextureManager()
{
_hasLoadedTextures=false;
_pInstance = this;
_defaultTextureId = 0;
_hasLoadedTextures = false;
_pInstance = this;
_defaultTextureId = 0;
}
TextureManager::~TextureManager ()
TextureManager::~TextureManager()
{
if(!_brushesMap.empty())
_brushesMap.clear();
_pInstance = 0;
if (!_brushesMap.empty())
_brushesMap.clear();
_pInstance = 0;
}
void TextureManager::load()
{
if(_hasLoadedTextures)
return;
loadStandardBrushes();
_hasLoadedTextures = true;
if (_hasLoadedTextures)
return;
loadStandardBrushes();
_hasLoadedTextures = true;
}
unsigned TextureManager::getBrushTextureIndex(string name, Stroke::MediumType loadingMode)
{
BrushTexture bt(name,loadingMode);
brushesMap::iterator b = _brushesMap.find(bt);
if(b == _brushesMap.end()){
unsigned texId = loadBrush(name, loadingMode);
_brushesMap[bt] = texId;
return texId;
cout << "brush file " << name << " not found" << endl;
return 0;
}else{
return _brushesMap[bt];
}
BrushTexture bt(name,loadingMode);
brushesMap::iterator b = _brushesMap.find(bt);
if (b == _brushesMap.end()) {
unsigned texId = loadBrush(name, loadingMode);
_brushesMap[bt] = texId;
return texId;
// XXX!
cout << "brush file " << name << " not found" << endl;
return 0;
}
else {
return _brushesMap[bt];
}
}
void TextureManager::Options::setPatternsPath(const string& path) {
_patterns_path = path;
void TextureManager::Options::setPatternsPath(const string& path)
{
_patterns_path = path;
}
string TextureManager::Options::getPatternsPath() {
return _patterns_path;
string TextureManager::Options::getPatternsPath()
{
return _patterns_path;
}
void TextureManager::Options::setBrushesPath(const string& path) {
_brushes_path = path;
void TextureManager::Options::setBrushesPath(const string& path)
{
_brushes_path = path;
}
string TextureManager::Options::getBrushesPath() {
return _brushes_path;
string TextureManager::Options::getBrushesPath()
{
return _brushes_path;
}