Changeset 383

Show
Ignore:
Timestamp:
04/11/07 02:55:50 (1 year ago)
Author:
hagedorn
Message:

adjusted params to make generators look better for demo

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/LaserLine_2.0/Src/Sequencing/Generators/LZ3DTorus.m

    r362 r383  
    3232                w = 25; 
    3333                 
    34                 xs = 10/35.; 
    35                 ys = 31/35.; 
    36                 zs = 27/35.; 
     34                xs = 3/35.; 
     35                ys = 5/35.; 
     36                zs = 4/35.; 
    3737        } 
    3838        return self; 
  • trunk/LaserLine_2.0/Src/Sequencing/Generators/LZSinewave.m

    r369 r383  
    1717  if(self) 
    1818        { 
    19         freq_x = 9
    20         freq_y = 8
     19        freq_x = 8
     20        freq_y = 9
    2121        } 
    2222  return self; 
  • trunk/LaserLine_2.0/Src/Sequencing/Generators/LZSpirograph.m

    r362 r383  
    1717  if(self) 
    1818        { 
    19         r = 70; 
    20     R = 150; 
     19        r = 70;//70 
     20    R = 160; 
    2121    d = 220; 
    2222        } 
     
    2727- (RawFrame)renderAtPosition:(float)position 
    2828  { 
    29   unsigned pointCount = 1000; 
     29  unsigned pointCount = 800; 
    3030  RawPoint *points = malloc(sizeof(RawPoint)*pointCount); 
    3131  RawFrame frame = {points, pointCount}; 
     
    3636  for(i = 0; i < pointCount; i++) 
    3737        { 
    38         float t_p = (i/((float)pointCount-1))*2*3.14159*10+t; 
     38        float t_p = (i/((float)pointCount-1))*2*3.1415926535*10+t; 
    3939         
    4040        points[i].x = ((R+r)*cos(t_p) - (d)*cos((R+r)/r*(t_p)))/(R+r+d)*32767; 
     
    4747        points[i].r = points[i].g = points[i].b = 0xFF; 
    4848        } 
    49    
    50   points[pointCount-1].r = points[pointCount-1].g = points[pointCount-1].b = 0; 
     49 
     50  points[pointCount-1].r = points[pointCount-1].g = points[pointCount-1].b = 0x00; 
    5151   
    5252  return frame;