Changeset 472 for GraphicTest/Packages/bgrabitmap/phongdraw.inc

Timestamp:

Apr 9, 2015, 9:58:36 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Use csOpaque control style also to Image, PaintBox and OpenGLControl.
• Modified: Change size of test frame with SpinEdits as delayed using timer.
• Updated: BRGABitmap package to version 8.1.

File:

• GraphicTest/Packages/bgrabitmap/phongdraw.inc (modified) (8 diffs)

GraphicTest/Packages/bgrabitmap/phongdraw.inc

@@ -73 +73 @@
   x,y : integer;      // Coordinates of point in height map.
   vS1,vS2: TPoint3D_128; // surface vectors (plane)
+  deltaDown: Int32or64;
+  IsLineUp,IsLineDown: boolean;
 
 begin
+  if map = nil then exit;
   {$ifndef PARAM_SIMPLECOLOR}
     {$ifndef PARAM_SCANNER}
@@ -106 +109 @@
                   LightPosition.Y-ofsY,
                   LightPositionZ);
-  {$ifdef PARAM_PHONGSSE}
-  asm
-    movups xmm1, vLS
-  end;
-  LightDestFactor4 := Point3D_128(LightDestFactor,LightDestFactor,LightDestFactor,LightDestFactor);
-  {$endif}
 
   //surface vectors
@@ -119 +116 @@
   vV := Point3D_128(0,0,1);
 
-
   dist := 0;
   LdotN := 0;
   NnH := 0;
 
+  {$ifdef PARAM_PHONGSSE}
+  LightDestFactor4 := Point3D_128(LightDestFactor,LightDestFactor,LightDestFactor,LightDestFactor);
+  {$endif}
+
+  if map.LineOrder = riloTopToBottom then
+    deltaDown := map.Width*sizeof(TBGRAPixel)
+  else
+    deltaDown := -map.Width*sizeof(TBGRAPixel);
   for y := miny to maxy do
   begin
@@ -138 +142 @@
       {$endif}
     {$endif}
+    IsLineUp := y > 0;
+    IsLineDown := y < map.Height-1;
+    mcTop := BGRAPixelTransparent;
+    mcBottom := BGRAPixelTransparent;
     for x := minx to maxx do
     begin
       mcLeft := mc;
       mc := mcRight;
-      inc(pmap);
       if x < map.width-1 then
-        mcRight := pmap^ else
+        mcRight := (pmap+1)^ else
         mcRight := BGRAPixelTransparent;
       if mc.alpha = 0 then
@@ -156 +163 @@
         {$endif}
         inc(pdest);
+        inc(pmap);
         continue;
       end;
 
       //compute surface vectors
-      mcTop := map.GetPixel(x,y-1);
-      mcBottom := map.GetPixel(x,y+1);
+      if IsLineUp then mcTop := pbgrapixel(pbyte(pmap)-deltaDown)^;
+      if IsLineDown then mcBottom := pbgrapixel(pbyte(pmap)+deltaDown)^;
+      inc(pmap);
+
       z := MapHeight(mc)*mapAltitude;
       if mcLeft.alpha = 0 then
@@ -196 +206 @@
       begin
         {$DEFINE PARAM_USESSE3}
+        asm
+          movups xmm1, vLS
+        end;
         {$i phongdrawsse.inc}
         {$UNDEF PARAM_USESSE3}
       end else
       begin
+        asm
+          movups xmm1, vLS
+        end;
         {$i phongdrawsse.inc}
       end;
@@ -221 +237 @@
 
         NH := DotProduct3D_128(vH,vN);
-        if NH <= 0 then
-          NnH := 0
-        else
-          NnH := exp(SpecularIndex*ln(NH));
       {$endif}
 
@@ -230 +242 @@
         NnH := 0
       else
-        NnH := exp(SpecularIndex*ln(NH));
+        NnH := exp(SpecularIndex*ln(NH));  //to be optimized
 
       distfactor := LightSourceIntensity / (dist*LightSourceDistanceFactor + LightSourceDistanceTerm);