jrman-commit Mailing List for jrMan (Page 29)

Status: Alpha

Brought to you by: edivargas, egarduno, magoghm

jrman-commit — CVS commits

You can subscribe to this list here.

2003	_Jan	_Feb	_Mar	_Apr (116)	_May (220)	_Jun (52)	_Jul (30)	_Aug (35)	_Sep (24)	_Oct (49)	_Nov (44)	_Dec (70)
2004	_Jan (21)	_Feb (30)	_Mar (9)	_Apr (44)	_May (2)	_Jun	_Jul (10)	_Aug (20)	_Sep (25)	_Oct (12)	_Nov (16)	_Dec (4)
2005	_Jan	_Feb	_Mar	_Apr	_May	_Jun (4)	_Jul (25)	_Aug	_Sep	_Oct	_Nov (26)	_Dec (10)
2006	_Jan (5)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec (33)
2007	_Jan (4)	_Feb (57)	_Mar (17)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 27 28 29 30 31 .. 41 > >> (Page 29 of 41)

[Jrman-commit] drafts/src/org/jrman/primitive Primitive.java,1.15,1.16

From: <ma...@us...> - 2003-05-29 22:45:16

Update of /cvsroot/jrman/drafts/src/org/jrman/primitive
In directory sc8-pr-cvs1:/tmp/cvs-serv13159/src/org/jrman/primitive

Modified Files:
	Primitive.java 
Log Message:
Small corrections to ribs.
Added shader language source.
Fixed displacement bug.


Index: Primitive.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Primitive.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Primitive.java	22 May 2003 07:36:26 -0000	1.15
--- Primitive.java	29 May 2003 22:45:12 -0000	1.16
***************
*** 57,60 ****
--- 57,62 ----
      protected Bounds2f rasterBounds;
  
+     protected float screenDisplacement;
+ 
      protected float distance;
  
***************
*** 82,85 ****
--- 84,99 ----
      }
  
+     public Bounds2f getRasterBounds() {
+         return rasterBounds;
+     }
+ 
+     public void setScreenDisplacement(float sd) {
+         screenDisplacement = sd;
+     }
+ 
+     public float getScreenDisplacement() {
+         return screenDisplacement;
+     }
+ 
      public void setDistance(float f) {
          distance = f;
***************
*** 90,97 ****
      }
  
-     public Bounds2f getRasterBounds() {
-         return rasterBounds;
-     }
- 
      public int compareTo(Object other) {
          Primitive op = (Primitive) other;
--- 104,107 ----
***************
*** 481,486 ****
  
      public boolean isReadyToBeDiced(int gridSize) {
!         float width = rasterBounds.getWidth();
!         float height = rasterBounds.getHeight();
          boolean ready = width * height <= gridSize * attributes.getShadingRate();
          if (!ready)
--- 491,496 ----
  
      public boolean isReadyToBeDiced(int gridSize) {
!         float width = rasterBounds.getWidth() - screenDisplacement * 2;
!         float height = rasterBounds.getHeight() - screenDisplacement * 2;
          boolean ready = width * height <= gridSize * attributes.getShadingRate();
          if (!ready)

[Jrman-commit] drafts/sampleData bumptest.sl,NONE,1.1 glow.sl,NONE,1.1 randomcolors.sl,NONE,1.1 DinningRoom.rib,1.1,1.2 capsules.rib,1.9,1.10 elephant.rib,1.5,1.6 shaderTest.rib,1.8,1.9

From: <ma...@us...> - 2003-05-29 22:45:16

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1:/tmp/cvs-serv13159/sampleData

Modified Files:
	DinningRoom.rib capsules.rib elephant.rib shaderTest.rib 
Added Files:
	bumptest.sl glow.sl randomcolors.sl 
Log Message:
Small corrections to ribs.
Added shader language source.
Fixed displacement bug.


--- NEW FILE: bumptest.sl ---
displacement
bumptest()
{
    point P2 = transform("object", P);
    vector Nn = vtransform("object", N);
    float amp = cos(xcomp(P2) * 23) + 
                cos(ycomp(P2) * 31) + 
		cos(zcomp(P2) * 37);
    amp *= .01;
    P += amp * normalize(Nn);
    N= calculatenormal(P);
}

--- NEW FILE: glow.sl ---
/*
 * glow(): from the Renderman Companion page 369
 */
surface
glow(float attenuation = 2)
{
    float falloff = I.N;
    if (falloff < 0) {
	falloff = falloff * falloff / (I.I * N.N);
	falloff = pow(falloff, attenuation);
	Ci = Cs * falloff;
	Oi = falloff;
    } else
	Oi = 0;
}

--- NEW FILE: randomcolors.sl ---
surface
randomcolors(float Ka = 1, Kd = 1)
{
    point Nf = faceforward(normalize(N), I);
    Oi = Os;
    Ci = Os * random() * (Ka * ambient() + Kd * diffuse(Nf));
}

Index: DinningRoom.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/DinningRoom.rib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DinningRoom.rib	29 May 2003 17:33:41 -0000	1.1
--- DinningRoom.rib	29 May 2003 22:45:11 -0000	1.2
***************
*** 51,64 ****
  TransformBegin
  AttributeBegin
- Surface "matte"
- Color 0.9 0.9 0.9
- Translate -100 0 0
- Scale 2 2 2
- Patch "bilinear" "P" [0 -100 -100 0 100 -100 0 -100 100 0 100 1000]
- AttributeEnd
- TransformEnd
- 
- TransformBegin
- AttributeBegin
  Translate 0 30 99
  Scale 0.75 0.75 0.75
--- 51,54 ----

Index: capsules.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/capsules.rib,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** capsules.rib	29 May 2003 18:12:18 -0000	1.9
--- capsules.rib	29 May 2003 22:45:11 -0000	1.10
***************
*** 10,15 ****
  Rotate 23 0 1 0
  WorldBegin
! LightSource "pointlight" 1 "intensity" 2000 "from" [0 25 0]
  LightSource "ambientlight" 2 "intensity" .1
  ShadingRate 1
  ReadArchive "capsulesData.rib"
--- 10,16 ----
  Rotate 23 0 1 0
  WorldBegin
! LightSource "pointlight" 1 "intensity" 2000 "from" [15 25 0]
  LightSource "ambientlight" 2 "intensity" .1
+ LightSource "distantlight" 3 "intensity" .2 "from" [1 0 -1] "to" [0 0 0]
  ShadingRate 1
  ReadArchive "capsulesData.rib"

Index: elephant.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/elephant.rib,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** elephant.rib	29 May 2003 18:12:18 -0000	1.5
--- elephant.rib	29 May 2003 22:45:11 -0000	1.6
***************
*** 23,26 ****
--- 23,27 ----
  AttributeBegin
  Displacement "bumptest"
+ Attribute "displacementbound" "sphere" .03
  Surface "metal" "roughness" 1
  Color .3 .3 .3

Index: shaderTest.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/shaderTest.rib,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** shaderTest.rib	29 May 2003 18:12:18 -0000	1.8
--- shaderTest.rib	29 May 2003 22:45:11 -0000	1.9
***************
*** 1,5 ****
! Format 400 300 1
! Option "limits" "gridsize" 4096
! Display "shaderTest" "framebufer" "rgb"
  PixelFilter "box" 1 1
  PixelSamples 4 4
--- 1,4 ----
! Format 800 600 1
! Display "shaderTest" "framebuffer" "rgb"
  PixelFilter "box" 1 1
  PixelSamples 4 4
***************
*** 14,21 ****
  Surface "metal"
  Displacement "bumptest"
! #Attribute "displacementbound" "sphere" .0005
  Color 1 1 1
  Rotate 40 5 2 38
! Sphere 1 -1 1 360 "roughness" .02
  AttributeEnd
  AttributeBegin
--- 13,20 ----
  Surface "metal"
  Displacement "bumptest"
! Attribute "displacementbound" "sphere" .03
  Color 1 1 1
  Rotate 40 5 2 38
! Sphere 1 -1 1 360 "roughness" .2
  AttributeEnd
  AttributeBegin
***************
*** 23,27 ****
  Surface "matte"
  Displacement "bumptest"
! Attribute "displacementbound" "sphere" .0005
  Color 1 1 1
  Rotate 35 1 2 3
--- 22,26 ----
  Surface "matte"
  Displacement "bumptest"
! Attribute "displacementbound" "sphere" .03
  Color 1 1 1
  Rotate 35 1 2 3

[Jrman-commit] drafts/src/org/jrman/render RendererHidden.java,1.23,1.24

From: <ma...@us...> - 2003-05-29 22:45:16

Update of /cvsroot/jrman/drafts/src/org/jrman/render
In directory sc8-pr-cvs1:/tmp/cvs-serv13159/src/org/jrman/render

Modified Files:
	RendererHidden.java 
Log Message:
Small corrections to ribs.
Added shader language source.
Fixed displacement bug.


Index: RendererHidden.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** RendererHidden.java	28 May 2003 06:22:43 -0000	1.23
--- RendererHidden.java	29 May 2003 22:45:12 -0000	1.24
***************
*** 156,159 ****
--- 156,160 ----
          int row,
          boolean check) {
+         float dist = bv.getMinZ();
          bv = bv.transform(cameraToRaster);
          primitive.setDistance(bv.getMinZ());
***************
*** 165,169 ****
              float l = vtmp.length();
              vtmp.set(l, 0f, 0f);
!             ptmp1.set(0f, 0f, bv.getMinZ());
              ptmp2.add(ptmp1, vtmp);
              cameraToRaster.transformPoint(ptmp1, ptmp1);
--- 166,170 ----
              float l = vtmp.length();
              vtmp.set(l, 0f, 0f);
!             ptmp1.set(0f, 0f, dist);
              ptmp2.add(ptmp1, vtmp);
              cameraToRaster.transformPoint(ptmp1, ptmp1);

[Jrman-commit] drafts/sampleData ManySpheres.rib,1.21,1.22 aphrodite.rib,1.1,1.2 bike.rib,1.2,1.3 capsules.rib,1.8,1.9 elephant.rib,1.4,1.5 shaderTest.rib,1.7,1.8 vehicles.rib,1.2,1.3

From: <ma...@us...> - 2003-05-29 18:12:53

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1:/tmp/cvs-serv17548/sampleData

Modified Files:
	ManySpheres.rib aphrodite.rib bike.rib capsules.rib 
	elephant.rib shaderTest.rib vehicles.rib 
Log Message:
Removed obsolete dinner.


Index: ManySpheres.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/ManySpheres.rib,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ManySpheres.rib	26 May 2003 01:47:59 -0000	1.21
--- ManySpheres.rib	29 May 2003 18:12:17 -0000	1.22
***************
*** 3,13 ****
  Exposure 1 2.2
  Clipping 30 100
! Display "ManySpheres.tif" "framebuffer" "rgb"
! #Display "ManySpheres.tif" "file" "rgb"
! #Option "limits" "bucketsize" [32 32] 
! #Option "limits" "bucketsize" [32 32] "gridsize" [1024]
  PixelFilter "box" 1 1
  Projection "perspective" "fov" 50
- #Projection "perspective" "fov" 90
  ShadingRate 1
  Surface "matte"
--- 3,9 ----
  Exposure 1 2.2
  Clipping 30 100
! Display "ManySpheres" "framebuffer" "rgb"
  PixelFilter "box" 1 1
  Projection "perspective" "fov" 50
  ShadingRate 1
  Surface "matte"
***************
*** 22,31 ****
  LightSource "pointlight" 6 "from" [-6 7 6] "intensity" 300 "lightcolor" [1 1 0]
  LightSource "pointlight" 7 "from" [-6 7 -6] "intensity" 300 "lightcolor" [1 0 1]
- #Atmosphere "depthcue"
  AttributeBegin
  Surface "metal"
- #Displacement "bumptest"
  ReadArchive "AllSpheres.rib"
- #ReadArchive "ss.rib"
  AttributeEnd
  Translate 0 7 0
--- 18,24 ----

Index: aphrodite.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/aphrodite.rib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aphrodite.rib	26 May 2003 07:17:24 -0000	1.1
--- aphrodite.rib	29 May 2003 18:12:17 -0000	1.2
***************
*** 5,8 ****
--- 5,11 ----
  
  # scene definitions
+ Display "aphrodite" "framebuffer" "rgb"
+ PixelFilter "box" 1 1
+ Format 640 480 1
  PixelSamples 4 4
  Exposure 1 2.2

Index: bike.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/bike.rib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bike.rib	29 May 2003 17:33:40 -0000	1.2
--- bike.rib	29 May 2003 18:12:18 -0000	1.3
***************
*** 1,6 ****
! ##RenderMan RIB-Structure 1.0
! version 3.03
! 
! Display "hama_out.tif" "file" "rgba"
  Format 800 600 1
  PixelSamples 4 4
--- 1,4 ----
! Display "bike" "framebuffer" "rgb"
! PixelFilter "box" 1 1
  Format 800 600 1
  PixelSamples 4 4

Index: capsules.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/capsules.rib,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** capsules.rib	26 May 2003 01:47:59 -0000	1.8
--- capsules.rib	29 May 2003 18:12:18 -0000	1.9
***************
*** 1,13 ****
! #Option "limits" "bucketsize" [24 24]
! Format 400 300 1
  PixelSamples 4 4
  Exposure 1 2.2
  Clipping 10 150
! Projection "perspective" "fov" 40
  Translate 0 0 75
  Rotate -33 1 0 0 
  Rotate 23 0 1 0
  WorldBegin
! LightSource "pointlight" 1 "intensity" 2000 "from" [0 50 0]
  LightSource "ambientlight" 2 "intensity" .1
  ShadingRate 1
--- 1,14 ----
! Display "capsules" "framebuffer" "rgb"
! PixelFilter "box" 1 1
! Format 800 600 1
  PixelSamples 4 4
  Exposure 1 2.2
  Clipping 10 150
! Projection "perspective" "fov" 30
  Translate 0 0 75
  Rotate -33 1 0 0 
  Rotate 23 0 1 0
  WorldBegin
! LightSource "pointlight" 1 "intensity" 2000 "from" [0 25 0]
  LightSource "ambientlight" 2 "intensity" .1
  ShadingRate 1

Index: elephant.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/elephant.rib,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** elephant.rib	26 May 2003 05:17:58 -0000	1.4
--- elephant.rib	29 May 2003 18:12:18 -0000	1.5
***************
*** 1,9 ****
! Format 512 384 1
  PixelSamples 4 4
  Exposure 1 2.2
  Clipping 40 80
- Option "limits" "gridsize" 1024 "bucketsize" [32 32]
- Display "Elephant" "framebuffer" "rgb"
- PixelFilter "box" 1 1
  Projection "perspective" "fov" 10
  Translate 0 0 60
--- 1,8 ----
! Format 800 600 1
! Display "elephant" "framebuffer" "rgb"
! PixelFilter "box" 1 1
  PixelSamples 4 4
  Exposure 1 2.2
  Clipping 40 80
  Projection "perspective" "fov" 10
  Translate 0 0 60
***************
*** 16,24 ****
  LightSource "spotlight" 3 "from" [4 8 2] "to" [0 0 0]
               "lightcolor" [0 0 1] "intensity" 75
- #Atmosphere "fog" "background" [1 1 1] "distance" 200
  AttributeBegin
  Color 1 1 1
  Surface "matte"
- #Patch "bilinear" "P" [-50 0 -50 50 0 -50 -50 0 50 50 0 50]
  Rotate -90 1 0 0
  Disk 0 50 360
--- 15,21 ----
***************
*** 32,36 ****
  Rotate -90 1 0 0
  Scale .2 .2 .2
- #Attribute "displacementbound" "sphere" 0.01
  ReadArchive "gumbo.rib"
  AttributeEnd
--- 29,32 ----

Index: shaderTest.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/shaderTest.rib,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shaderTest.rib	26 May 2003 01:47:59 -0000	1.7
--- shaderTest.rib	29 May 2003 18:12:18 -0000	1.8
***************
*** 1,7 ****
  Format 400 300 1
  Display "shaderTest" "framebufer" "rgb"
- Option "limits" "gridsize" 1024
  PixelFilter "box" 1 1
! PixelSamples 8 8
  Exposure 1 2.2
  Projection "perspective" "fov"  5.5
--- 1,7 ----
  Format 400 300 1
+ Option "limits" "gridsize" 4096
  Display "shaderTest" "framebufer" "rgb"
  PixelFilter "box" 1 1
! PixelSamples 4 4
  Exposure 1 2.2
  Projection "perspective" "fov"  5.5
***************
*** 9,16 ****
  Rotate -20 1 0 0
  WorldBegin
- #LightSource "ambientlight" 1 "intensity" .02
- #LightSource "distantlight" 2 "intensity" 1 "lightcolor" [0 1 0] "to" [0 0 0] "from" [1 1 -1]
- #LightSource "distantlight" 3 "intensity" .7 "lightcolor" [1 0 0] "to" [0 0 0] "from" [-1 1 -1]
- #LightSource "pointlight" 4 "intensity" 5 "from" [0 0 10]
  LightSource "spotlight" 5 "from" [0 5 -2] "to" [0 0 0] "intensity" 30
  AttributeBegin
--- 9,12 ----
***************
*** 18,22 ****
  Surface "metal"
  Displacement "bumptest"
! Attribute "displacementbound" "sphere" .0005
  Color 1 1 1
  Rotate 40 5 2 38
--- 14,18 ----
  Surface "metal"
  Displacement "bumptest"
! #Attribute "displacementbound" "sphere" .0005
  Color 1 1 1
  Rotate 40 5 2 38

Index: vehicles.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/vehicles.rib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vehicles.rib	29 May 2003 17:33:41 -0000	1.2
--- vehicles.rib	29 May 2003 18:12:18 -0000	1.3
***************
*** 2,6 ****
  version 3.03
  
! Option "statistics" "endofframe" 1
  Display "vehicles" "framebuffer" "rgb"
  Format 800 450 1
--- 2,6 ----
  version 3.03
  
! #Option "statistics" "endofframe" 1
  Display "vehicles" "framebuffer" "rgb"
  Format 800 450 1

[Jrman-commit] drafts/sampleData/dinner bikeData.rib,1.1,NONE copa.rib,1.1,NONE cuadro.rib,1.1,NONE cuchara.rib,1.1,NONE cuchillo.rib,1.1,NONE dinner.rib,1.1,NONE dinnerService.rib,1.1,NONE florero.rib,1.1,NONE huevo.rib,1.1,NONE jarra1.rib,1.1,NONE jarra2.rib,1.1,NONE mesa.rib,1.1,NONE plato.rib,1.1,NONE silla.rib,1.1,NONE taza.rib,1.1,NONE tenedor.rib,1.1,NONE testCuadro.rib,1.1,NONE

From: <ma...@us...> - 2003-05-29 18:12:28

Update of /cvsroot/jrman/drafts/sampleData/dinner
In directory sc8-pr-cvs1:/tmp/cvs-serv17548/sampleData/dinner

Removed Files:
	bikeData.rib copa.rib cuadro.rib cuchara.rib cuchillo.rib 
	dinner.rib dinnerService.rib florero.rib huevo.rib jarra1.rib 
	jarra2.rib mesa.rib plato.rib silla.rib taza.rib tenedor.rib 
	testCuadro.rib 
Log Message:
Removed obsolete dinner.


--- bikeData.rib DELETED ---

--- copa.rib DELETED ---

--- cuadro.rib DELETED ---

--- cuchara.rib DELETED ---

--- cuchillo.rib DELETED ---

--- dinner.rib DELETED ---

--- dinnerService.rib DELETED ---

--- florero.rib DELETED ---

--- huevo.rib DELETED ---

--- jarra1.rib DELETED ---

--- jarra2.rib DELETED ---

--- mesa.rib DELETED ---

--- plato.rib DELETED ---

--- silla.rib DELETED ---

--- taza.rib DELETED ---

--- tenedor.rib DELETED ---

--- testCuadro.rib DELETED ---

[Jrman-commit] drafts/sampleData/dinner - New directory

From: <ega...@us...> - 2003-05-29 16:24:37

Update of /cvsroot/jrman/drafts/sampleData/dinner
In directory sc8-pr-cvs1:/tmp/cvs-serv3744/sampleData/dinner

Log Message:
Directory /cvsroot/jrman/drafts/sampleData/dinner added to the repository

[Jrman-commit] drafts/sampleData paraboloid.rib,1.2,1.3

From: <ega...@us...> - 2003-05-28 12:33:42

Update of /cvsroot/jrman/drafts/sampleData
In directory sc8-pr-cvs1:/tmp/cvs-serv1998/sampleData

Modified Files:
	paraboloid.rib 
Log Message:
Added Paraboloid test cases and fixed dice_Ng.
Removed parser.addHyperboloid invocation.

Index: paraboloid.rib
===================================================================
RCS file: /cvsroot/jrman/drafts/sampleData/paraboloid.rib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** paraboloid.rib	28 May 2003 06:22:44 -0000	1.2
--- paraboloid.rib	28 May 2003 12:33:39 -0000	1.3
***************
*** 8,32 ****
  AttributeBegin
          Translate 4 0 0
!    Rotate 45 1 1 1
          Color 1 0 0
!         Paraboloid 2 .1 1 360 "Cs" [1 0 0 1 0 0 0 0 1 0 0 1]
  AttributeEnd
  AttributeBegin
          Translate 4 4 0
!    Rotate -45 1 1 1
          Color 0 1 0
!         Paraboloid .5 .5 1 360
  AttributeEnd
  AttributeBegin
          Translate 0 4 0
!    Rotate 90 1 1 1
          Color .8 .8 1
!         Paraboloid 3 1 2 360
  AttributeEnd
  AttributeBegin
!         Translate 0 0 0
     Rotate -90 1 1 1
          Color 1 1 1
          Paraboloid 1 .5 .6 360
  AttributeEnd
  WorldEnd
--- 8,46 ----
  AttributeBegin
          Translate 4 0 0
!         Rotate 45 1 1 1
          Color 1 0 0
!         Paraboloid 2 0 3 360 "Cs" [1 0 0 1 0 0 0 0 1 0 0 1]
  AttributeEnd
  AttributeBegin
          Translate 4 4 0
!          Rotate 90 1 1 1
          Color 0 1 0
!         Paraboloid .5 .5 1 270
  AttributeEnd
  AttributeBegin
          Translate 0 4 0
!          Rotate 110 0 1 0 
!          Rotate  30 1 0 0 
          Color .8 .8 1
!         Paraboloid 3 0 2 180
  AttributeEnd
  AttributeBegin
!         Translate -5 4 0
!          Rotate 110 0 1 0 
!          Rotate  30 1 0 0 
!         Color .8 .8 1
!         Paraboloid 3 0 2 360
! AttributeEnd
! AttributeBegin
!    Translate -4 -2 0
     Rotate -90 1 1 1
          Color 1 1 1
          Paraboloid 1 .5 .6 360
+ AttributeEnd
+ AttributeBegin
+    Translate -4 -4 0
+    Rotate -90 1 1 1
+         Color 0 0 1
+         Paraboloid 1 0 1 360
  AttributeEnd
  WorldEnd

[Jrman-commit] drafts/src/org/jrman/primitive Paraboloid.java,1.4,1.5

From: <ega...@us...> - 2003-05-28 12:33:42

Update of /cvsroot/jrman/drafts/src/org/jrman/primitive
In directory sc8-pr-cvs1:/tmp/cvs-serv1998/src/org/jrman/primitive

Modified Files:
	Paraboloid.java 
Log Message:
Added Paraboloid test cases and fixed dice_Ng.
Removed parser.addHyperboloid invocation.

Index: Paraboloid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/primitive/Paraboloid.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Paraboloid.java	27 May 2003 14:17:11 -0000	1.4
--- Paraboloid.java	28 May 2003 12:33:38 -0000	1.5
***************
*** 191,195 ****
          float thetaDelta = (thetaMax - thetaMin) / (uSize - 1);
          float zDelta = (zMax - zMin) / (vSize - 1);
!         float a = (float) maxZ / (radius * radius);
          Vector3fGrid Ng = shaderVariables.Ng;
          float theta = thetaMin;
--- 191,195 ----
          float thetaDelta = (thetaMax - thetaMin) / (uSize - 1);
          float zDelta = (zMax - zMin) / (vSize - 1);
!         float a = (float) radius / (maxZ * maxZ);
          Vector3fGrid Ng = shaderVariables.Ng;
          float theta = thetaMin;

[Jrman-commit] drafts/src/org/jrman/parser/keywords KeywordHyperboloid.java,1.3,1.4

From: <ega...@us...> - 2003-05-28 12:33:41

Update of /cvsroot/jrman/drafts/src/org/jrman/parser/keywords
In directory sc8-pr-cvs1:/tmp/cvs-serv1998/src/org/jrman/parser/keywords

Modified Files:
	KeywordHyperboloid.java 
Log Message:
Added Paraboloid test cases and fixed dice_Ng.
Removed parser.addHyperboloid invocation.

Index: KeywordHyperboloid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/parser/keywords/KeywordHyperboloid.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** KeywordHyperboloid.java	27 May 2003 02:44:20 -0000	1.3
--- KeywordHyperboloid.java	28 May 2003 12:33:37 -0000	1.4
***************
*** 60,64 ****
          // Expect parameter list
          Map parameters = parseParameterList(st);
!         parser.addHyperboloid(x1,y1,z1,x2,y2,z2,thetaMax,parameters);
      }
  
--- 60,64 ----
          // Expect parameter list
          Map parameters = parseParameterList(st);
!         //parser.addHyperboloid(x1,y1,z1,x2,y2,z2,thetaMax,parameters);
      }

[Jrman-commit] drafts/src/org/jrman/main JRMan.java,1.2,1.3