X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=__init__.py;fp=__init__.py;h=4fc3eed6250ca5afcc3c616a86d83ed40d42ff64;hb=1d4488d79917b6b47ae3f0d705486a5b873e8dea;hp=b926763e356bd89ccd114311f854a9ecad3791ae;hpb=404dc02ee546ca1955507fd4644492977fcfc07f;p=convexer.git diff --git a/__init__.py b/__init__.py index b926763..4fc3eed 100644 --- a/__init__.py +++ b/__init__.py @@ -470,8 +470,8 @@ def libcxr_line_callback( p0,p1,colour ): libnbvtf = None # Constants -NBVTF_IMAGE_FORMAT_RGBA8888 = 0 -NBVTF_IMAGE_FORMAT_RGB888 = 2 +NBVTF_IMAGE_FORMAT_ABGR8888 = 1 +NBVTF_IMAGE_FORMAT_BGR888 = 3 NBVTF_IMAGE_FORMAT_DXT1 = 13 NBVTF_IMAGE_FORMAT_DXT5 = 15 NBVTF_TEXTUREFLAGS_CLAMPS = 0x00000004 @@ -1048,10 +1048,10 @@ def compile_image(img): dims = img.cxr_data.export_res fmt = { - 'RGBA': NBVTF_IMAGE_FORMAT_RGBA8888, + 'RGBA': NBVTF_IMAGE_FORMAT_ABGR8888, 'DXT1': NBVTF_IMAGE_FORMAT_DXT1, 'DXT5': NBVTF_IMAGE_FORMAT_DXT5, - 'RGB': NBVTF_IMAGE_FORMAT_RGB888 + 'RGB': NBVTF_IMAGE_FORMAT_BGR888 }[ img.cxr_data.fmt ] mipmap = img.cxr_data.mipmap