← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/render/intern/source/pixelshading.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/source/pixelshading.c
379
379
        ringf*= dist;
380
380
        linef*= alpha;
381
381
        
382
 
        /* The colour is either the rgb spec-ed by the user, or extracted from   */
 
382
        /* The color is either the rgb spec-ed by the user, or extracted from   */
383
383
        /* the texture                                                           */
384
384
        if(har->tex) {
385
385
                col[0]= har->r; 
483
483
        zen[0]= R.wrld.zenr; zen[1]= R.wrld.zeng; zen[2]= R.wrld.zenb;
484
484
        
485
485
        /* Careful: SKYTEX and SKYBLEND are NOT mutually exclusive! If           */
486
 
        /* SKYBLEND is active, the texture and colour blend are added.           */
 
486
        /* SKYBLEND is active, the texture and color blend are added.           */
487
487
        if(R.wrld.skytype & WO_SKYTEX) {
488
488
                VECCOPY(lo, view);
489
489
                if(R.wrld.skytype & WO_SKYREAL) {
513
513
}
514
514
 
515
515
/*
516
 
  Stuff the sky colour into the collector.
 
516
  Stuff the sky color into the collector.
517
517
 */
518
518
void shadeSkyPixel(float *collector, float fx, float fy) 
519
519
{
522
522
        /*
523
523
          The rules for sky:
524
524
          1. Draw an image, if a background image was provided. Stop
525
 
          2. get texture and colour blend, and combine these.
 
525
          2. get texture and color blend, and combine these.
526
526
        */
527
527
 
528
528
        float fac;
553
553
                }
554
554
                else {
555
555
                        calc_view_vector(view, fx, fy);
556
 
                        fac= Normalise(view);
 
556
                        fac= Normalize(view);
557
557
                        
558
558
                        if(R.wrld.skytype & WO_SKYTEX) {
559
559
                                dxyview[0]= -R.viewdx/fac;
561
561
                        }
562
562
                }
563
563
                
564
 
                /* get sky colour in the collector */
 
564
                /* get sky color in the collector */
565
565
                shadeSkyView(collector, NULL, view, dxyview);
566
566
                collector[3] = 0.0f;
567
567
        }