Commit Graph

42 Commits

Author SHA1 Message Date
Ben Lankamp 3ced844e55 * Disable VSYNC
* Fixed input for text etc. (focus messages got lost)
2020-06-21 23:48:48 +02:00
Ben Lankamp e7697aa3ac * Fixed input loops/too much callbacks. 2020-06-20 23:33:26 +02:00
Ben Lankamp 7962ff2124 Merge of Marshall/master into BL/master.
Merge of SDL code from feature branch into BL/master.
2020-06-20 11:41:29 +02:00
Justin Marshall c511b0f9bf Added image cache for remaster assets. 2020-06-19 22:02:50 -07:00
Justin Marshall e3c5e96c81 Removed CPU side memory buffer for textures 2020-06-19 20:57:48 -07:00
Justin Marshall b8a912f3a6 Remaster palettes now work correctly. 2020-06-19 19:37:06 -07:00
Justin Marshall 28e37d2d6e Removed bad add in remaster palette rasterization. 2020-06-19 17:54:59 -07:00
Justin Marshall 8a94ae2a46 Some progress on the palette remapping bits. 2020-06-19 17:32:09 -07:00
Justin Marshall 681c762dce Added house palette to remaster textures, AO is missing. 2020-06-19 15:26:41 -07:00
Justin Marshall 3f1e353296 Added hash comparisons to image load code. 2020-06-19 08:57:02 -07:00
Justin Marshall f36a4ddf2f Added initial code to display buildings from the remaster. 2020-06-18 21:31:52 -07:00
Justin Marshall a516544743 8bit images are now linear sampled. 2020-06-18 16:53:01 -07:00
Justin Marshall 647519138b Switched in game rendering to OpenGL. 2020-06-18 16:45:01 -07:00
Ben Lankamp 829f27c76f Rewrote UserInput <> SDL interaction. 2020-06-18 16:11:40 +02:00
Justin Marshall df88871b13 Added 8bit image upload code. 2020-06-17 17:08:45 -07:00
Justin Marshall d9ed612d99 Fixed a bug were key/flags from SDL input weren't being cleared every frame. 2020-06-16 16:33:24 -07:00
Justin Marshall 9183814eb8 Fixed a bug were TemplateTypeClass::Display was displaying incorrect pixels. Enabling the editor no longer shows the system cursor. Placement_Editor now renders correctly again. Linear_Blit_Linear and Linear_Scale_To_Linear now work with 32bit images. 2020-06-16 15:39:32 -07:00
Justin Marshall f70f3331a0 Mouse L/R Key now goes through the keyboard system. 2020-06-16 12:58:20 -07:00
Justin Marshall 3cbdd10813 SDL event processing is now done in Call_back. Fixed garbage pixels when opening in game menu dialog. Surrender dialog will now always render. Moved WWKeyboardClass::Head/WWKeyboardClass::Tail to static vars in prep for re-write. 2020-06-16 11:54:13 -07:00
Justin Marshall 19b6c46149 Added 32bit image(single frame) overrides for buildings. Image_t now stores raw pixel data. 2020-06-16 07:25:15 -07:00
Ben Lankamp 7091282433 * Handle text input properly from SDL
* Removed duplicate keyboard.cpp
2020-06-16 15:11:17 +02:00
Justin Marshall 4a6f105967 Converted the 8bit palette render functions to render into a 32bit buffer. 2020-06-15 15:27:19 -07:00
Ben Lankamp 2007adbda3 * Change font to Arial
* Load/save dialog in proper place
2020-06-15 21:31:03 +02:00
Ben Lankamp 4d5babd812 * Mission Timer at proper place
* Map view dimensions fixed
2020-06-15 21:20:57 +02:00
jmarshall23 c8c5ef4e34 Merge branch 'master' into master 2020-06-15 11:07:10 -07:00
Ben Lankamp 47894bc6d4 * Proper fix for Window padding in ImGui. 2020-06-15 19:59:17 +02:00
Justin Marshall 393bc868f6 Fixed scorescreen page flip issue. 2020-06-14 18:58:32 -07:00
Justin Marshall c9e027e1a0 Scorescreen no longer crashes but page flips all over the place. Disable color clear each frame. 2020-06-14 18:28:42 -07:00
Justin Marshall efd9ee934c Switched menu render over to OGL. 2020-06-14 14:56:34 -07:00
Ben Lankamp 105fde711a * Remove unneeded code in game exit 2020-06-14 22:18:34 +02:00
Ben Lankamp 83e331b9ab * Remove old WinPrc code, proper shutdown in SDL events. 2020-06-14 22:05:12 +02:00
Ben Lankamp c412287a3e * Fixes for power, sidebar, etc.
* Padding on display?
2020-06-14 21:39:40 +02:00
Justin Marshall 26845809da Switched to Arial font to match font used in the original game. 2020-06-14 10:03:36 -07:00
Justin Marshall 7f00bc46d4 Removed old wndproc code which fixes ESP crash. 2020-06-14 09:25:28 -07:00
Justin Marshall 0a1ef9aa84 Initial checkin of the new UI blit code(there are issues and will be fixed one by one). 2020-06-14 09:20:39 -07:00
Ben Lankamp a47304608b * Mouse cursor working properly on mouse move
* Tooltip over undiscovered terrain
2020-06-14 17:02:03 +02:00
Ben Lankamp 52f249f2c0 Merge from Marshall 2020-06-14 15:06:07 +02:00
Ben Lankamp 7fb577abf7 Restructuring of code 2020-06-14 15:03:29 +02:00
Justin Marshall e7f1372fdd Cursor now renders in OpenGL. 2020-06-13 18:57:47 -07:00
Justin Marshall fb58966e1b Cleaned up imgui integration. 2020-06-13 15:52:07 -07:00
Justin Marshall f261a00a0a Initial Developer Console code. 2020-06-12 13:16:21 -07:00
Justin Marshall ba0c51a7f2 Moved code into the code folder. 2020-06-12 08:15:26 -07:00