jrman-commit Mailing List for jrMan (Page 35)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	SamplePoint.java RendererHidden.java ShaderVariables.java 
	Micropolygon.java Sampler.java 
Log Message:
More optimizations.

Index: SamplePoint.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/SamplePoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SamplePoint.java	6 May 2003 02:15:44 -0000	1.4
--- SamplePoint.java	6 May 2003 20:54:27 -0000	1.5
***************
*** 56,61 ****
      }

!     public Color3f getColor() {
!         int i = 0;;
          while (i < samples.size()) {
              Sample sample = (Sample) samples.get(i++);
--- 56,62 ----
      }

!     public void getColor(Color3f ocolor) {
!         ocolor.set(0f, 0f, 0f);
!         int i = 0;
          while (i < samples.size()) {
              Sample sample = (Sample) samples.get(i++);
***************
*** 63,77 ****
                  break;
          }
-         Color3f result = new Color3f();
          while (i > 0) {
              Sample sample = (Sample) samples.get(--i);
              sample.getOpacity(opacity);
!             result.x *= (1f - opacity.x);
!             result.y *= (1f - opacity.y);
!             result.z *= (1f - opacity.z);
              sample.getColor(color);
!             result.add(color);
          }
-         return result;
      }

--- 64,76 ----
                  break;
          }
          while (i > 0) {
              Sample sample = (Sample) samples.get(--i);
              sample.getOpacity(opacity);
!             ocolor.x *= (1f - opacity.x);
!             ocolor.y *= (1f - opacity.y);
!             ocolor.z *= (1f - opacity.z);
              sample.getColor(color);
!             ocolor.add(color);
          }
      }

Index: RendererHidden.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/RendererHidden.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** RendererHidden.java	6 May 2003 02:15:44 -0000	1.11
--- RendererHidden.java	6 May 2003 20:54:27 -0000	1.12
***************
*** 23,28 ****
  import java.awt.event.WindowAdapter;
  import java.awt.event.WindowEvent;
- import java.util.Collection;
- import java.util.Iterator;

  import javax.swing.JFrame;
--- 23,26 ----
***************
*** 130,134 ****
      }

!     private void addToBuckets(Micropolygon mp) {
          float mpMinX = mp.getMinX() - rasterWindowMin.x;
          float mpMinY = mp.getMinY() - rasterWindowMin.y;
--- 128,132 ----
      }

!     public void addToBuckets(Micropolygon mp) {
          float mpMinX = mp.getMinX() - rasterWindowMin.x;
          float mpMinY = mp.getMinY() - rasterWindowMin.y;
***************
*** 185,191 ****
                          attr.getSurface().shade(shaderVariables);
                          shaderVariables.transform(cameraToRaster);
!                         Collection c = shaderVariables.getMicropolygons();
!                         for (Iterator it = c.iterator(); it.hasNext();)
!                             addToBuckets((Micropolygon) it.next());
                      } else {
                          Primitive[] sub = p.split();
--- 183,187 ----
                          attr.getSurface().shade(shaderVariables);
                          shaderVariables.transform(cameraToRaster);
!                         shaderVariables.getMicropolygons(this);
                      } else {
                          Primitive[] sub = p.split();

Index: ShaderVariables.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/ShaderVariables.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ShaderVariables.java	6 May 2003 02:15:44 -0000	1.2
--- ShaderVariables.java	6 May 2003 20:54:27 -0000	1.3
***************
*** 20,27 ****
  package org.jrman.render;

- import java.util.ArrayList;
- import java.util.Collection;
  import java.util.HashMap;
- import java.util.List;
  import java.util.Map;

--- 20,24 ----
***************
*** 96,106 ****
      }

!     public Collection getMicropolygons() {
          int columns = Grid.getUSize();
          int rows = Grid.getVSize();
!         List result = new ArrayList((rows - 1) * (columns - 1));
!         Point3fGrid pg = new Point3fGrid();
!         pg.set(P);
!         Point3f[] p = (Point3f[]) pg.data;
          Color3f[] c = (Color3f[]) Ci.data;
          Color3f[] o = (Color3f[]) Oi.data;
--- 93,100 ----
      }

!     public void getMicropolygons(RendererHidden rh) {
          int columns = Grid.getUSize();
          int rows = Grid.getVSize();
!         Point3f[] p = (Point3f[]) P.data;
          Color3f[] c = (Color3f[]) Ci.data;
          Color3f[] o = (Color3f[]) Oi.data;
***************
*** 108,112 ****
              for (int row = 0; row < rows - 1; row++) {
                  int offset = row * columns + col;
!                 result.add(
                      new Micropolygon(
                          p[offset],
--- 102,106 ----
              for (int row = 0; row < rows - 1; row++) {
                  int offset = row * columns + col;
!                 rh.addToBuckets(
                      new Micropolygon(
                          p[offset],
***************
*** 119,123 ****
                          o[offset].y,
                          o[offset].z));
!                 result.add(
                      new Micropolygon(
                          p[offset + columns + 1],
--- 113,117 ----
                          o[offset].y,
                          o[offset].z));
!                 rh.addToBuckets(
                      new Micropolygon(
                          p[offset + columns + 1],
***************
*** 131,135 ****
                          o[offset + columns + 1].z));
              }
-         return result;
      }

--- 125,128 ----

Index: Micropolygon.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/Micropolygon.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Micropolygon.java	6 May 2003 02:15:44 -0000	1.4
--- Micropolygon.java	6 May 2003 20:54:27 -0000	1.5
***************
*** 20,24 ****
  package org.jrman.render;

- import javax.vecmath.Color3f;
  import javax.vecmath.Point2f;
  import javax.vecmath.Point3f;
--- 20,23 ----
***************
*** 36,44 ****
      private static Vector3f cp = new Vector3f();

!     private Point3f a;

!     private Point3f b;

!     private Point3f c;

      private float colorRed;
--- 35,51 ----
      private static Vector3f cp = new Vector3f();

!     private float ax;

!     private float ay;

!     private float bx;
! 
!     private float by;
! 
!     private float cx;
! 
!     private float cy;
! 
!     private float z;

      private float colorRed;
***************
*** 63,69 ****

      public Micropolygon(
!         Point3f pa,
!         Point3f pb,
!         Point3f pc,
          float cRed,
          float cGreen,
--- 70,76 ----

      public Micropolygon(
!         Point3f a,
!         Point3f b,
!         Point3f c,
          float cRed,
          float cGreen,
***************
*** 72,78 ****
          float oGreen,
          float oBlue) {
!         a = pa;
!         b = pb;
!         c = pc;
          colorRed = cRed;
          colorGreen = cGreen;
--- 79,102 ----
          float oGreen,
          float oBlue) {
!         // Face forward
!         ab.sub(b, a);
!         ac.sub(c, a);
!         cp.cross(ab, ac);
!         if (cp.z > 0) {
!             Point3f tmp = b;
!             b = c;
!             c = tmp;
!         }
!         // get bounds
!         addPointToBounds(a.x, a.y);
!         addPointToBounds(b.x, b.y);
!         addPointToBounds(c.x, c.y);
!         ax = a.x;
!         ay = a.y;
!         bx = b.x;
!         by = b.y;
!         cx = c.x;
!         cy = c.y;
!         z = (a.z + b.z + c.z) / 3f;
          colorRed = cRed;
          colorGreen = cGreen;
***************
*** 81,92 ****
          opacityGreen = oGreen;
          opacityBlue = oBlue;
-         setBounds();
-         faceScreen();
-     }
- 
-     private void setBounds() {
-         addPointToBounds(a.x, a.y);
-         addPointToBounds(b.x, b.y);
-         addPointToBounds(c.x, c.y);
      }

--- 105,108 ----
***************
*** 98,118 ****
      }

-     private void faceScreen() {
-         ab.sub(b, a);
-         ac.sub(c, a);
-         cp.cross(ab, ac);
-         if (cp.z > 0) {
-             Point3f tmp = b;
-             b = c;
-             c = tmp;
-         }
-     }
- 
      public Sample getSample(Point2f point) {
!         if ((a.y - b.y) * (point.x - a.x) + (b.x - a.x) * (point.y - a.y) > 0f)
              return null;
!         if ((b.y - c.y) * (point.x - b.x) + (c.x - b.x) * (point.y - b.y) > 0f)
              return null;
!         if ((c.y - a.y) * (point.x - c.x) + (a.x - c.x) * (point.y - c.y) > 0f)
              return null;
          return new Sample(
--- 114,123 ----
      }

      public Sample getSample(Point2f point) {
!         if ((ay - by) * (point.x - ax) + (bx - ax) * (point.y - ay) > 0f)
              return null;
!         if ((by - cy) * (point.x - bx) + (cx - bx) * (point.y - by) > 0f)
              return null;
!         if ((cy - ay) * (point.x - cx) + (ax - cx) * (point.y - cy) > 0f)
              return null;
          return new Sample(
***************
*** 123,127 ****
              opacityGreen,
              opacityBlue,
!             (a.z + b.z + c.z) / 3f);
      }

--- 128,132 ----
              opacityGreen,
              opacityBlue,
!             z);
      }

Index: Sampler.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/render/Sampler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Sampler.java	6 May 2003 02:15:44 -0000	1.3
--- Sampler.java	6 May 2003 20:54:27 -0000	1.4
***************
*** 38,41 ****
--- 38,43 ----

      private SamplePoint[] samplePoints;
+     
+     private Color3f[] colors;

      public Sampler(int bucketWidth, int bucketHeight, float hSamples, float vSamples) {
***************
*** 47,50 ****
--- 49,55 ----
          for (int i = 0; i < samplePoints.length; i++)
              samplePoints[i] = new SamplePoint();
+         colors = new Color3f[width * height];
+         for (int i = 0; i < colors.length; i++)
+             colors[i] = new Color3f();
      }

***************
*** 70,77 ****

      public Color3f[] getColors() {
-         Color3f[] result = new Color3f[samplePoints.length];
          for (int i = 0; i < samplePoints.length; i++)
!             result[i] = samplePoints[i].getColor();
!         return result;
      }

--- 75,81 ----

      public Color3f[] getColors() {
          for (int i = 0; i < samplePoints.length; i++)
!             samplePoints[i].getColor(colors[i]);
!         return colors;
      }

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

jrman-commit Mailing List for jrMan (Page 35)

jrman-commit — CVS commits