diff options
author | Matt Ebb <matt@mke3.net> | 2007-09-07 07:48:50 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2007-09-07 07:48:50 +0400 |
commit | 0ba5295404dd1c2ee04a9e7823eafc664562f4eb (patch) | |
tree | 816891a80322ecc06a5016cfb1e8ef4abba9f0ba /source/blender/blenloader/intern | |
parent | f85cd06873a991fec91766ea8cd5efe3eda17594 (diff) |
* QMC Raytracing
This introduces QMC sampling for use in glossy reflections/refractions, soft raytraced shadows, and ambient occlusion.
This work includes many new features and speed-ups, so check out the nice docs here:
Glossy Reflection/Refraction
http://www.blender.org/development/current-projects/changes-since-244/glossy-reflectionrefraction/
Raytraced Soft Shadows
http://www.blender.org/development/current-projects/changes-since-244/raytraced-soft-shadows/
QMC Sampling
http://www.blender.org/development/current-projects/changes-since-244/qmc-sampling/
Many thanks to Brecht van Lommel for some initial code snippets and for reviewing the patch, and especially to Alfredo de Greef who gave me a lot of guidance and help along the way!
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 1f1dd84f49c..6c7750b5741 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6562,9 +6562,12 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } if(main->versionfile <= 244) { Scene *sce; + Material *ma; bScreen *sc; Object *ob; - + Lamp *la; + World *wrld; + if(main->versionfile != 244 || main->subversionfile < 2) { Mesh *me; @@ -6588,7 +6591,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } - + /* correct older action editors - incorrect scrolling */ for(sc= main->screen.first; sc; sc= sc->id.next) { ScrArea *sa; @@ -6692,6 +6695,33 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } } + + for(ma=main->mat.first; ma; ma= ma->id.next) { + ma->gloss_mir = ma->gloss_tra= 1.0; + ma->aniso_gloss_mir = 1.0; + ma->samp_gloss_mir = ma->samp_gloss_tra= 18; + ma->adapt_thresh_mir = ma->adapt_thresh_tra = 0.005; + ma->dist_mir = 0.0; + ma->fadeto_mir = MA_RAYMIR_FADETOSKY; + } + + for(wrld=main->world.first; wrld; wrld= wrld->id.next) { + if (wrld->mode & WO_AMB_OCC) + wrld->ao_samp_method = WO_AOSAMP_CONSTANT; + else + wrld->ao_samp_method = WO_AOSAMP_HAMMERSLEY; + + wrld->ao_adapt_thresh = 0.005; + } + + for(la=main->lamp.first; la; la= la->id.next) { + if (la->type == LA_AREA) + la->ray_samp_method = LA_SAMP_CONSTANT; + else + la->ray_samp_method = LA_SAMP_HALTON; + + la->adapt_thresh = 0.001; + } } } |