summaryrefslogtreecommitdiff
path: root/src/win95/awtexld.hpp
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2001-08-11 03:36:48 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:36 +0200
commit9dadcb80240ed2e8df118d92940a954f0e7e669e (patch)
tree5feefeb5d8a7d1c56678750110afecc84cbc7b7f /src/win95/awtexld.hpp
parentefc384b7b35943fa96249f747bfa08d22f96242a (diff)
Threw in texture loading/drawing.
Blending modes (color/texture) are problematic and texture coordinates aren't yet perfect.
Diffstat (limited to 'src/win95/awtexld.hpp')
-rw-r--r--src/win95/awtexld.hpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/win95/awtexld.hpp b/src/win95/awtexld.hpp
index e39ef39..34e287f 100644
--- a/src/win95/awtexld.hpp
+++ b/src/win95/awtexld.hpp
@@ -32,12 +32,14 @@ namespace AwTl {
unsigned blueLeftShift;
unsigned blueRightShift;
+ unsigned dwRGBAlphaBitMask;
// DDPIXELFORMAT ddpf;
};
// DO SOMTHING ABOUT THIS
extern PixelFormat pixelFormat;
-
+ extern PixelFormat pfSurfaceFormat;
+
class CreateTextureParms;
/********************/
@@ -57,9 +59,7 @@ namespace AwTl {
static_cast<unsigned>(_colP->r)>>pixelFormat.redRightShift<<pixelFormat.redLeftShift
|static_cast<unsigned>(_colP->g)>>pixelFormat.greenRightShift<<pixelFormat.greenLeftShift
|static_cast<unsigned>(_colP->b)>>pixelFormat.blueRightShift<<pixelFormat.blueLeftShift
-/* TODO */
-/*|pixelFormat.ddpf.dwRGBAlphaBitMask*/
- ;
+ |pixelFormat.dwRGBAlphaBitMask;
}
static inline unsigned DoConv(BYTE const * _colP, Colour const * _paletteP db_code1(DB_COMMA unsigned _paletteSize))
{
@@ -224,6 +224,7 @@ namespace AwTl {
*_dstRowP.byteP++ = u.b[1];
*_dstRowP.byteP = u.b[2];
}
+ break;
}
case 32:
{