ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
209 Commits
Author SHA1 Message Date
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
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