zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-12-14 06:11:36 +00:00
Code Issues Projects Releases Packages Wiki Activity
15014 commits 6 branches 6 tags 107 MiB
Commit graph

445 commits

Author SHA1 Message Date
alexey.lysiuk
b12c8a8f79 RDTSC-based glcycle_t for macOS 
Time profiler implementation is now closer to Windows version
 2017-01-31 16:00:14 +02:00
alexey.lysiuk
1cdfcb4935 RDTSC-based cycle_t for macOS 
Windows and macOS now share most of related code
Old implementation using mach_absolute_time() was more precise (at least in theory) but too costly
 2017-01-31 15:57:47 +02:00
Magnus Norddahl
9c4b11b671 Add OpenGL ES support to Linux target and enable it for ARM devices 2017-01-25 07:18:26 +01:00
Magnus Norddahl
eb2b5269f9 Fix linux compile errors 2017-01-25 03:28:11 +01:00
Magnus Norddahl
934f6a88bb Fix compile error 2017-01-24 17:10:28 +01:00
Magnus Norddahl
55d9392fb8 Add fallback code to Linux target so if OpenGL is either unavailable or can't be used it falls back to the old software SDL FB 2017-01-24 01:43:45 +01:00
Rachael Alexanderson
03226e5a0a Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_things.cpp
 2017-01-23 00:17:25 -05:00
alexey.lysiuk
da4981ef91 Fixed invisible mouse cursor in SDL backend 
See https://mantis.zdoom.org/view.php?id=71
 2017-01-22 10:25:37 +02:00
Magnus Norddahl
1d941c9839 Merge remote-tracking branch 'gzdoom/master' into qzdoom 
# Conflicts:
#	src/r_plane.cpp
#	src/win32/zdoom.rc
 2017-01-13 13:21:10 +01:00
alexey.lysiuk
4001e7e6bd Fixed compilation with macOS SDK earlier than 10.7 2017-01-13 10:52:35 +02:00
Rachael Alexanderson
05662e5c4d Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/r_bsp.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
 2017-01-09 09:51:06 -05:00
Kyle Evans
8cc52dab5e Fix build on GCC/Clang 
Obtained from: kcat/Csonicgo (IRC)
 2017-01-09 10:11:13 +02:00
alexey.lysiuk
2f9d5e285d Removed deprecated code from macOS SDL backend 2016-12-27 13:18:33 +02:00
alexey.lysiuk
186c7b8814 Removed deprecated code from macOS SDL backend 2016-12-27 12:56:21 +02:00
alexey.lysiuk
96228fd645 Fixed compilation of non-Windows backends 2016-12-27 12:55:26 +02:00
Rachael Alexanderson
2200f6eda3 - fixed: compile error with SDLGLVideo class macro 2016-12-07 13:21:28 +01:00
Christoph Oelckers
56f67726f0 - seems a Linux file was missed when refactoring the IMPLEMENT_CLASS macros. 2016-12-07 00:54:40 +01:00
Rachael Alexanderson
8a23befd4d - Fixed abstract class macro in SDLGLFB class. 2016-12-06 18:22:36 -05:00
Rachael Alexanderson
a78b713f4b Merge https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/v_video.cpp
 2016-12-06 18:19:08 -05:00
Christoph Oelckers
c3fb43db3a Merge branch 'gz-zscript' 2016-12-06 22:47:37 +01:00
Christoph Oelckers
c927aca2a0 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 
# Conflicts:
#	wadsrc/static/zscript.txt
 2016-11-30 18:46:23 +01:00
Christoph Oelckers
b0ddba2240 Merge branch 'master' of c:\Programming\Doom-Dev\zdoom_\ into zscript 2016-11-27 16:31:26 +01:00
Rachael Alexanderson
383a59259a Revert "Merge commit 'refs/pull/122/head' of https://github.com/coelckers/gzdoom" 
This reverts commit 71b4f57058, reversing
changes made to 449d4963ae.
 2016-11-25 21:02:18 -05:00
Rachael Alexanderson
509108f8b6 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-11-24 23:46:33 -05:00
Christoph Oelckers
66d28a24b8 - disabled the scripted virtual function module after finding out that it only works if each single class that may serve as a parent for scripting is explicitly declared. 
Needless to say, this is simply too volatile and would require constant active maintenance, not to mention a huge amount of work up front to get going.
It also hid a nasty problem with the Destroy method. Due to the way the garbage collector works, Destroy cannot be exposed to scripts as-is. It may be called from scripts but it may not be overridden from scripts because the garbage collector can call this function after all data needed for calling a scripted override has already been destroyed because if that data is also being collected there is no guarantee that proper order of destruction is observed. So for now Destroy is just a normal native method to scripted classes
 2016-11-25 00:25:26 +01:00
Christoph Oelckers
49605bc109 Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-11-24 09:59:48 +01:00
Magnus Norddahl
4eb32a50e3 Add vid_vsync support to Linux target 2016-11-24 09:59:40 +01:00
Christoph Oelckers
aa4b3bb230 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-24 09:58:29 +01:00
Edoardo Prezioso
68dc3c4f2d - Preventive fix for future include conflicts. 
basicinlines.h is only included in m_fixed.h, while basictypes.h is included only in headers, so it's better to respect this convention. OSX compiles fine also without m_fixed.h, even better.
 2016-11-24 09:09:09 +01:00
Magnus Norddahl
7b4df20c51 Merge branch 'linux_vsync' into qzdoom 2016-11-24 07:41:58 +01:00
Magnus Norddahl
33958ca5b2 Add vid_vsync support to Linux target 2016-11-24 07:37:15 +01:00
Christoph Oelckers
d1f5d916c2 Merge branch 'master' into zscript 2016-11-23 14:39:14 +01:00
Magnus Norddahl
ff738de279 Bgra support 2016-11-23 01:01:28 +01:00
Magnus Norddahl
f313bfd2cc Merge branch 'gl_swframebuffer' into qzdoom 2016-11-23 00:56:39 +01:00
Magnus Norddahl
7beac65471 Add Linux support for GLSWFrameBuffer 2016-11-23 00:55:07 +01:00
Rachael Alexanderson
fc011e42dd Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-19 12:46:01 -05:00
alexey.lysiuk
c28bcca3f3 Print unknown if release information is unavailable on macOS 
At least 10.4 Tiger doesn't support required sysctl name
 2016-11-19 16:42:16 +01:00
alexey.lysiuk
60ac12be0a Fixed compilation warnings in Cocoa backend 2016-11-19 16:42:16 +01:00
Rachael Alexanderson
71b4f57058 Merge commit 'refs/pull/122/head' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/posix/sdl/hardware.cpp
#	src/win32/hardware.cpp
 2016-11-16 01:03:32 -05:00
Rachael Alexanderson
813030efef - Fully implemented CVAR_OVERRIDEGET for vid_renderer from the ZDoom code submission. 2016-11-15 20:03:50 -05:00
Christoph Oelckers
3a2d0e3486 - copied all necessary adjustments from the test branch in the QZDoom repo. 2016-11-15 11:49:27 +01:00
Christoph Oelckers
6e223ebc21 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript 
# Conflicts:
#	src/CMakeLists.txt
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/decorate.txt
 2016-11-15 11:36:59 +01:00
Christoph Oelckers
196986ae6b Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-15 11:25:42 +01:00
Christoph Oelckers
85ff172ee3 Merge remote-tracking branch 'remotes/origin/master' into zscript 2016-11-14 15:03:14 +01:00
Rachael Alexanderson
470046ec5a Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-13 07:30:34 -05:00
Braden Obrzut
472f35d2ce - Fixed building with gtk2 headers. 2016-11-13 00:17:09 -05:00
Rachael Alexanderson
87e9ba0f05 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-12 22:31:05 -05:00
Braden Obrzut
9342898361 - Added support for GTK3 (thanks to "MineyMe" and edward-san) 
- Replaced GTK/OS X (note different from Cocoa) clipboard code with SDL clipboard API.
- Removed requirement to link to GTK in order to compile with GTK support.
	- GTK is no longer init'd if the GTK IWAD picker is not used.
	- Our usage of GTK is such that the dynamic loader can work with both GTK2 and GTK3 depending on what's installed.
	- Since we're accumulating a lot of library loaders I've built a generic interface as FModule which replaces TOptWin32Proc and the loaders in the OpenAL and Fluidsynth code.
 2016-11-12 18:32:09 -05:00
Leonard2
7dbc4710f1 Add the new argument to all uses of the implement macro 2016-11-09 17:45:55 +01:00
Leonard2
bb2d61de50 Replaced the many implement macros with a single one that takes arguments instead 2016-11-09 17:45:53 +01:00
Christoph Oelckers
747b612860 Merge branch 'master' of https://github.com/rheit/zdoom 2016-11-03 19:42:03 +01:00
Rachael Alexanderson
de2122e2aa Merge branch 'master' of http://github.com/rheit/zdoom 2016-10-30 21:36:13 -04:00
Kyle Evans
1502eae2ac Add XPM (X PixMap) version of ZDoom icon 2016-10-30 19:31:32 +01:00
Magnus Norddahl
8b297221fe Merge branch 'gl_swframebuffer' into qzdoom 2016-10-16 23:18:16 +02:00
Magnus Norddahl
f81d0d3964 macOS support and Intel driver bug fixes 2016-10-16 22:40:08 +02:00
Magnus Norddahl
f37ee3a024 Add bgra support to OpenGLSWFrameBuffer 2016-10-11 15:43:12 +02:00
raa-eruanna
2a7b902a0a Merge http://github.com/coelckers/gzdoom 
# Conflicts:
#	src/gl/renderer/gl_renderer.cpp
 2016-10-10 10:39:07 -04:00
Christoph Oelckers
14a6e7989b Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/menudef.txt
 2016-10-10 11:38:08 +02:00
alexey.lysiuk
9a72ef1bf1 Added detection of current macOS version 2016-10-08 15:47:16 +03:00
raa-eruanna
0bc54cbda4 Fixed SDL backend. This project is now Linux capable! 2016-09-25 17:40:37 -04:00
alexey.lysiuk
e9b1da57a3 Fixed compilation on macOS 2016-09-25 17:43:52 +03:00
raa-eruanna
2a9e97688d Merge http://github.com/coelckers/gzdoom 2016-09-22 05:23:02 -04:00
Christoph Oelckers
1e6b99cebd Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-22 09:06:34 +02:00
alexey.lysiuk
2d55f713c2 Fixed support for automatic graphics switching on macOS 
The corresponding setting in .plist is wrong but Xcode fixes it automatically
This doesn't happen however when building via makefiles
 2016-09-22 08:52:43 +02:00
raa-eruanna
d9e60644b1 Some Linux SDL fixes. Will have to do this for Mac, later, too. 2016-09-21 01:08:00 -04:00
raa-eruanna
842558384a Forgot to set vid_renderer defaults for Linux and Mac. 2016-09-14 07:33:31 -04:00
raa-eruanna
b0029fcd1e Set version to 0.0 (prerelease), set render defaults for true-color software renderer since that is the focus of this project 2016-09-14 06:38:08 -04:00
raa-eruanna
b17b7446cb Merge http://github.com/coelckers/gzdoom 2016-09-14 03:15:56 -04:00
alexey.lysiuk
66c5121e38 Do not use OpenGL Core Profile for software renderer on macOS 2016-09-10 17:54:19 +03:00
raa-eruanna
dede94b7e2 Merge branch 'master' of https://github.com/coelckers/gzdoom 
# Conflicts:
#	src/posix/cocoa/i_video.mm
#	src/win32/hardware.cpp
#	wadsrc/static/menudef.txt
 2016-09-08 03:26:11 -04:00
raa-eruanna
32f758de41 Merge branch 'truecolor' of https://github.com/dpjudas/zdoom 
# Conflicts:
#	src/v_video.cpp
 2016-09-08 03:19:08 -04:00
alexey.lysiuk
108dcf122a Updated support for legacy renderer in Cocoa backend 
Added fallback to legacy profile when creation of pixel format for core context failed
Added handling of -glversion command line switch
 2016-09-04 15:25:37 +03:00
Christoph Oelckers
c3ad0a2f16 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-03 17:29:47 +02:00
Christoph Oelckers
f31346968f - added missing #include. 2016-09-03 17:29:28 +02:00
Christoph Oelckers
e08015a181 Merge branch 'master' of https://github.com/rheit/zdoom 2016-09-03 14:02:28 +02:00
Christoph Oelckers
5770e5dfaf - split up m_specialpaths.cpp to be a separate file for each operating system. 
The reason for this is that the macOS version uses a deprecated API and in order to correct this, the file needs to be compiled as Objective-C++ which requires a different extension.
 2016-09-03 12:00:08 +02:00
alexey.lysiuk
3ba3149df3 Deleted remains of obsolete multisampling in Cocoa backend 2016-08-29 22:08:57 +03:00
alexey.lysiuk
b7ec26335f Enabled OpenGL Core Profile on macOS 2016-08-29 22:03:25 +03:00
Magnus Norddahl
945d5b154a Remove gl_vid_multisample 2016-08-28 18:10:39 +02:00
Christoph Oelckers
abafcd5486 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	wadsrc/static/language.enu
 2016-08-28 10:00:19 +02:00
Christoph Oelckers
e04055dbb2 - added multiple message levels for 'developer' CVAR so that the important stuff won't get drowned in pointless notification spam that's of no use to anyone. 
- made 'developer' CVAR persist across launches and added some menu entries for it.
- added checks for 'developer' to ACS's CheckInventory function.
 2016-08-28 09:55:04 +02:00
alexey.lysiuk
f79c442df5 Fixed compilation of SDL backend 2016-08-24 16:44:40 +03:00
Magnus Norddahl
276fb7dbb2 Add vid_maxfps support for Windows and Linux 2016-08-22 22:00:44 +02:00
Magnus Norddahl
0c2db5447c Save gl_debug in ini file and add support in Linux 2016-08-17 20:57:00 +02:00
Magnus Norddahl
4e38f31a86 Change GetClientWidth/GetClientHeight on macOS to grab size from view. 
Fix that GetClientWidth/Height returns 0 when queried before initial show.
Allow window to be resizable on macOS.
 2016-08-14 09:05:51 +02:00
Magnus Norddahl
c817979eae Remove GetTrueHeight from GL renderer and concentrate all viewport calculations in SetOutputViewport 2016-08-14 09:05:48 +02:00
Magnus Norddahl
9953d70eaa Merge remote-tracking branch 'upstream/master' into truecolor 2016-08-06 20:45:35 +02:00
alexey.lysiuk
d3457f4508 Implemented hardware gamma support for macOS 
Hardware gamma is limited to main display only, use shader-based correction for other displays
 2016-07-31 12:19:08 +03:00
Christoph Oelckers
a69182f9ef Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-31 09:19:36 +02:00
alexey.lysiuk
bd3fd22ac9 Do not use unicode characters in macOS console window 
The same characters as in stdout are now used to draw bars in console window on macOS
All messages are treated as in ISO Latin 1 encoding and bars looked like garbage output
 2016-07-30 16:21:48 +03:00
alexey.lysiuk
c0b86278e3 Removed old cruft from macOS OpenGL backend 
The only thing left unimplemented is gl_smooth_rendered CVAR
 2016-07-30 12:57:30 +03:00
Magnus Norddahl
e82c38e4f9 Update copyright and typo fix 2016-07-27 11:15:20 +02:00
Magnus Norddahl
aeb7df09de Added hardware gamma option and improved window handling on Windows 2016-07-27 11:15:19 +02:00
Christoph Oelckers
881731d76b Merge branch 'master' of https://github.com/rheit/zdoom 2016-07-21 08:28:56 +02:00
Magnus Norddahl
421cd2f403 Merge remote-tracking branch 'upstream/master' into truecolor 2016-07-17 23:36:35 +02:00
alexey.lysiuk
39042dc4bf macOS application controller is now using proper delegate protocol 
Fixes compilation error with Xcode 8:
cannot initialize a parameter of type 'id<NSApplicationDelegate> _Nullable' with an lvalue of type 'ApplicationController *'
 2016-07-17 08:02:55 +02:00
Magnus Norddahl
40b76dc9b0 Apply gamma when using true color output on Linux and Mac 2016-06-11 18:41:56 +02:00
Magnus Norddahl
9420826094 Merge remote-tracking branch 'upstream/master' 2016-06-10 16:59:20 +02:00
Magnus Norddahl
02a39ef457 Added bgra support to SDL target 2016-06-02 20:05:08 +02:00
Christoph Oelckers
18ebe92cfc Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/g_level.cpp
 2016-06-01 11:45:57 +02:00
Magnus Norddahl
4f635983fc Add bgra support to OS X target 2016-06-01 08:54:39 +02:00
Magnus Norddahl
b9d7a98aec Change swtruecolor cvar to take effect immediately 2016-06-01 06:02:37 +02:00
Magnus Norddahl
05220a7133 Added IsBgra() to DCanvas 
Changed SWRender output format to be decided by IsBgra()
 2016-05-31 09:36:18 +02:00
alexey.lysiuk
89016020a8 Used ISO Latin 1 encoding for title text in startup window on OS X 
Windows version uses ANSI_CHARSET to handle the corresponding text
This solves the problem like in https://github.com/alexey-lysiuk/gzdoom/issues/63:
*** Assertion failure in -[NSTextFieldCell _objectValue:forString:errorDescription:], /Library/Caches/com.apple.xbs/Sources/AppKit/AppKit-1404.47/AppKit.subproj/NSCell.m:1684
Invalid parameter not satisfying: aString != nil
 2016-05-29 10:58:12 +03:00
Christoph Oelckers
a0dc4ae738 Merge branch 'master' of https://github.com/rheit/zdoom 2016-05-24 13:53:52 +02:00
alexey.lysiuk
aa6753383d Fixed fullscreen mode on non-default monitor in OS X backend 
Fullscreen window was incorrectly placed on the main screen instead of the current one
Honestly I have no idea what was the reason behind that [NSWindow setFrameOrigin:] call
Apparently it's redundant and moreover it's incorrect for multi-monitor configuration
 2016-05-22 13:22:07 +03:00
Christoph Oelckers
0cc57c6141 - fixed: BoundTextureDraw2D must reset the texture mode. 2016-05-10 20:50:01 +02:00
alexey.lysiuk
333560086d Calculate color values for gamma correction directly in shader 
Gamma table texture is no longer needed
 2016-05-02 11:24:42 +03:00
alexey.lysiuk
44b019413c Implemented gamma correction in OS X native backend using shader effect 2016-05-02 10:04:09 +03:00
alexey.lysiuk
138c6ea25e Fixed black screen issue in OS X native backend 
There was inconsistency with global render state
 2016-05-01 11:45:57 +03:00
alexey.lysiuk
8fa5fb6a95 Disabled gamma shader in OS X native backend 2016-04-30 13:35:03 +03:00
alexey.lysiuk
3816b46938 Fixed compilation of OS X with native backend 
TODO: check Linux build
 2016-04-30 11:53:31 +03:00
Christoph Oelckers
6e1b21d513 - added back sprite splitting for low end, plus some dynamic light code. 2016-04-26 21:31:24 +02:00
Christoph Oelckers
7ce670951b Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/CMakeLists.txt
 2016-04-11 10:49:11 +02:00
Christoph Oelckers
db86385cf6 - removed STACK_ARGS. 
The only reason this even existed was that ZDoom's original VC projects used __fastcall. The CMake generated project do not, they stick to __cdecl.
Since no performance gain can be seen by using __fastcall the best course of action is to just remove all traces of it from the source and forget that it ever existed.
 2016-04-11 10:46:30 +02:00
alexey.lysiuk
93c334059a Made title text always visible in OS X startup window 
Added temporary solution for the same foreground and background colors of the title in OS X startup window
It's used in graphical startup screen, with Hexen style in particular (for example WolfenDoom - Blade of Agony)
Native OS X backend doesn't implement this yet
 2016-04-10 14:06:18 +02:00
Christoph Oelckers
12129b0f07 - added a system-include independent wrapper for Windows's OutputDebugString, so that this can be used more easily in files that cannot include windows.h. 2016-04-10 13:03:44 +02:00
Christoph Oelckers
f7553fcd51 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_defs.h
 2016-04-02 22:17:33 +02:00
Christoph Oelckers
046ee3e803 - removed a few leftover FRACUNITs. 2016-04-02 20:07:18 +02:00
Christoph Oelckers
8680391e0b - floatified the global view variables. 
The software renderer still uses internal copies of the fixed point version.
 2016-04-01 12:22:16 +02:00
Christoph Oelckers
ae14268989 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_utility.cpp
 2016-03-29 10:09:03 +02:00
Christoph Oelckers
fb8e03d5eb - floatified FLineOpening. 
- some smaller fixes.
 2016-03-25 18:43:37 +01:00
Christoph Oelckers
609defe078 Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/r_defs.h
 2016-03-24 12:48:05 +01:00
Christoph Oelckers
09d8b4af80 - changed I_GetTimeFrac to return a double instead of a fixed_t. 2016-03-24 12:00:21 +01:00
Christoph Oelckers
48afdd7dcb Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt 
# Conflicts:
#	src/CMakeLists.txt
#	src/actor.h
 2016-03-21 01:34:39 +01:00
Christoph Oelckers
671291227e - first stage of converting actor angles to float complete 
Patched up everything so that it compiles without errors again. This only addresses code related to some compile error. A large portion of the angle code still uses angle_t and converts back and forth.
 2016-03-16 12:41:26 +01:00
Christoph Oelckers
f4f489b33d Merge branch 'master' of https://github.com/rheit/zdoom 2016-03-14 22:02:58 +01:00
Braden Obrzut
93be5aca05 - Fixed: Modern versions of GCC on PowerPC inserted padding to the end of pragma packed structures. 
- Worked aorund modern GCC bug where C++ exceptions in Objective-C++ code would result in an ICE (bug is already on their tracker, but I doubt it will be fixed unless I decide to dig into the issue myself).
- Turn off fused floating point instructions since these can cause slight deviations in floating point code.
- Use -static-libgcc when compiling on the Mac with GCC since we need to use a custom version of GCC to do so now.
- Note: ZDoom will currently still crash on exit on PowerPC since it seems to be deciding that NameManager needs to be destructed before the console commands.
 2016-03-13 01:14:08 -05:00
Christoph Oelckers
0bcbacea53 Merge branch 'master' of https://github.com/rheit/zdoom 
# Conflicts:
#	src/posix/sdl/hardware.cpp
 2016-03-04 01:21:59 +01:00
Randy Heit
16d8af6b77 Add some 21:9 resolutions 2016-03-03 17:59:55 -06:00
Randy Heit
79f0714341 Update ratios[] tables for SDL and Cocoa 2016-03-03 17:32:30 -06:00
Michael Labbe
a4705c8404 vid_listmodes crash fix 2016-03-03 17:31:12 -06:00
Michael Labbe
97821a3036 21:9 aspect ratio support 
- vid_aspect 6 forces 21:9
 2016-03-03 17:31:12 -06:00
Christoph Oelckers
e3c06e3df7 Merge commit '165d26baa1569685651baf4575e12e73c8cbfd2e' 
# Conflicts:
#	bzip2/bzip2.vcproj
#	game-music-emu/game-music-emu.vcproj
#	gdtoa/gdtoa.vcproj
#	jpeg-6b/jpeg-6b.vcproj
#	src/p_spec.cpp
#	src/r_defs.h
#	tools/fixrtext/fixrtext.vcproj
#	tools/lemon/lemon.vcproj
#	tools/updaterevision/updaterevision.vcproj
#	tools/zipdir/zipdir.vcproj
#	wadsrc/static/xlat/eternity.txt
#	wadsrc/wadsrc.vcproj
#	zlib/zlib.vcproj
 2016-03-01 17:23:35 +01:00
alexey.lysiuk
0822485593 Used ISO Latin 1 encoding for text in startup window on OS X 
Attempts to output errors with bad characters encountered during text lumps parsing were failed miserably because of UTF-8 conversion
Example: loading of GZ-Models-r16.pk3 with GZDoom caused 'NSConcreteAttributedString initWithString:: nil value' exception
 2016-02-28 23:15:23 +01:00
alexey.lysiuk
243f59d96d Made sure that the last text line is always visible in OS X startup window 
These case are handled specifically:
* When waiting for clients or host to join
* When showing a fatal error
 2016-02-28 23:15:22 +01:00
alexey.lysiuk
067b421f39 Fixed default width of progress bar in OS X startup window 
If window was resized before progress bar appears it will have hardcoded and so incorrect width
 2016-02-28 23:15:21 +01:00
alexey.lysiuk
64f80456ad Initialized scroll view with the same rectangle as other controls in OS X startup window 2016-02-28 23:15:20 +01:00
alexey.lysiuk
145b7be0a1 Fixed particular slowdown in OS X startup window 
During loading of .pk3 that stores hundred of .wad's significant amount of time were spent on scrolling text to the last line
The same applies to other cases like output of thousands warnings/errors
 2016-02-28 23:15:19 +01:00
alexey.lysiuk
c687394f72 Added generic way to do periodic updates of OS X startup window 
It's used to avoid updating of window (progress bar in particular) too often
Most of time were spent on UI events processing but not on data loading
 2016-02-28 23:15:18 +01:00
alexey.lysiuk
0fba6563c7 Disabled fullscreen mode for OS X startup window 
There is no use for auxiliary fullscreen window because it behaves really weird
 2016-02-28 23:15:17 +01:00
Christoph Oelckers
e305f5211a Merge branch 'zmaster' 2016-02-27 23:36:52 +01:00
alexey.lysiuk
9e016bbfc3 Removed useless operations from OS X system code 
No more 'expression result unused' warnings
 2016-02-27 12:48:26 +02:00
alexey.lysiuk
202aea61e5 Fixed incorrect comparison in OS X console window 
No more 'comparison between pointer and integer' error
 2016-02-27 12:48:12 +02:00
Christoph Oelckers
e73e26c15a Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-31 21:11:21 +01:00
alexey.lysiuk
7b0f557514 Enabled zoom window button on OS X 
Independently from OS version the game will enter fullscreen mode when zoom button is clicked
Window zooming behavior introduced in Yosemite is available on all supported versions of OS X
 2016-01-31 10:42:16 +02:00
Christoph Oelckers
d8d4679471 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-25 21:13:04 +01:00
alexey.lysiuk
4b210a839a Fixed uninitialized variable in IOKit controller handler 2016-01-24 14:43:55 +02:00
Christoph Oelckers
3f34083e88 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/actor.h
 2016-01-17 22:16:27 +01:00
alexey.lysiuk
24501dbc93 Fixed copy to pasteboard on legacy OS X 
Copy/paste is now implemented using the method available on all supported versions
This fixes 'unrecognized selector' exception on OS X 10.4 and 10.5
 2016-01-17 11:58:44 +02:00
alexey.lysiuk
bfc116b2a4 Fixed exit crash on legacy OS X 
There is no need to close (and thus deallocate) console window explicitly
This will be done by autorelease pool in application controller event loop
OS X with GC and/or ARC was not affected by this issue
Older versions like 10.4 or 10.5 crashed because of double deallocation
 2016-01-17 11:51:46 +02:00
Christoph Oelckers
aa69c39ff1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
 2016-01-12 11:23:45 +01:00
Braden Obrzut
0c3b468e42 Merge branch 'osx_start_wnd' 2016-01-11 20:47:06 -05:00
Christoph Oelckers
f391216ab9 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-09 19:48:01 +01:00
alexey.lysiuk
b27fdcffb5 Added shortcut to toggle fullscreen on OS X 
Press Command+F to toggle fullscreen mode in native OS X backend
Set k_allowfullscreentoggle CVAR to false to disable the shortcut
 2016-01-09 17:12:58 +02:00
Christoph Oelckers
23ff54c942 Merge branch 'zmaster' 2016-01-09 01:23:45 +01:00
coelckers
500c1623d0 Merge pull request #467 from kevans91/freebsd-build 
I missed one last spot where a FreeBSD compilation should follow the …
 2016-01-08 09:58:55 +01:00
Kyle Evans
d20f18a4bb I missed one last spot where a FreeBSD compilation should follow the path of OS X -- <signal.h> needs to be pulled in for signal functions 2016-01-07 22:48:25 -06:00
Braden Obrzut
a1e0ac0b71 Merge branch 'osx_start_wnd' of git://github.com/alexey-lysiuk/gzdoom into osx_start_wnd 2016-01-04 22:11:46 -05:00
Christoph Oelckers
0e9eb2f305 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 11:55:07 +01:00
alexey.lysiuk
699f274b06 Fixed mouse cursor centering in fullscreen mode 
Native OS X backed didn't center mouse cursor in fullscreen mode with Retina/HiDPI support enabled
Incorrect size of content view led to placement of cursor in upper right corner of the screen upon releasing of mouse capture
When some action is assigned to this corner using system Hot Corners feature, the given action was triggered on acquiring mouse capture
 2016-01-04 10:51:54 +02:00
alexey.lysiuk
94fec26cb6 Fixed runtime warning on OS X 10.4 Tiger 
The 'invalid pixel format attribute' warning was introduced with automated graphics switching control
 2015-12-31 11:00:05 +02:00
alexey.lysiuk
63993dee96 Hid resize indicator on OS X startup window 
The resize indicator overlapped with progress bar and Quit/Cancel button on 10.6 and older versions
OS X 10.7 and newer don't have this indicator at all
 2015-12-30 16:05:16 +02:00
alexey.lysiuk
3466a8c7a9 Disabled miniaturization for OS X startup window 
Old versions of OS X don't support changing of window style mask
 2015-12-30 12:19:50 +02:00
alexey.lysiuk
db207feed1 Added missing header #include for old OS X SDKs 2015-12-30 12:17:38 +02:00
alexey.lysiuk
3af95e0aea Added native startup window for OS X 2015-12-29 15:19:42 +02:00
alexey.lysiuk
673e1b4faf Fixed compilation warning when building with OS X 10.11 SDK 
The warning was 'null passed to a callee that requires a non-null argument'
 2015-12-29 15:14:41 +02:00
alexey.lysiuk
2c3d9e3ab8 Fixed mouse capturing when video isn't initialized yet 2015-12-29 14:52:31 +02:00
alexey.lysiuk
15a269db9d Extended NSWindow with ability to exit application upon closing by user 2015-12-29 14:52:27 +02:00
alexey.lysiuk
3676a42512 Added missing include guard in i_common.h 2015-12-29 14:52:22 +02:00
alexey.lysiuk
0efdccd942 Separated POSIX's i_system.cpp from native OS X implementation 2015-12-29 14:52:18 +02:00
alexey.lysiuk
6f3e04785d Added preprocessor macros for AppKit framework versions 
These macros are needed to build with earlier OS X SDKs
 2015-12-29 14:52:11 +02:00
Christoph Oelckers
a5b43dfb66 Merge branch 'master' of https://github.com/rheit/zdoom 2015-11-03 23:55:41 +01:00
alexey.lysiuk
916b5f796d Updated list of video resolutions for Cocoa backend 
Added resolutions for iMac Retina 4K 21.5"
Added comments about a few resolutions specific to Macs
 2015-10-14 13:17:21 +03:00
Christoph Oelckers
61e09da1be Merge branch 'master' of https://github.com/rheit/zdoom 2015-09-06 08:41:27 +02:00
alexey.lysiuk
677dc8893e Fixed compilation on non-Windows OSes 2015-08-29 14:55:10 +03:00
Christoph Oelckers
d58d38a1d3 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/p_3dfloors.cpp
 2015-07-13 21:36:19 +02:00
Braden Obrzut
3adda344b6 - Missing common resolution 1680x1050 added to resolution list of SDL and Cocoa. 2015-07-06 02:58:01 -04:00
Christoph Oelckers
fbefe13bb2 Merge branch 'master' of https://github.com/rheit/zdoom 2015-06-04 09:27:17 +02:00
Braden Obrzut
354ec022b3 - On Windows resizing a window just renders the image to the size of the window, so lets do the same for SDL (makes mouse coordinate scaling easier). 2015-05-20 12:32:17 -04:00
Braden Obrzut
4d082d93cd - Use SDL_RenderSetLogicalSize to handle animorphic ratios in fullscreen with SDL backend. 
- Reuse the old window in the SDL backend since in some instances switching windows causes issues (OS X fullscreen for instance (while using the SDL backend of course)).
- Clear the SDL render before copying in the framebuffer to remove HOM-like effect.
 2015-05-19 17:09:20 -04:00
Christoph Oelckers
550d1e3421 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-17 21:20:16 +02:00
Braden Obrzut
1fa1e26cf9 - SDL backend could use the new ScaleCoordsFromWindow since it does similarly for fullscreen. 2015-04-17 00:24:33 -04:00
Christoph Oelckers
7af458223e Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-11 19:24:18 +02:00
Edoardo Prezioso
0c5d55d0a3 - More GAMENAME replacements in strings. 
These changes will change only some displayed messages.
 2015-04-09 21:16:59 +02:00
Christoph Oelckers
1d0706cb61 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-07 08:54:17 +02:00
Christoph Oelckers
0ae74b844d Merge branch 'osx_text_paste' of https://github.com/alexey-lysiuk/gzdoom 2015-04-05 12:18:23 +02:00
alexey.lysiuk
7b89312923 Fixed potential issue with read beyond buffer boundaries 2015-04-05 11:52:57 +03:00
alexey.lysiuk
ebd8f24103 Fixed compilation with OS X SDK 10.4 2015-04-05 11:39:49 +03:00
alexey.lysiuk
82f7b439c8 Improved text pasting on OS X 
Support for UTF-8 and UTF-16 encodings should cover all cases of text pasting from clipboard
 2015-04-05 10:59:07 +03:00
Christoph Oelckers
8762ab48d3 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-05 09:47:27 +02:00
alexey.lysiuk
193b491b63 Added control of automatic graphics switching on OS X 
Automatic graphics switching is enabled by default
Set vid_autoswitch CVAR to false to disable it
 2015-04-04 17:36:55 +03:00
Christoph Oelckers
f0886ce1f1 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/version.h
 2015-04-03 09:45:04 +02:00
Edoardo Prezioso
a88f515364 - Import GAMENAMELOWERCASE macro from Zandronum. 
This will greatly help reducing the code delta between ZDoom and the child ports.
 2015-04-02 13:27:52 +02:00
Edoardo Prezioso
e07f64a23a - Increase the SDL crashinfo char buffer to 4 KB. 
This helps the crash catcher when there are numerous wad files, for which it's possible that either the wad list, the map or the position is truncated. A more reliable alternative to this should be allocating the char buffer, but I never heard about a way to do this reliably during signal handling.
 2015-04-02 13:19:48 +02:00
Christoph Oelckers
97947f9e10 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	dumb/vc6/dumb_static/dumb_static.vcproj
	wadsrc/static/compatibility.txt
 2015-03-15 11:42:59 +01:00
alexey.lysiuk
64d663397b Added video resolution of new 12" MacBook, 2304-by-1440 2015-03-14 11:39:47 +02:00
Braden Obrzut
7a543a71e1 - Fixed: Buddha mode zombie bug returned. (Also fixes compiler warning.) 
- Fixed: Missing include for FreeBSD compile.
 2015-03-02 16:43:25 -05:00
Christoph Oelckers
e846d06a9f Merge remote-tracking branch 'remotes/zdoom/master' 
Conflicts:
	src/posix/sdl/hardware.cpp
 2015-02-07 14:29:31 +01:00
Braden Obrzut
8e1b1aa201 - Defer SDL subsystem initialization since it seems to cause conflicts with GUI toolkits on some systems. 2015-02-02 19:36:08 -05:00
Christoph Oelckers
4446922f26 Merge branch 'master' of https://github.com/rheit/zdoom 2015-01-23 21:01:00 +01:00
Braden Obrzut
4bae3f9976 - Fixed: SDLVideo::CreateFrameBuffer cleared "retry" too soon resulting in infinite recursion if the code was used. 2015-01-16 18:58:23 -05:00
alexey.lysiuk
5336f1085c Fixed incorrect value that I_FPSTime() may return when OS X thread-based timer implementation is used 2015-01-11 10:30:30 +02:00
Edoardo Prezioso
fb3bf0eb58 - Oops, forgot to reinclude missing SDL header. 
Strangely it compiled fine for me, though.
 2015-01-08 13:18:00 +01:00
Christoph Oelckers
df93d1a9f1 Merge branch 'SDL2_gz' of https://github.com/edward-san/zdoom 2015-01-08 09:27:42 +01:00
Christoph Oelckers
1c3561d71e Merge branch 'master' of https://github.com/rheit/zdoom 2015-01-08 09:27:30 +01:00
Edoardo Prezioso
cab509c4d2 Various improvements to SDL2 video code. 
- Ported the missing resolutions from zdoom.
- Remove unneeded code which was removed also from zdoom.
- Uncomment DOUBLEBUFFER GL attribute. It was present in the old SDL_SetVideoMode call code, so why not.
 2015-01-08 01:39:29 +01:00
Edoardo Prezioso
37321d1d48 - Implement SDL2 into GZDoom (needs improvements). 
Make also minor fixes.
Now it compiles and runs fine for me, except for the invisible cursor in the menu (no idea why).
 2015-01-08 00:23:14 +01:00
Edoardo Prezioso
c9150497e3 - Move sdlglvideo code from sdl to posix/sdl. 
Re-add sdlglvideo.cpp path in CMakeLists.txt . Warning: it won't compile yet.
 2015-01-07 21:07:40 +01:00
alexey.lysiuk
83c6798651 Fixed a very slim chance that window will be white and empty after startup 
There are a few quite specific steps to reproduce this issue:
* 640x480 video resolution
* -iwad ... -warp ... command line parameters
* OS X 10.4 or 10.5 PowerPC, maybe performance related
When all these requirements are met, content view doesn't show up sometimes
The simplest solution for this issue is to set initial window size to non-existent video resolution
 2015-01-07 14:50:55 +02:00
alexey.lysiuk
86b2a8530b Fixed launching with additional arguments from IWAD picker on OS X 10.4 2015-01-06 17:08:09 +02:00
alexey.lysiuk
1a69221f80 Removed trailing tab characters in Cocoa IWAD picker 2015-01-06 17:08:01 +02:00
alexey.lysiuk
324a1a7b77 Added support for dynamic device attachment and removal to IOKit gaming controllers handling 2015-01-06 13:40:39 +02:00
alexey.lysiuk
04d3802960 Fixed build issue with OS X SDK 10.4 2015-01-05 18:12:07 +02:00
alexey.lysiuk
b59fc59539 Added missing header comment 2015-01-05 17:26:06 +02:00
alexey.lysiuk
cb681aad2d Rearranged header files and #include's 
Removed unused OS version check
Reduced number of headers
Fixed build with SDK 10.4
 2015-01-05 17:24:54 +02:00
alexey.lysiuk
d418648e59 Fixed compiler warning with format string parameter 2015-01-05 15:46:57 +02:00
alexey.lysiuk
31d232e886 Added polling of analog axes to IOKit gaming controllers handling 
This feature helps a lot with buggy gamepads that constantly generate events from "sticky" hats/sticks
Polling is enabled by default, use joy_axespolling CVAR to turn it on/off
 2015-01-05 13:22:53 +02:00
Christoph Oelckers
c424a1afcb Merge branch 'master' of https://github.com/rheit/zdoom 2015-01-04 17:58:04 +01:00
alexey.lysiuk
aa1f51d3d2 Reimplemented gaming controllers support in native OS X backend using pure IOKit 2015-01-04 14:08:53 +02:00
alexey.lysiuk
68dbd56eab Small cleanup in i_video.mm 2014-12-29 18:03:36 +02:00
alexey.lysiuk
1c102ef9c9 Internals of native OS X backend event processing are no longer exposed 2014-12-29 12:16:17 +02:00
alexey.lysiuk
21d557ee11 Further cleanup of i_main.mm 2014-12-29 12:10:18 +02:00
alexey.lysiuk
e3f92db395 Custom cursor in OS native backend without global variable 2014-12-29 11:34:57 +02:00
alexey.lysiuk
51afe8a541 Removed explicit release of window in Cocoa IVideo implementation 
It caused a crash on older OS X like 10.5 and it absence doesn't lead to a memory leak
 2014-12-29 10:29:16 +02:00
alexey.lysiuk
4662069b94 Fixed compilation issues with GCC 4.2 2014-12-28 17:11:30 +02:00
alexey.lysiuk
a67dc4148b Split implementation of native OS X backend into several files 2014-12-28 16:35:00 +02:00
alexey.lysiuk
40d4dc502e Added comprehensive video modes iteration 
Added letterboxing status for fullscreen modes
Brought back vid_listmodes console command
 2014-12-28 12:48:08 +02:00
alexey.lysiuk
b66c712446 Moved out video handling from application controller 2014-12-28 11:58:21 +02:00
alexey.lysiuk
d43b201de9 Yet another code beautification 2014-12-27 18:13:47 +02:00
alexey.lysiuk
613c3293ce Further cleanup of native OS X backend video part 2014-12-27 17:47:21 +02:00
alexey.lysiuk
16965eb78a Removed vid_listmodes console command from native OS X backend 
There is a hard-coded set of resolutions independent from the hardware
 2014-12-27 17:47:12 +02:00
alexey.lysiuk
8b6966dd36 Got rid of SDL emulation's last remnants in native OS X backend 2014-12-27 15:56:46 +02:00
Christoph Oelckers
aac1ce4eb7 Merge branch 'master' of https://github.com/rheit/zdoom 2014-12-27 11:52:32 +01:00
alexey.lysiuk
0d1c954bc0 Fixed crash in game controller support code 
Joystick's startup and shutdown (of Native OS X backend) can be called more than once
 2014-12-26 22:11:03 +02:00
Christoph Oelckers
c39e962fd5 Merge branch 'master' of https://github.com/rheit/zdoom 
Conflicts:
	src/CMakeLists.txt
	src/posix/sdl/hardware.cpp

Please note that this will NOT(!!!) compile on Linux without adjusting sdlglvideo.cpp!
 2014-12-25 22:50:15 +01:00
alexey.lysiuk
bf2a6dbc05 Merge branch 'z_osx_pure' into cocoa_no_sdl 2014-12-23 07:15:12 +02:00
alexey.lysiuk
18c7709007 Cleanup video part of native OS X backend, phase 4 2014-12-21 12:35:43 +02:00
alexey.lysiuk
ebc0916bc6 Cleanup video part of native OS X backend, phase 3 2014-12-20 17:20:45 +02:00
alexey.lysiuk
797cf624df Cleanup video part of native OS X backend, phase 2 2014-12-20 15:03:36 +02:00
alexey.lysiuk
41c949f8ac Cleanup video part of native OS X backend, phase 1 2014-12-20 13:18:47 +02:00
alexey.lysiuk
1433bf3f78 Put all non-Windows source code into posix directory and its subdirectories 2014-12-18 11:52:29 +02:00
alexey.lysiuk
b9d83e88c9 Added missing #include 2014-12-16 22:46:24 +02:00
alexey.lysiuk
83c8f44cc4 Merge branch 'master' of https://github.com/rheit/zdoom into z_osx_pure 2014-12-16 10:25:34 +02:00
alexey.lysiuk
8bc890c995 Rearranged files to avoid usage of symbolic links 2014-12-15 17:40:30 +02:00