Commit Graph

2481 Commits

Author SHA1 Message Date
Tarek Soliman
533f80282b KEYMAPPER: Rename EVENT_CUSTOM_BACKEND to EVENT_CUSTOM_BACKEND_ACTION 2012-02-27 13:04:59 -06:00
Tarek Soliman
6afac4e01e KEYMAPPER: Rename HardwareKey to HardwareInput 2012-02-27 13:00:56 -06:00
D G Turner
7de7d1d414 NDS: Fix build after common util.h split. 2012-02-26 16:59:32 +00:00
Max Horn
367131ef0e COMMON: Move Language and Platform functionality into separate files 2012-02-26 15:21:36 +01:00
Johannes Schickel
3b1e4b5bdc IPHONE: Let hi-color games directly draw onto the screen texture buffer.
This avoids an unecessary copying step from the framebuffer to the texture
buffer.
2012-02-26 01:25:18 +01:00
Johannes Schickel
83ce8da935 IPHONE: Implement 16bpp color support.
This feature is currently disabled by default.
2012-02-26 01:01:19 +01:00
Johannes Schickel
23732c7179 IPHONE: Get rid of _gameScreenRaw, instead use _framebuffer internally. 2012-02-25 20:22:23 +01:00
Johannes Schickel
97e486dee3 IPHONE: Implement very basic GFX transaction support.
This allows for AR ratio correction changes to take place, even when the AR
setting is set after initSize for example.
2012-02-25 19:49:05 +01:00
Tarek Soliman
3edd4180f3 MAEMO: Move static table out of .h file
Thanks fuzzie & LordHoto for pointing this out
2012-02-24 21:43:08 -06:00
Johannes Schickel
f1a4f508af IPHONE: Move aspect ratio settings to VideoContext. 2012-02-24 22:43:02 +01:00
Johannes Schickel
7fe3bdebc0 Merge pull request #197 from phoenixtail26/cleanedARCorrection.
This is a manual merge with some conflict fixups.

Conflicts:
	backends/platform/iphone/iphone_video.mm
2012-02-24 22:32:49 +01:00
Johannes Schickel
c3b52343dc IPHONE: Only update on screen mouse coordinates when it's needed. 2012-02-24 01:44:17 +01:00
Johannes Schickel
5c55866068 IPHONE: Cleanup mouse cursor handling slightly.
Now the scaling etc. will be precalculated instead of being done on every
frame.
2012-02-24 01:33:37 +01:00
Johannes Schickel
d691ef2260 IPHONE: Clean up mouse texture coordinate handling. 2012-02-24 01:13:44 +01:00
Johannes Schickel
d93e1558fc IPHONE: Move some global variables to iPhoneView. 2012-02-24 01:02:29 +01:00
Johannes Schickel
5863f6a556 IPHONE: Add a mouse texture buffer surface to VideoContext. 2012-02-24 00:56:46 +01:00
Johannes Schickel
4f85ad6b99 IPHONE: Fix mouse coordinates for hi res games. 2012-02-23 21:55:36 +01:00
Johannes Schickel
3f37842580 IPHONE: Directly use the game screen's texture buffer.
This gets rid of another intermediate buffer.
2012-02-23 21:52:44 +01:00
Johannes Schickel
8edcedf3b6 IPHONE: Directly use the overlay's texture buffer instead of another intermediate buffer. 2012-02-23 21:34:12 +01:00
Johannes Schickel
2ab5958c93 IPHONE: Move screen and overlay texture buffer to VideoContext. 2012-02-23 21:20:24 +01:00
Johannes Schickel
97feac5342 IPHONE: Add a constructor to VideoContext. 2012-02-23 20:59:26 +01:00
Gavin Hayler
a71a91db17 IPHONE: Add aspect ratio correction to iPhone 2012-02-23 16:27:04 +02:00
Johannes Schickel
5ae958bcf3 IPHONE: Let iPhoneView and OSystem_IPHONE share the same VideoContext.
This allows for better sharing between the current video state in the view and
the OSystem implementation.

This also gets rid of most C interface functions for calling ObjC code.
2012-02-23 03:18:00 +01:00
Johannes Schickel
e00fc73eb8 IPHONE: Silence a few signed/unsigned integer comparison warnings. 2012-02-23 02:26:54 +01:00
Johannes Schickel
99ffbfedbc IPHONE: Use VideoContext in OSystem_IPHONE. 2012-02-23 02:25:26 +01:00
Johannes Schickel
ab15435ad0 IPHONE: Move overlay visibility status to VideoContext. 2012-02-23 02:09:27 +01:00
Johannes Schickel
e1edb20fed IPHONE: Move VideoContext definition to iphone_common.h. 2012-02-23 02:04:40 +01:00
Johannes Schickel
e83e31c2cc IPHONE: Move mouse coordinate conversion code to iPhoneView. 2012-02-23 02:02:14 +01:00
Johannes Schickel
c5ccb32b48 IPHONE: Move graphics related OSystem code to a ObjC++ file. 2012-02-23 01:52:50 +01:00
Johannes Schickel
04f9fc3e18 IPHONE: Move projection setup code to its own method. 2012-02-23 01:27:38 +01:00
Johannes Schickel
174127c1dd IPHONE: Remove some more dead code. 2012-02-23 01:19:34 +01:00
Johannes Schickel
26405be48f IPHONE: Move setFilterModeForTexture to iPhoneView. 2012-02-23 01:14:39 +01:00
Johannes Schickel
def1471fff IPHONE: Slight formatting fix. 2012-02-23 01:08:48 +01:00
Johannes Schickel
833ce4f348 IPHONE: Fix scale offset addition in the mouse coordinate code.
Formerly the overlay and game screen offset was swapped.
2012-02-23 01:08:47 +01:00
Johannes Schickel
f4579aab9b IPHONE: Create a struct for shared video context variables. 2012-02-23 01:08:47 +01:00
Johannes Schickel
6c64fdf4f2 IPHONE: Very minor cleanup. 2012-02-22 02:49:14 +01:00
Johannes Schickel
0e182a9587 IPHONE: Use #include instead of #import. 2012-02-22 02:47:16 +01:00
Johannes Schickel
66199978e2 IPHONE: Silence some warnings. 2012-02-22 02:44:25 +01:00
Johannes Schickel
e79f6a6314 IPHONE: Move ObjC code files (.m) to ObjC++ files (.mm). 2012-02-22 02:30:44 +01:00
Johannes Schickel
1b26346fc8 IPHONE: Implement setShakeOffset.
This should fix bug #3374656 "IPHONE: setShakePos not implemented".
2012-02-22 01:53:20 +01:00
Johannes Schickel
80b3439817 IPHONE: Rewrite video screen rotation.
Now it should be a little bit more sane. Formerly the width and height
was swapped in rotation mode, which resulted in the x coordinate falling
into the range 0..height in landscape mode for example.

This also fixes the cursor offset in the modern theme.
2012-02-21 18:54:26 +01:00
Johannes Schickel
f6edcbde8e IPHONE: Move _overlayPortraitRatio from global scope to local scope. 2012-02-21 18:54:26 +01:00
Johannes Schickel
cc8a6cc993 IPHONE: Add _overlayRect, which describes the overlay screen rect. 2012-02-21 18:54:26 +01:00
Tarek Soliman
aa42d78658 KEYMAPPER: Remove automapping dead code 2012-02-21 08:20:40 -06:00
Johannes Schickel
6cc5b83bba IPHONE: Default to portrait mode in case the orientation could not be determined. 2012-02-20 21:17:19 +01:00
Johannes Schickel
d8531a939e IPHONE: Move OpenGL ES context generation to its own method. 2012-02-20 21:15:14 +01:00
Johannes Schickel
cf44d49d19 IPHONE: Precalculate vertex/tex coordinates for game screen/overlay. 2012-02-20 19:43:51 +01:00
Johannes Schickel
7957cc956e IPHONE: Use render buffer size instead of application frame size for video size calculations.
These match as far as I can tell, but in case they don't match, the render
buffer size should be the correct thing to use.
2012-02-20 18:39:57 +01:00
Johannes Schickel
d91268c4c1 IPHONE: Rename _screenRect to _gameScreenRect. 2012-02-20 18:39:57 +01:00
Johannes Schickel
87fb115def IPHONE: Rename _backing[Width,Height] to _renderBuffer[Width,Height]. 2012-02-20 18:39:57 +01:00
Johannes Schickel
624d5547dc IPHONE: Don't overwrite orientation when the OpenGL ES context is created. 2012-02-20 18:39:57 +01:00
Johannes Schickel
d4c167414d IPHONE: Refactor event code a bit.
Now mouse x/y coordinates are passed as int.
2012-02-20 18:39:57 +01:00
Johannes Schickel
5cc3d754f7 IPHONE: Even more slight formatting fixes. 2012-02-20 18:39:57 +01:00
Johannes Schickel
a291679445 IPHONE: Slight game screen texture related variable renaming. 2012-02-20 15:37:24 +01:00
Johannes Schickel
46e622c0fe IPHONE: Slight cleanup. 2012-02-20 15:37:24 +01:00
Johannes Schickel
76be031ed4 IPHONE: Remove some unused variables. 2012-02-20 15:37:23 +01:00
Johannes Schickel
ae992bebe3 IPHONE: More formatting fixes. 2012-02-20 13:48:09 +01:00
Johannes Schickel
d77253fbe5 IPHONE: Add support for unfiltered upscaling. 2012-02-20 02:32:10 +01:00
Johannes Schickel
8102e7e645 IPHONE: Implement cursor palette support. 2012-02-20 01:32:48 +01:00
Johannes Schickel
65cda4cd6b IPHONE: Fix some mismatching malloc/delete calls. 2012-02-20 00:36:13 +01:00
Johannes Schickel
1b9c4f3845 IPHONE: Remove some dead code. 2012-02-20 00:35:44 +01:00
Johannes Schickel
723a38c699 IPHONE: Rename screen related buffers a bit. 2012-02-20 00:35:14 +01:00
Johannes Schickel
93d80793b4 IPHONE: Implement cursor visibility change again. 2012-02-20 00:29:08 +01:00
Johannes Schickel
438bc50115 IPHONE: Fix cursor hotspots. 2012-02-20 00:25:48 +01:00
Johannes Schickel
68bbe973bd IPHONE: Always use the mouse texture.
Formerly the mouse texture was only used when the overlay was visible. When
only the game screen was visible, the code rendered the mouse cursor on the
game screen texture.

This simplifies the drawing pipeline a bit.
2012-02-20 00:08:42 +01:00
Johannes Schickel
87d85a7b20 IPHONE: Use the proper RGBA5551 palette for the mouse cursor.
Formerly the overlay cursor was using a RGB565 palette, even though the
texture is really set up as RGBA5551.
2012-02-19 22:19:38 +01:00
Johannes Schickel
ceae3dd191 IPHONE: Rename _palette to _gamePalette. 2012-02-19 22:16:38 +01:00
Johannes Schickel
6a31dadfea IPHONE: Use include instead of import for all of our headers. 2012-02-19 22:10:08 +01:00
Johannes Schickel
13358c541d IPHONE: Add include guards. 2012-02-19 21:44:37 +01:00
Johannes Schickel
3d0316ccd2 IPHONE: Formatting fixes. 2012-02-19 21:30:53 +01:00
Johannes Schickel
4244663020 IPHONE: Remove dead code. 2012-02-19 20:33:53 +01:00
Johannes Schickel
ab4420b3ca IPHONE: Take advantage of Common::EVENT_INVALID. 2012-02-19 05:21:17 +01:00
Johannes Schickel
ffaa8612c3 IPHONE: Change F5 (menu) gesture to open up the GMM.
Thanks to tsoliman for this patch.
2012-02-19 05:21:10 +01:00
Tarek Soliman
53d6ef1209 MAEMO: Fix building without keymapper enabled 2012-02-17 14:42:39 -06:00
Tarek Soliman
b6e5e4fe1e MAEMO: Remove pointless copy ctor call
Thanks LordHoto
2012-02-15 17:56:09 -06:00
Tarek Soliman
e55914c51b MAEMO: Register Keymapper Keymap Action default bindings 2012-02-15 17:12:52 -06:00
Tarek Soliman
974f5eb7b8 MAEMO: Drop the hardcoded keymap in favor of the keymapper 2012-02-15 17:07:52 -06:00
Tarek Soliman
7ae7e80739 MAEMO: Rename hasHwKeyboard and add hasMenuKey 2012-02-15 16:38:53 -06:00
Tarek Soliman
856744aa6a MAEMO: Use bitshifting in ModelType 2012-02-15 15:26:51 -06:00
Tarek Soliman
a4798602d7 JANITORIAL: Fix missing whitespace in pointer cast
find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)
2012-02-15 10:07:10 -06:00
Tarek Soliman
5cf932198e KEYMAPPER: Fix Action ctor args in most keymaps 2012-02-13 23:24:59 -06:00
Johannes Schickel
57e3388197 SDL: Get rid of unneeded forwards. 2012-02-13 01:25:25 +01:00
Johannes Schickel
d811240a9d ALL: Enable Keymapper specific OSystem API only when the Keymapper is enabled. 2012-02-13 01:20:02 +01:00
Tarek Soliman
c2640ed33a MAEMO: Use custom event Click Mode keymap action 2012-02-12 13:28:13 -06:00
Tarek Soliman
8c245af35c MAEMO: Define platform global keymap 2012-02-12 13:28:13 -06:00
Tarek Soliman
e52f75eaa4 MAEMO: Define HardwareKeySet 2012-02-12 13:28:13 -06:00
Tarek Soliman
52da780fbc KEYMAPPER: Refactor HardwareKeySet generation 2012-02-12 13:28:13 -06:00
Tarek Soliman
edc5249772 JANITORIAL: Fix template definition whitespace 2012-02-10 21:17:27 -06:00
Tarek Soliman
38b8e09069 MAEMO: Add detection entry for the Nokia 700 running OS2008HE
This allows the Nokia 770 running OS2008HE to be used.
Fixes bug#3483921 "Volume rocker do no emulate keypress as it used"
2012-02-04 12:03:22 -06:00
Alyssa Milburn
4763b2c51b ANDROID: Add faked input delay.
This adds an artificial delay for mouse up events to make engines
like Gob work, similar to the iPhone fix in b3062b5e.
2012-02-03 12:36:03 +01:00
Travis Howell
8701e0a382 WINDOWS: Add default save paths for Windows NT4 onwards 2012-01-23 23:18:21 +11:00
David-John Willis
2294b8aa66 GPH: Fix silly copy/paste error in GP2X bundle target. 2012-01-23 12:16:04 +00:00
David-John Willis
7e0a88f69b GPH: Move all dist files into own folder under dists.
* Update vairous GPH bundle targets to suit new layout.
* Also add .in input files so we can automatically update version numbers.
2012-01-22 16:53:32 +00:00
David-John Willis
b429096b36 OPENPANDORA: Move all dist files into own folder under dists.
* Update OpenPandora bundle targets to suit new layout.
* Also add .in input files so we can automatically update version numbers.
2012-01-22 16:53:31 +00:00
Oystein Eftevaag
09ce3407b1 OSX: Avoid use of NSString:stringWithCString, for OS X 10.2 and 10.3 compatibility 2012-01-14 11:04:58 -05:00
Tarek Soliman
d143872be6 KEYMAPPER: Constantify global keymap name 2012-01-07 21:20:29 -06:00
Strangerke
e2ded73d92 MISC: This is year 2012 2012-01-01 11:49:41 +01:00
Filippos Karapetis
5eb592a1c9 WIN32: Fix build by adapting to the latest Archive changes 2011-12-13 22:47:46 +02:00
Alyssa Milburn
c780b58e88 ANDROID: Fix assert in JavaInputStream (thanks clone2727). 2011-12-13 18:44:58 +01:00
Alyssa Milburn
6c790ea6a7 ANDROID: Fix compilation by adapting to latest Archive changes (thanks LordHoto). 2011-12-13 18:37:33 +01:00