hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed unneeded input consume, HD remaster images now work in the placement editor.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-24 12:10:08 -07:00
parent 4ff7c5df98
commit e5a55f777e
4 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/REDALERT/MAPEDIT.CPP
+1 -1
View File
@@ -1594,7 +1594,7 @@ void MapEditClass::Main_Menu(void)
Show_Mouse();
if (UnknownKey==KN_ESC || g_globalKeyNumType == KN_RMOUSE) {
// jmarshall - consume the RMOUSE DOWN
// jmarshall - consume the RMOUSE DOWN so it doesn't bring up the context menu again.
Buttons->Input();
// jmarshall end
break;
code/REDALERT/MAPEDPLC.CPP
+12 -1
View File
@@ -454,9 +454,20 @@ int MapEditClass::Placement_Dialog(void)
WindowList[WINDOW_EDITOR][WINDOWHEIGHT] = D_PICTURE_H;
Change_Window((int)WINDOW_EDITOR);
// Draw_Box(D_PICTURE_X, D_PICTURE_Y, D_PICTURE_W, D_PICTURE_H, BOXSTYLE_DOWN, false);
curobj->Display(WinW/2, WinH>>1, WINDOW_EDITOR, LastHouse);
//curobj->Display(WinW/2, WinH>>1, WINDOW_EDITOR, LastHouse);
// curobj->Display(WinW<<2, WinH>>1, WINDOW_EDITOR, LastHouse);
Image_t* image = NULL;
if (curobj->Get_HDImage_Data()) {
image = curobj->Get_HDImage_Data();
GL_RenderForeGroundImage(image, 30, 100, 75, 75);
}
//else {
// image = (Image_t *)curobj->Get_Image_Data();
//}
/*
** Erase the grid
*/
code/REDALERT/NEWBLIT.CPP
+16
View File
@@ -34,6 +34,22 @@ void GL_RenderImage(Image_t* image, int x, int y, int width, int height, int col
}
void GL_RenderForeGroundImage(Image_t* image, int x, int y, int width, int height, int colorRemap, int shapeId) {
ImVec2 mi(x, y);
ImVec2 ma(x + width, y + height);
if (image->numFrames > 0) {
if (image->HouseImages[colorRemap].image[shapeId][((int)animFrameNum) % image->numFrames] == 0)
ImGui::GetForegroundDrawList()->AddImage((ImTextureID)image->HouseImages[colorRemap].image[shapeId][0], mi, ma);
else
ImGui::GetForegroundDrawList()->AddImage((ImTextureID)image->HouseImages[colorRemap].image[shapeId][((int)animFrameNum) % image->numFrames], mi, ma);
}
else {
ImGui::GetForegroundDrawList()->AddImage((ImTextureID)image->HouseImages[colorRemap].image[shapeId][0], mi, ma);
}
}
void GL_FillRect(int color, int x, int y, int width, int height) {
ImVec2 mi(x, y);
ImVec2 ma(x + width, y + height);
code/REDALERT/NEWBLIT.H
+1
View File
@@ -3,6 +3,7 @@
struct Image_t;
void GL_RenderImage(Image_t* image, int x, int y, int width, int height, int colorRemap = 0, int shapeId = 0);
void GL_RenderForeGroundImage(Image_t* image, int x, int y, int width, int height, int colorRemap = 0, int shapeId = 0);
void GL_DrawText(int color, int x, int y, char* text);
void GL_FillRect(int color, int x, int y, int width, int height);
void GL_DrawLine(int color, int x, int y, int dx, int dy);