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

Fix for the issue described in the commit log of revision 27846: Made

Browse Source 
the diffuse and Z depth information accessible from style modules when
the border option is enabled.
This commit is contained in:
Tamito Kajiyama
2010-03-30 17:10:52 +00:00
parent 08e022da37
commit fdffaacb8a
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/freestyle/intern/application/AppCanvas.cpp
View File

@@ -69,7 +69,12 @@ int AppCanvas::width() const
int AppCanvas::height() const
{
return _pViewer->height();;
return _pViewer->height();
}
BBox<Vec2i> AppCanvas::border() const
{
return _pViewer->border();
}
BBox<Vec3r> AppCanvas::scene3DBBox() const
@@ -116,18 +121,22 @@ void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) cons
int xsch = width();
int ysch = height();
if (_pass_diffuse.buf) {
int xmin = border().getMin().x();
int ymin = border().getMin().y();
int xmax = border().getMax().x();
int ymax = border().getMax().y();
int rectx = _pass_z.width;
int recty = _pass_z.height;
float xfac = ((float)rectx) / ((float)xsch);
float yfac = ((float)recty) / ((float)ysch);
//printf("readColorPixels %d x %d @ (%d, %d) in %d x %d -- %d x %d @ %d%%\n", w, h, x, y, xsch, ysch, rectx, recty, (int)(xfac * 100.0f));
float xfac = ((float)rectx) / ((float)(xmax - xmin));
float yfac = ((float)recty) / ((float)(ymax - ymin));
//printf("readColorPixels %d x %d @ (%d, %d) in %d x %d [%d x %d] -- %d x %d @ %d%%\n", w, h, x, y, xsch, ysch, xmax - xmin, ymax - ymin, rectx, recty, (int)(xfac * 100.0f));
int ii, jj;
for (int j = 0; j < h; j++) {
jj = (int)((y + j) * yfac);
jj = (int)((y - ymin + j) * yfac);
if (jj < 0 || jj >= recty)
continue;
for (int i = 0; i < w; i++) {
ii = (int)((x + i) * xfac);
ii = (int)((x - xmin + i) * xfac);
if (ii < 0 || ii >= rectx)
continue;
memcpy(rgb + (w * j + i) * 3, _pass_diffuse.buf + (rectx * jj + ii) * 3, sizeof(float) * 3);
@@ -144,18 +153,22 @@ void AppCanvas::readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) con
int xsch = width();
int ysch = height();
if (_pass_z.buf) {
int xmin = border().getMin().x();
int ymin = border().getMin().y();
int xmax = border().getMax().x();
int ymax = border().getMax().y();
int rectx = _pass_z.width;
int recty = _pass_z.height;
float xfac = ((float)rectx) / ((float)xsch);
float yfac = ((float)recty) / ((float)ysch);
//printf("readDepthPixels %d x %d @ (%d, %d) in %d x %d -- %d x %d @ %d%%\n", w, h, x, y, xsch, ysch, rectx, recty, (int)(xfac * 100.0f));
float xfac = ((float)rectx) / ((float)(xmax - xmin));
float yfac = ((float)recty) / ((float)(ymax - ymin));
//printf("readDepthPixels %d x %d @ (%d, %d) in %d x %d [%d x %d] -- %d x %d @ %d%%\n", w, h, x, y, xsch, ysch, xmax - xmin, ymax - ymin, rectx, recty, (int)(xfac * 100.0f));
int ii, jj;
for (int j = 0; j < h; j++) {
jj = (int)((y + j) * yfac);
jj = (int)((y - ymin + j) * yfac);
if (jj < 0 || jj >= recty)
continue;
for (int i = 0; i < w; i++) {
ii = (int)((x + i) * xfac);
ii = (int)((x - xmin + i) * xfac);
if (ii < 0 || ii >= rectx)
continue;
z[w * j + i] = _pass_z.buf[rectx * jj + ii];

1
source/blender/freestyle/intern/application/AppCanvas.h
View File

@@ -40,6 +40,7 @@ public:
/*! accessors */
virtual int width() const ;
virtual int height() const ;
virtual BBox<Vec2i> AppCanvas::border() const ;
AppView *_pViewer;
inline const AppView * viewer() const {return _pViewer;}

5
source/blender/freestyle/intern/application/AppView.h
View File

@@ -29,11 +29,16 @@ public:
//inherited
inline unsigned int width() { return _width; }
inline unsigned int height() { return _height; }
inline BBox<Vec2i> border() { return _border; }
inline void setWidth( unsigned int width ) { _width = width; }
inline void setHeight( unsigned int height ) { _height = height; }
inline void setBorder( int xmin, int ymin, int xmax, int ymax ) {
_border = BBox<Vec2i>(Vec2i(xmin, ymin), Vec2i(xmax, ymax));
}
protected:
unsigned int _width, _height;
BBox<Vec2i> _border;
public:

11
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
View File

@@ -84,6 +84,10 @@ extern "C" {
float ycor = ((float)re->r.yasp) / ((float)re->r.xasp);
int width = re->r.xsch;
int height = (int)(((float)re->r.ysch) * ycor);
int xmin = re->r.border.xmin * width;
int xmax = re->r.border.xmax * width;
int ymin = re->r.border.ymin * height;
int ymax = re->r.border.ymax * height;
freestyle_viewport[0] = freestyle_viewport[1] = 0;
freestyle_viewport[2] = width;
@@ -91,6 +95,13 @@ extern "C" {
view->setWidth( width );
view->setHeight( height );
view->setBorder( xmin, ymin, xmax, ymax );
cout << "\n=== Dimensions of the 2D image coordinate system ===" << endl;
cout << "Width : " << width << endl;
cout << "Height : " << height << endl;
if (re->r.mode & R_BORDER)
cout << "Border : (" << xmin << ", " << ymin << ") - (" << xmax << ", " << ymax << ")" << endl;
}
void init_camera(Render* re){