diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-04-09 19:46:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-09 19:46:26 +0400 |
commit | 235f793f28bebf1fdfbc94bf8fc2f0c3ac727c49 (patch) | |
tree | 6d13b9fed2ab2785a2ade7988a25755374a92c81 /source/blender/python | |
parent | 9f6080cf1b12c1db36cc6c6001bb0a9404a07771 (diff) |
Made aspx/y into floats so we can render precise regions (for apricot terrain baking)
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/api2_2x/sceneRender.c | 74 |
1 files changed, 36 insertions, 38 deletions
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c index b12ee85fe2b..5f81ea27176 100644 --- a/source/blender/python/api2_2x/sceneRender.c +++ b/source/blender/python/api2_2x/sceneRender.c @@ -919,6 +919,18 @@ PyObject *RenderData_GaussFilterSize( BPy_RenderData * self, PyObject * args ) 0.5f, 1.5f ); } +PyObject *RenderData_AspectRatioX( BPy_RenderData * self, PyObject * args ) +{ + return M_Render_GetSetAttributeFloat( args, &self->renderContext->xasp, + 1.0f, 200.0f ); +} + +PyObject *RenderData_AspectRatioY( BPy_RenderData * self, PyObject * args ) +{ + return M_Render_GetSetAttributeFloat( args, &self->renderContext->yasp, + 1.0f, 200.0f ); +} + PyObject *RenderData_StartFrame( BPy_RenderData * self, PyObject * args ) { return M_Render_GetSetAttributeInt( args, &self->renderContext->sfra, @@ -949,18 +961,6 @@ PyObject *RenderData_ImageSizeY( BPy_RenderData * self, PyObject * args ) 4, 10000 ); } -PyObject *RenderData_AspectRatioX( BPy_RenderData * self, PyObject * args ) -{ - return M_Render_GetSetAttributeShort( args, &self->renderContext->xasp, - 1, 200 ); -} - -PyObject *RenderData_AspectRatioY( BPy_RenderData * self, PyObject * args ) -{ - return M_Render_GetSetAttributeShort( args, &self->renderContext->yasp, - 1, 200 ); -} - static int RenderData_setRenderer( BPy_RenderData * self, PyObject * value ) { int type; @@ -1868,6 +1868,12 @@ static PyObject *RenderData_getFloatAttr( BPy_RenderData *self, void *type ) case EXPP_RENDER_ATTR_BAKEBIAS: param = self->renderContext->bake_biasdist; break; + case EXPP_RENDER_ATTR_ASPECTX: + param = (long)self->renderContext->xasp; + break; + case EXPP_RENDER_ATTR_ASPECTY: + param = (long)self->renderContext->yasp; + break; default: return EXPP_ReturnPyObjError( PyExc_RuntimeError, "undefined type constant in RenderData_getFloatAttr" ); @@ -1911,6 +1917,16 @@ static int RenderData_setFloatAttrClamp( BPy_RenderData *self, PyObject *value, max = 1000.0f; param = &self->renderContext->bake_biasdist; break; + case EXPP_RENDER_ATTR_ASPECTX: + min = 1.0f; + max = 200.0f; + param = &self->renderContext->xasp; + break; + case EXPP_RENDER_ATTR_ASPECTY: + min = 1.0f; + max = 200.0f; + param = &self->renderContext->yasp; + break; default: return EXPP_ReturnIntError( PyExc_RuntimeError, "undefined type constant in RenderData_setFloatAttrClamp" ); @@ -1933,12 +1949,6 @@ static PyObject *RenderData_getIValueAttr( BPy_RenderData *self, void *type ) case EXPP_RENDER_ATTR_YPARTS: param = (long)self->renderContext->yparts; break; - case EXPP_RENDER_ATTR_ASPECTX: - param = (long)self->renderContext->xasp; - break; - case EXPP_RENDER_ATTR_ASPECTY: - param = (long)self->renderContext->yasp; - break; case EXPP_RENDER_ATTR_CFRAME: param = (long)self->renderContext->cfra; break; @@ -1996,18 +2006,6 @@ static int RenderData_setIValueAttrClamp( BPy_RenderData *self, PyObject *value, size = 'h'; param = &self->renderContext->yparts; break; - case EXPP_RENDER_ATTR_ASPECTX: - min = 1; - max = 200; - size = 'h'; - param = &self->renderContext->xasp; - break; - case EXPP_RENDER_ATTR_ASPECTY: - min = 1; - max = 200; - size = 'h'; - param = &self->renderContext->yasp; - break; case EXPP_RENDER_ATTR_CFRAME: min = 1; max = MAXFRAME; @@ -2726,14 +2724,6 @@ static PyGetSetDef BPy_RenderData_getseters[] = { (getter)RenderData_getIValueAttr, (setter)RenderData_setIValueAttrClamp, "Number of vertical parts for image render", (void *)EXPP_RENDER_ATTR_YPARTS}, - {"aspectX", - (getter)RenderData_getIValueAttr, (setter)RenderData_setIValueAttrClamp, - "Horizontal aspect ratio", - (void *)EXPP_RENDER_ATTR_ASPECTX}, - {"aspectY", - (getter)RenderData_getIValueAttr, (setter)RenderData_setIValueAttrClamp, - "Vertical aspect ratio", - (void *)EXPP_RENDER_ATTR_ASPECTY}, {"cFrame", (getter)RenderData_getIValueAttr, (setter)RenderData_setIValueAttrClamp, "The current frame for rendering", @@ -2771,6 +2761,14 @@ static PyGetSetDef BPy_RenderData_getseters[] = { (getter)RenderData_getFloatAttr, (setter)RenderData_setFloatAttrClamp, "Motion blur factor", (void *)EXPP_RENDER_ATTR_MBLURFACTOR}, + {"aspectX", + (getter)RenderData_getFloatAttr, (setter)RenderData_setFloatAttrClamp, + "Horizontal aspect ratio", + (void *)EXPP_RENDER_ATTR_ASPECTX}, + {"aspectY", + (getter)RenderData_getFloatAttr, (setter)RenderData_setFloatAttrClamp, + "Vertical aspect ratio", + (void *)EXPP_RENDER_ATTR_ASPECTY}, {"mapOld", (getter)RenderData_getMapOld, (setter)RenderData_setMapOld, "Number of frames the Map Old will last", |