Commit: b2e37df1885c05eec08d623da211a0a03e12bbca - lines (git)

line rasterizer test

Commit MetaInfo

• Révision: b2e37df1885c05eec08d623da211a0a03e12bbca (tree)
• l'heure: 2011-02-14 01:55:16
• Auteur: beru <berupon@gmai...>
• Commiter: beru

Message de Log

slop correction revised
changed minimum width

Change Summary

• modified: gl/lineDrawer8_Shift.h

Modification

--- a/gl/lineDrawer8_Shift.h
+++ b/gl/lineDrawer8_Shift.h
@@ -82,13 +82,16 @@ public:
 			const NumericT gradient = dy / width;
 			float rotation = abs(width / dy);
 			
-			alpha *= slopeCorrectionTable_[ ToInt(mul<slopeCorrectionTableSize - 1>(abs(gradient))) ];
-			
+			{
+				float r2 = width < height ? (width/height) : (height/width);
+				alpha *= slopeCorrectionTable_[ ToInt(mul<slopeCorrectionTableSize - 1>(r2)) ];
+			}
 			uint8_t pat1[512] = {0};
 			uint8_t pat2[512+1];
 			
-			float patLen = rotation * 1.28;
+			float patLen = rotation * 1.4;
 			patLen = std::min(256.0f, patLen);
+			patLen = std::max(1.50001f, patLen);
 			int iPatLen = ceil(patLen);
 			for (size_t i=0; i<iPatLen; ++i) {
 				float x = (i * 2) / patLen;
@@ -112,7 +115,7 @@ public:
 				const size_t w = iPatLen * 2;
 				shift(pat1, pat2, w, fracOffset);
 				for (size_t x=0; x<w; ++x) {
-					ptr[io+x] = pat2[x];
+					ptr[io+x] = pat2[x] * (alpha / 255.0);
 				}
 				OffsetPtr(ptr, lineOffset);
 				curOffset += offset;