Changeset 894 for Daodan

Timestamp:

Aug 12, 2013, 12:31:16 AM (11 years ago)

Author:

alloc

Message:

Daodan 3.5: Fix displaying screens larger than screen res

Location:

Daodan/src

Files:

• BFW_Motoko_Draw.h (modified) (1 diff)
• Daodan.h (modified) (1 diff)
• Daodan_Config.c (modified) (2 diffs)
• Daodan_Config.h (modified) (1 diff)
• Oni_Symbols.h (modified) (1 diff)
• _Version.h (modified) (1 diff)
• patches/Patches.c (modified) (3 diffs)

Daodan/src/BFW_Motoko_Draw.h

@@ -82 +82 @@
 } M3tWin32GammaRamp;
 
+typedef struct
+{
+        float   x;
+        float   y;
+        float   z;
+        float   invW;
+} M3tPointScreen;
+
+typedef struct
+{
+        char pad[8];
+                
+        UUtUns16 width;
+        UUtUns16 height;
+        int texelType; // enum IMtPixelType
+                
+        UUtUns16 num_x;
+        UUtUns16 num_y;
+
+        UUtUns32 num_textures;
+        void* textures[1]; // struct M3tTextureMap
+} M3tTextureMap_Big;
+
 extern char M3gResolutionSwitch;
 

Daodan/src/Daodan.h

@@ -18 +18 @@
 #define UUcError_None ((UUtError) 0)
 
+typedef unsigned char UUtUns8;
+typedef unsigned short UUtUns16;
+typedef unsigned int UUtUns32;
+typedef char UUtInt8;
+typedef short UUtInt16;
+typedef int UUtInt32;
+
 extern HMODULE DDrDLLModule;
 extern HMODULE DDrONiModule;

Daodan/src/Daodan_Config.c

@@ -26 +26 @@
 bool patch_fonttexturecache = true;
 bool patch_getcmdline = true;
+bool patch_hdscreens_lowres = true;
 bool patch_kickguns = false;
 bool patch_killvtune = true;
@@ -131 +132 @@
                         else if (!_stricmp(name, "getcmdline"))
                                 patch_getcmdline = !_stricmp(inifile_cleanstr(value), "true");
+                        else if (!_stricmp(name, "hdscreens_lowres"))
+                                patch_hdscreens_lowres = !_stricmp(inifile_cleanstr(value), "true");
                         else if (!_stricmp(name, "kickguns"))
                                 patch_kickguns = !_stricmp(inifile_cleanstr(value), "true");

Daodan/src/Daodan_Config.h

@@ -21 +21 @@
 extern bool patch_fonttexturecache;
 extern bool patch_getcmdline;
+extern bool patch_hdscreens_lowres;
 extern bool patch_kickguns;
 extern bool patch_killvtune;

Daodan/src/Oni_Symbols.h

@@ -220 +220 @@
 DefFunc(void, AI2rDisplayDebuggingInfo, ONICALL, (Character* Char), 0x0048C5F0);
 DefFunc(uint32_t, M3rTextureMap_New, ONICALL, (short width, short height, int type, int allocated, int flags, char* name, void** output), 0x0041EB00);
+DefFunc(void, M3rDraw_BigBitmap, ONICALL, (M3tTextureMap_Big* inBigBitmap, const M3tPointScreen *inDestPoint, UUtUns16 inWidth, UUtUns16 inHeight, UUtUns32 inShade, UUtUns16 inAlpha), 0x0041f6e0);
+DefFunc(void, M3rDraw_Bitmap, ONICALL, (void* inBitmap, const M3tPointScreen* inDestPoint, UUtUns16 inWidth, UUtUns16 inHeight, UUtUns32 inShade, UUtUns16 inAlpha), 0x0041f4a0);
 /*
 DefFunc(void, M3rGeom_Line_Light, ONICALL, (), 0x0041f440);

Daodan/src/_Version.h

@@ -6 +6 @@
 
 #define DAODAN_VERSION_MAJOR 3
-#define DAODAN_VERSION_MINOR 4
+#define DAODAN_VERSION_MINOR 5
 #define DAODAN_VERSION_STRING STRINGIZE(DAODAN_VERSION_MAJOR) "." STRINGIZE(DAODAN_VERSION_MINOR)
 

Daodan/src/patches/Patches.c

@@ -24 +24 @@
         WMrSlider_SetRange(window, min_value, max_value);
 }
- 
+
+void ONICALL DD_M3rDraw_BigBitmap(M3tTextureMap_Big* inBigBitmap, const M3tPointScreen* inDestPoint, UUtUns16 inWidth, UUtUns16 inHeight, UUtUns32 inShade, UUtUns16 inAlpha) /* 0 - M3cMaxAlpha */
+{
+        UUtUns16 x;
+        UUtUns16 y;
+
+        for (y = 0; y < inBigBitmap->num_y; y++)
+        {
+                for (x = 0; x < inBigBitmap->num_x; x++)
+                {
+                        UUtUns16 index;
+                        void* texture; // M3tTextureMap
+                        UUtUns16 width;
+                        UUtUns16 height;
+                        UUtInt16 temp;                  
+                        UUtInt32 x_times_maxwidth;
+                        UUtInt32 y_times_maxheight;
+                        
+                        index = x + (y * inBigBitmap->num_x);
+                        texture = inBigBitmap->textures[index];
+                        
+                        x_times_maxwidth = x * 256;
+                        y_times_maxheight = y * 256;
+                        
+                        // Cast to Unsigned to get the 16 bit int representation and then to signed to get the actual value. Doing it in one step gives wrong results (at least with gcc)
+                        dest_point.x = (UUtInt16)((UUtUns16)inDestPoint->x) + x_times_maxwidth;
+                        dest_point.y = (UUtInt16)((UUtUns16)inDestPoint->y) + y_times_maxheight;
+                        dest_point.z = inDestPoint->z;
+                        dest_point.invW = inDestPoint->invW;
+
+                        temp = (UUtInt16) ( ((UUtInt32)inWidth - x_times_maxwidth) > 0 ? ((UUtInt32)inWidth - x_times_maxwidth) : 0);
+                        width = 256 < (UUtUns16)temp ? 256 : temp;
+                        temp = (UUtInt16) ( ((UUtInt32)inHeight - y_times_maxheight) > 0 ? ((UUtInt32)inHeight - y_times_maxheight) : 0);
+                        height = 256 < (UUtUns16)temp ? 256 : temp;
+                                
+                        M3rDraw_Bitmap(texture, &dest_point, width, height, inShade, inAlpha);
+                }
+        }
+}
+
+
 void ONICALL DDrShowResumeButton(WMtWindow* window, int visibility)
 {
@@ -274 +314 @@
 }
 
+// Allow HD screens with resolution < 1024*768
+void DD_Patch_HDScreens_LowRes()
+{
+        DDrPatch_MakeJump((void*)M3rDraw_BigBitmap, (void*)DD_M3rDraw_BigBitmap);
+}
+
 // Hackish fix for Konoko not kicking guns
 // Don't use this, it breaks stairs.
@@ -545 +591 @@
         if (patch_getcmdline)
                 DD_Patch_GetCmdLine();
+
+        if (patch_hdscreens_lowres)
+                DD_Patch_HDScreens_LowRes();
         
         if (patch_kickguns)