/[libvob]/libvob/vob/fillet/light3d.py
ViewVC logotype

Diff of /libvob/vob/fillet/light3d.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.33 by tjl, Sat Aug 9 14:39:45 2003 UTC revision 1.34 by jvk, Wed Aug 13 13:36:21 2003 UTC
# Line 85  void main( Line 85  void main(
85      float4 pos: POSITION,      float4 pos: POSITION,
86      float3 norm: NORMAL,      float3 norm: NORMAL,
87      float4 tex0: TEXCOORD0,      float4 tex0: TEXCOORD0,
88        float4 col: COLOR,
89      out float4 opos: POSITION,      out float4 opos: POSITION,
90      out float4 col: COLOR,      out float4 ocol: COLOR,
91      out float4 otex0: TEXCOORD0      out float4 otex0: TEXCOORD0
92  ) {  ) {
93      opos = mul(glstate.matrix.mvp, pos);      opos = mul(glstate.matrix.mvp, pos);
# Line 112  void main( Line 113  void main(
113      float4 lighting = lit(diffuse, specular, 10);      float4 lighting = lit(diffuse, specular, 10);
114    
115    
116      col.rgb = lighting.y * diffusemat + lighting.z * specularmat      ocol.rgb = lighting.y * diffusemat + lighting.z * specularmat
117                + max(diffuse2, 0) * diffusemat2;                + max(diffuse2, 0) * diffusemat2
118                  ;//+ max(-normvec.z, 0) * col;
119      // Fog      // Fog
120      // float t = 8*mul(glstate.matrix.mvp, pos).z;      // float t = 8*mul(glstate.matrix.mvp, pos).z;
121      // col.rgb = col.rgb * (1 - t) + float3(1,.5,.2) * t;      // ocol.rgb = ocol.rgb * (1 - t) + float3(1,.5,.2) * t;
122      col.a = 1;      ocol.a = 1;
123    
124      otex0 = tex0 * float4(20, 20, 0, 1);      otex0 = tex0 * float4(20, 20, 0, 1);
125  }  }
# Line 299  def drawFillets(self, vs, pc): Line 301  def drawFillets(self, vs, pc):
301                                      128 * self.sectors),                                      128 * self.sectors),
302              2)              2)
303    
304          conns3d = GLRen.createIterConnections(          f3d = GLRen.createFillet3D(border, self.dice, 1);
305              GLRen.createFillet3D(border, self.dice, 1),  
306              2)          conns3d = GLRen.createIterConnections(f3d, f3d, 2);
307    
308          conns3dblend = GLRen.createFillet3DBlend(self.dice, self.dicelen, self.tblsize, self.mode);          conns3dblend = GLRen.createFillet3DBlend(self.dice, self.dicelen, self.tblsize, self.mode);
309    

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26