Revision: 47996
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47996
Author: campbellbarton
Date: 2012-06-16 16:57:16 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/render/intern/source/initrender.c
trunk/blender/source/blender/render/intern/source/pixelblending.c
Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c
2012-06-16 16:50:23 UTC (rev 47995)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c
2012-06-16 16:57:16 UTC (rev 47996)
@@ -64,15 +64,17 @@
NULL, NULL,
"BLENDER_RENDER", N_("Blender Render"), RE_INTERNAL,
NULL, NULL, NULL, NULL,
- {NULL, NULL, NULL}};
+ {NULL, NULL, NULL}
+};
#ifdef WITH_GAMEENGINE
static RenderEngineType internal_game_type = {
NULL, NULL,
- "BLENDER_GAME", N_("Blender Game"), RE_INTERNAL|RE_GAME,
+ "BLENDER_GAME", N_("Blender Game"), RE_INTERNAL | RE_GAME,
NULL, NULL, NULL, NULL,
- {NULL, NULL, NULL}};
+ {NULL, NULL, NULL}
+};
#endif
@@ -90,8 +92,8 @@
{
RenderEngineType *type, *next;
- for (type=R_engines.first; type; type=next) {
- next= type->next;
+ for (type = R_engines.first; type; type = next) {
+ next = type->next;
BLI_remlink(&R_engines, type);
@@ -108,16 +110,16 @@
{
RenderEngineType *type;
- type= BLI_findstring(&R_engines, idname, offsetof(RenderEngineType,
idname));
+ type = BLI_findstring(&R_engines, idname, offsetof(RenderEngineType,
idname));
if (!type)
- type= &internal_render_type;
+ type = &internal_render_type;
return type;
}
int RE_engine_is_external(Render *re)
{
- RenderEngineType *type= RE_engines_find(re->r.engine);
+ RenderEngineType *type = RE_engines_find(re->r.engine);
return (type && type->render);
}
@@ -126,7 +128,7 @@
RenderEngine *RE_engine_create(RenderEngineType *type)
{
RenderEngine *engine = MEM_callocN(sizeof(RenderEngine),
"RenderEngine");
- engine->type= type;
+ engine->type = type;
return engine;
}
@@ -149,7 +151,7 @@
RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y, int
w, int h)
{
- Render *re= engine->re;
+ Render *re = engine->re;
RenderResult *result;
rcti disprect;
@@ -160,17 +162,17 @@
CLAMP(h, 0, re->result->recty);
if (x + w > re->result->rectx)
- w= re->result->rectx - x;
+ w = re->result->rectx - x;
if (y + h > re->result->recty)
- h= re->result->recty - y;
+ h = re->result->recty - y;
/* allocate a render result */
disprect.xmin = x;
- disprect.xmax = x+w;
+ disprect.xmax = x + w;
disprect.ymin = y;
- disprect.ymax = y+h;
+ disprect.ymax = y + h;
- result= render_result_new(re, &disprect, 0, RR_USE_MEM);
+ result = render_result_new(re, &disprect, 0, RR_USE_MEM);
BLI_addtail(&engine->fullresult, result);
result->tilerect.xmin += re->disprect.xmin;
@@ -183,17 +185,17 @@
void RE_engine_update_result(RenderEngine *engine, RenderResult *result)
{
- Render *re= engine->re;
+ Render *re = engine->re;
if (result) {
- result->renlay= result->layers.first; // weak, draws first
layer always
+ result->renlay = result->layers.first; // weak, draws first
layer always
re->display_draw(re->ddh, result, NULL);
}
}
void RE_engine_end_result(RenderEngine *engine, RenderResult *result)
{
- Render *re= engine->re;
+ Render *re = engine->re;
if (!result)
return;
@@ -204,7 +206,7 @@
/* draw */
if (!re->test_break(re->tbh)) {
- result->renlay= result->layers.first; // weak, draws first
layer always
+ result->renlay = result->layers.first; // weak, draws first
layer always
re->display_draw(re->ddh, result, NULL);
}
@@ -216,7 +218,7 @@
int RE_engine_test_break(RenderEngine *engine)
{
- Render *re= engine->re;
+ Render *re = engine->re;
if (re)
return re->test_break(re->tbh);
@@ -228,34 +230,34 @@
void RE_engine_update_stats(RenderEngine *engine, const char *stats, const
char *info)
{
- Render *re= engine->re;
+ Render *re = engine->re;
/* stats draw callback */
if (re) {
- re->i.statstr= stats;
- re->i.infostr= info;
+ re->i.statstr = stats;
+ re->i.infostr = info;
re->stats_draw(re->sdh, &re->i);
- re->i.infostr= NULL;
- re->i.statstr= NULL;
+ re->i.infostr = NULL;
+ re->i.statstr = NULL;
}
/* set engine text */
if (engine->text) {
MEM_freeN(engine->text);
- engine->text= NULL;
+ engine->text = NULL;
}
if (stats && stats[0] && info && info[0])
- engine->text= BLI_sprintfN("%s | %s", stats, info);
+ engine->text = BLI_sprintfN("%s | %s", stats, info);
else if (info && info[0])
- engine->text= BLI_strdup(info);
+ engine->text = BLI_strdup(info);
else if (stats && stats[0])
- engine->text= BLI_strdup(stats);
+ engine->text = BLI_strdup(stats);
}
void RE_engine_update_progress(RenderEngine *engine, float progress)
{
- Render *re= engine->re;
+ Render *re = engine->re;
if (re) {
CLAMP(progress, 0.0f, 1.0f);
@@ -272,7 +274,7 @@
int RE_engine_render(Render *re, int do_all)
{
- RenderEngineType *type= RE_engines_find(re->r.engine);
+ RenderEngineType *type = RE_engines_find(re->r.engine);
RenderEngine *engine;
/* verify if we can render */
@@ -287,24 +289,24 @@
/* create render result */
BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
- if (re->result==NULL || !(re->r.scemode & R_PREVIEWBUTS)) {
+ if (re->result == NULL || !(re->r.scemode & R_PREVIEWBUTS)) {
if (re->result)
render_result_free(re->result);
- re->result= render_result_new(re, &re->disprect, 0, 0);
+ re->result = render_result_new(re, &re->disprect, 0, 0);
}
BLI_rw_mutex_unlock(&re->resultmutex);
- if (re->result==NULL)
+ if (re->result == NULL)
return 1;
/* set render info */
- re->i.cfra= re->scene->r.cfra;
- BLI_strncpy(re->i.scenename, re->scene->id.name+2,
sizeof(re->i.scenename));
-
re->i.totface=re->i.totvert=re->i.totstrand=re->i.totlamp=re->i.tothalo= 0;
+ re->i.cfra = re->scene->r.cfra;
+ BLI_strncpy(re->i.scenename, re->scene->id.name + 2,
sizeof(re->i.scenename));
+ re->i.totface = re->i.totvert = re->i.totstrand = re->i.totlamp =
re->i.tothalo = 0;
/* render */
engine = RE_engine_create(type);
- engine->re= re;
+ engine->re = re;
if (re->flag & R_ANIMATION)
engine->flag |= RE_ENGINE_ANIMATION;
@@ -312,7 +314,7 @@
engine->flag |= RE_ENGINE_PREVIEW;
engine->camera_override = re->camera_override;
- if ((re->r.scemode & (R_NO_FRAME_UPDATE|R_PREVIEWBUTS))==0)
+ if ((re->r.scemode & (R_NO_FRAME_UPDATE | R_PREVIEWBUTS)) == 0)
BKE_scene_update_for_newframe(re->main, re->scene, re->lay);
if (type->update)
Modified: trunk/blender/source/blender/render/intern/source/initrender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/initrender.c
2012-06-16 16:50:23 UTC (rev 47995)
+++ trunk/blender/source/blender/render/intern/source/initrender.c
2012-06-16 16:57:16 UTC (rev 47996)
@@ -87,12 +87,12 @@
static void init_render_jit(Render *re)
{
- static float jit[32][2]; /* simple caching */
- static float mblur_jit[32][2]; /* simple caching */
- static int lastjit= 0;
- static int last_mblur_jit= 0;
+ static float jit[32][2]; /* simple caching */
+ static float mblur_jit[32][2]; /* simple caching */
+ static int lastjit = 0;
+ static int last_mblur_jit = 0;
- if (lastjit!=re->r.osa || last_mblur_jit != re->r.mblur_samples) {
+ if (lastjit != re->r.osa || last_mblur_jit != re->r.mblur_samples) {
memset(jit, 0, sizeof(jit));
BLI_jitter_init(jit[0], re->r.osa);
@@ -100,10 +100,10 @@
BLI_jitter_init(mblur_jit[0], re->r.mblur_samples);
}
- lastjit= re->r.osa;
+ lastjit = re->r.osa;
memcpy(re->jit, jit, sizeof(jit));
- last_mblur_jit= re->r.mblur_samples;
+ last_mblur_jit = re->r.mblur_samples;
memcpy(re->mblur_jit, mblur_jit, sizeof(mblur_jit));
}
@@ -113,135 +113,135 @@
static float filt_quadratic(float x)
{
if (x < 0.0f) x = -x;
- if (x < 0.5f) return 0.75f-(x*x);
- if (x < 1.5f) return 0.50f*(x-1.5f)*(x-1.5f);
+ if (x < 0.5f) return 0.75f - (x * x);
+ if (x < 1.5f) return 0.50f * (x - 1.5f) * (x - 1.5f);
return 0.0f;
}
static float filt_cubic(float x)
{
- float x2= x*x;
+ float x2 = x * x;
if (x < 0.0f) x = -x;
- if (x < 1.0f) return 0.5f*x*x2 - x2 + 2.0f/3.0f;
- if (x < 2.0f) return (2.0f-x)*(2.0f-x)*(2.0f-x)/6.0f;
+ if (x < 1.0f) return 0.5f * x * x2 - x2 + 2.0f / 3.0f;
+ if (x < 2.0f) return (2.0f - x) * (2.0f - x) * (2.0f - x) / 6.0f;
return 0.0f;
}
static float filt_catrom(float x)
{
- float x2= x*x;
+ float x2 = x * x;
if (x < 0.0f) x = -x;
- if (x < 1.0f) return 1.5f*x2*x - 2.5f*x2 + 1.0f;
- if (x < 2.0f) return -0.5f*x2*x + 2.5f*x2 - 4.0f*x + 2.0f;
+ if (x < 1.0f) return 1.5f * x2 * x - 2.5f * x2 + 1.0f;
+ if (x < 2.0f) return -0.5f * x2 * x + 2.5f * x2 - 4.0f * x + 2.0f;
return 0.0f;
}
-static float filt_mitchell(float x) /* Mitchell & Netravali's two-param
cubic */
+static float filt_mitchell(float x) /* Mitchell & Netravali's two-param cubic
*/
{
- float b = 1.0f/3.0f, c = 1.0f/3.0f;
- float p0 = ( 6.0f - 2.0f*b ) / 6.0f;
- float p2 = (-18.0f + 12.0f*b + 6.0f*c) / 6.0f;
- float p3 = ( 12.0f - 9.0f*b - 6.0f*c) / 6.0f;
- float q0 = ( 8.0f*b + 24.0f*c) / 6.0f;
- float q1 = ( - 12.0f *b - 48.0f*c) / 6.0f;
- float q2 = ( 6.0f *b + 30.0f*c) / 6.0f;
- float q3 = ( - b - 6.0f*c) / 6.0f;
+ float b = 1.0f / 3.0f, c = 1.0f / 3.0f;
+ float p0 = ( 6.0f - 2.0f * b) / 6.0f;
+ float p2 = (-18.0f + 12.0f * b + 6.0f * c) / 6.0f;
+ float p3 = ( 12.0f - 9.0f * b - 6.0f * c) / 6.0f;
+ float q0 = ( 8.0f * b + 24.0f * c) / 6.0f;
+ float q1 = ( -12.0f * b - 48.0f * c) / 6.0f;
+ float q2 = ( 6.0f * b + 30.0f * c) / 6.0f;
+ float q3 = ( -b - 6.0f * c) / 6.0f;
- if (x<-2.0f) return 0.0f;
- if (x<-1.0f) return (q0-x*(q1-x*(q2-x*q3)));
- if (x< 0.0f) return (p0+x*x*(p2-x*p3));
- if (x< 1.0f) return (p0+x*x*(p2+x*p3));
- if (x< 2.0f) return (q0+x*(q1+x*(q2+x*q3)));
+ if (x < -2.0f) return 0.0f;
+ if (x < -1.0f) return (q0 - x * (q1 - x * (q2 - x * q3)));
+ if (x < 0.0f) return (p0 + x * x * (p2 - x * p3));
+ if (x < 1.0f) return (p0 + x * x * (p2 + x * p3));
+ if (x < 2.0f) return (q0 + x * (q1 + x * (q2 + x * q3)));
return 0.0f;
}
/* x ranges from -1 to 1 */
float RE_filter_value(int type, float x)
{
- float gaussfac= 1.6f;
+ float gaussfac = 1.6f;
- x= ABS(x);
+ x = ABS(x);
switch (type) {
case R_FILTER_BOX:
- if (x>1.0f) return 0.0f;
+ if (x > 1.0f) return 0.0f;
return 1.0f;
case R_FILTER_TENT:
- if (x>1.0f) return 0.0f;
- return 1.0f-x;
+ if (x > 1.0f) return 0.0f;
+ return 1.0f - x;
case R_FILTER_GAUSS:
- x*= gaussfac;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
