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

175
source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
View File

@@ -1,92 +1,117 @@
/*
* ***** 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/AdvancedFunctions0D.cpp
* \ingroup freestyle
* \brief Functions taking 0D input
* \author Stephane Grabli
* \author Emmanuel Turquin
* \date 01/07/2003
*/
# include "../view_map/Functions0D.h"
# include "AdvancedFunctions0D.h"
# include "../view_map/SteerableViewMap.h"
# include "Canvas.h"
#include "AdvancedFunctions0D.h"
#include "Canvas.h"
#include "../view_map/Functions0D.h"
#include "../view_map/SteerableViewMap.h"
namespace Functions0D {
int DensityF0D::operator()(Interface0DIterator& iter) {
Canvas* canvas = Canvas::getInstance();
int bound = _filter.getBound();
if( (iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>canvas->width())
|| (iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>canvas->height())) {
result = 0.0;
return 0;
int DensityF0D::operator()(Interface0DIterator& iter)
{
Canvas* canvas = Canvas::getInstance();
int bound = _filter.getBound();
if ((iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>canvas->width()) ||
(iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>canvas->height())) {
result = 0.0;
return 0;
}
RGBImage image;
canvas->readColorPixels((int)iter->getProjectedX() - bound,
(int)iter->getProjectedY() - bound,
_filter.maskSize(),
_filter.maskSize(),
image);
result = _filter.getSmoothedPixel<RGBImage>(&image, (int)iter->getProjectedX(),
(int)iter->getProjectedY());
RGBImage image;
canvas->readColorPixels((int)iter->getProjectedX() - bound, (int)iter->getProjectedY() - bound,
_filter.maskSize(), _filter.maskSize(), image);
result = _filter.getSmoothedPixel<RGBImage>(&image, (int)iter->getProjectedX(), (int)iter->getProjectedY());
return 0;
}
}
int LocalAverageDepthF0D::operator()(Interface0DIterator& iter) {
Canvas * iViewer = Canvas::getInstance();
int bound = _filter.getBound();
if( (iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>iViewer->width())
|| (iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>iViewer->height())) {
result = 0.0;
return 0;
int LocalAverageDepthF0D::operator()(Interface0DIterator& iter)
{
Canvas * iViewer = Canvas::getInstance();
int bound = _filter.getBound();
if ((iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>iViewer->width()) ||
(iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>iViewer->height())) {
result = 0.0;
return 0;
}
GrayImage image ;
iViewer->readDepthPixels((int)iter->getProjectedX()-bound,(int)iter->getProjectedY()-bound,_filter.maskSize(),_filter.maskSize(),image);
result = _filter.getSmoothedPixel(&image, (int)iter->getProjectedX(), (int)iter->getProjectedY());
GrayImage image;
iViewer->readDepthPixels((int)iter->getProjectedX() - bound, (int)iter->getProjectedY()-bound,
_filter.maskSize(), _filter.maskSize(), image);
result = _filter.getSmoothedPixel(&image, (int)iter->getProjectedX(), (int)iter->getProjectedY());
return 0;
}
}
int ReadMapPixelF0D::operator()(Interface0DIterator& iter) {
Canvas * canvas = Canvas::getInstance();
result = canvas->readMapPixel(_mapName, _level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
int ReadMapPixelF0D::operator()(Interface0DIterator& iter)
{
Canvas * canvas = Canvas::getInstance();
result = canvas->readMapPixel(_mapName, _level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
return 0;
}
}
int ReadSteerableViewMapPixelF0D::operator()(Interface0DIterator& iter) {
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
result = svm->readSteerableViewMapPixel(_orientation, _level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
return 0;
}
int ReadSteerableViewMapPixelF0D::operator()(Interface0DIterator& iter)
{
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
result = svm->readSteerableViewMapPixel(_orientation, _level, (int)iter->getProjectedX(),
(int)iter->getProjectedY());
return 0;
}
int ReadCompleteViewMapPixelF0D::operator()(Interface0DIterator& iter) {
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
result = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
return 0;
}
int ReadCompleteViewMapPixelF0D::operator()(Interface0DIterator& iter)
{
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
result = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
return 0;
}
int GetViewMapGradientNormF0D::operator()(Interface0DIterator& iter)
{
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
float pxy = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
float gx = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX() + _step, (int)iter->getProjectedY())
- pxy;
float gy = svm->readCompleteViewMapPixel(_level, (int)iter->getProjectedX(), (int)iter->getProjectedY() + _step)
- pxy;
result = Vec2f(gx, gy).norm();
return 0;
}
int GetViewMapGradientNormF0D::operator()(Interface0DIterator& iter){
SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
float pxy = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
float gx = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX()+_step, (int)iter->getProjectedY())
- pxy;
float gy = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY()+_step)
- pxy;
result = Vec2f(gx,gy).norm();
return 0;
}
} // end of namespace Functions0D