mirror-github-bspeice/cuburn
1
0
Fork 0
mirror of https://github.com/stevenrobertson/cuburn.git synced 2025-02-05 11:40:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final xform color *is* used after all

Browse Source
This commit is contained in:
Steven Robertson 2011-10-27 08:46:55 -04:00
parent f650844cb9
commit 7c84c6a7a9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cuburn/code/iter.py
View File

@ -231,10 +231,8 @@ void apply_xf_{{xfid}}(float &ox, float &oy, float &color, mwc_st &rctx) {
{{apply_affine('tx', 'ty', 'ox', 'oy', px.post)}} {{apply_affine('tx', 'ty', 'ox', 'oy', px.post)}}
{{endif}} {{endif}}
{{if 'color' in xform}}
float csp = {{px.color_speed}}; float csp = {{px.color_speed}};
color = color * (1.0f - csp) + {{px.color}} * csp; color = color * (1.0f - csp) + {{px.color}} * csp;
{{endif}}
}; };
""") """)
g = dict(globals()) g = dict(globals())
@ -354,18 +352,20 @@ void iter(uint64_t accbuf_ptr, mwc_st *msts, iter_params *all_params,
if (threadIdx.x == 0) atomicSub(&nsamps, remain); if (threadIdx.x == 0) atomicSub(&nsamps, remain);
{{if 'final' in cp.xforms}} {{if 'final' in cp.xforms}}
float fx = x, fy = y, fcolor; float fx = x, fy = y, fcolor = color;
apply_xf_final(fx, fy, fcolor, rctx); apply_xf_final(fx, fy, fcolor, rctx);
{{endif}} {{endif}}
float cx, cy; float cx, cy, cc;
{{precalc_camera(info, pcp.camera)}} {{precalc_camera(info, pcp.camera)}}
{{if 'final' in cp.xforms}} {{if 'final' in cp.xforms}}
{{apply_affine('fx', 'fy', 'cx', 'cy', pcp.camera)}} {{apply_affine('fx', 'fy', 'cx', 'cy', pcp.camera)}}
cc = fcolor;
{{else}} {{else}}
{{apply_affine('x', 'y', 'cx', 'cy', pcp.camera)}} {{apply_affine('x', 'y', 'cx', 'cy', pcp.camera)}}
cc = color;
{{endif}} {{endif}}
uint32_t ix = trunca(cx), iy = trunca(cy); uint32_t ix = trunca(cx), iy = trunca(cy);
@ -383,8 +383,7 @@ void iter(uint64_t accbuf_ptr, mwc_st *msts, iter_params *all_params,
uint32_t i = iy * {{info.acc_stride}} + ix; uint32_t i = iy * {{info.acc_stride}} + ix;
float4 outcol = tex2D(palTex, cc, time_frac);
float4 outcol = tex2D(palTex, color, time_frac);
update_pix(accbuf_ptr, i, outcol); update_pix(accbuf_ptr, i, outcol);
} }
msts[gtid()] = rctx; msts[gtid()] = rctx;