Commit Graph

1038 Commits (cc428473ccde1a6a5f8010e21db40aacd9fcb853)

Author SHA1 Message Date
hybrid f149e69b9c Reindent.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4614 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 23:09:06 +00:00
hybrid aa35c5cba7 Reorder and reindent.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4613 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 23:08:17 +00:00
hybrid 782138d923 Fix Data access under Linux.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4612 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 07:14:04 +00:00
nadro 7a071672ad - Added support for texture cube in OpenGL ES2.0 driver.
- Fixed compilation errors on Android platform.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4611 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 01:05:49 +00:00
nadro 5dca9a0a06 - Added support for texture cube in OpenGL driver.
- Fixed issue related to regenerateMipMapLevels in OpenGL driver.
- Added missing files to VS2012 project.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4610 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-18 22:41:30 +00:00
hybrid 2d4193888e Improvements of the context manager in order to prepare context switching.
Implement WGL context manager
OGLES2 driver was not yet working again, might be a different problem, though. Andoird device was not tested.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4605 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-13 23:20:30 +00:00
nadro 8d278705b1 Added comments to EGL manager.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4603 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-05 20:56:26 +00:00
hybrid 573fcaa2bf Indentation fixed
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4601 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-01 12:35:58 +00:00
nadro b4f4ebf9df - Removed warnings related to unsupported E_COLOR_FORMAT in switch-case.
- Fixed Android compilation issues.
- Marked Android input and command static methods as public (it's useful for custom versions of these methods).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4599 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-29 23:42:00 +00:00
hybrid 53c6cfdf56 Fixed OGL-ES2 for win32 as well. Not yet properly running with my emulator, though. So setup might still be incomplete here.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4597 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-26 12:13:26 +00:00
hybrid 8d647c930e Abstract away the EGLManager into IContextManager and add the manager for win32/ogles1 as well.
Android device should still compile and work, but was not tested.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4596 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-26 00:02:19 +00:00
hybrid 7afc23819b Should compile under Windows again
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4595 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-25 16:08:45 +00:00
nadro fd6ebe34ff - Set native window resolution when creation params window size is equal to 0 on Android platform. Thanks cww for sharing this idea.
- Fixed one minor bug in compilation for iOS platform (hovewer some other issues related to new EGL manager code may still exist).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4593 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-23 20:47:36 +00:00
nadro cce4f13096 - Fixed issues with randomly crash at resume on Android platform.
- Fixed issues with Multi Touch events on Android platform.

Missing log to rev4591:
- Restored OGLES2 support for Android platform.
- Improved log system on Android Platform.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4592 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-23 16:30:40 +00:00
nadro fffdc650bb git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4591 dfc29bdd-3216-0410-991c-e03cc46cb475 2013-10-20 20:38:20 +00:00
nadro 0395fc3648 - Clean-up Android device source file.
- Improved multi-touch support on Android.
- Fixed problem with context lost on Android when application was resumed.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4590 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-17 23:11:56 +00:00
nadro 5987dfc654 - Exclude EGL code from OpenGL ES driver files. This is first step for improve Android device support.
WARNING: This commit is pushed out only for development reason. It may break temporary devices other than Android. Android device improve process will be completed in next 1-3 commits.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4588 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-17 06:50:30 +00:00
nadro fe5cb8d200 Fixed issue with release touches input.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4574 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-08-10 21:36:55 +00:00
nadro 9c2f45c738 Fixed compilation issues in OGL ES driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4568 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-08-03 15:59:18 +00:00
nadro e3fa638cdf - Fixed problem with application crash when texture was removed and material override for 2d rendering was enabled.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4567 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-08-02 23:20:06 +00:00
cutealien 12ced79ad7 COGLESTexture now using enums from ES1 instead of ES2 like it should. Thanks @entity for reporting.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4566 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-07-27 21:19:36 +00:00
nadro 9acca683c9 - Updated changes text file.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4565 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-07-22 20:40:49 +00:00
nadro 2a689d3dbe - Fixed issue with OGL ES2 lock method and KeepImage set to false.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4563 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-07-21 17:27:20 +00:00
nadro 1914788c42 - Fixed compilation issues on Linux platform.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4536 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-06-10 22:13:49 +00:00
hybrid 2ec010d0a5 Merged revisions 4511-4534 from trunk. OpenGL bug fix, wchar filesystem fix, clone method fix, tris fix, heightmap optimization, x mesh loader fix
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4535 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-06-04 14:47:05 +00:00
nadro a4b52c5c8a Added support for compressed textures in OpenGL ES1 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4533 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-27 21:49:08 +00:00
nadro 334cf13cd6 - Improved texture creation system (it avoid create a texture when image is missing or color format isn't supported).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4532 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-27 17:16:52 +00:00
nadro 20d03955ff Added support for PVR loader on iOS platforms. All ETC1, ETC2, PVRTC1 and PVRTC2 formats was checked on dedicated platforms.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4531 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-26 21:42:09 +00:00
nadro 370222b927 - Improved compressed texture system handling (it avoid code duplicate between all drivers).
- Added ETC1 and ETC2 compressed textures support via PVR loader. (This feature require tests on platform which support ETC1 and ETC2 formats).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4530 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-26 17:54:36 +00:00
nadro 8fa1370e6d - Added bswap for 64 bits.
- Improved and better unified OpenGL and OpenGL ES2 texture interface (support for compressed textures in OpenGL ES2).
- Added support for PVRTC and PVRTC2 compressed textures format.
- Minor improved in DDS loader.
- Initial support for PVR loader (currently with limited image formats support - PVRTC, PVRTC2, DXTn). This loader will improve soon.

IMPORTANT: This commit doesn't provide integration of PVR loader with iOS, MacOSX and some Windows IDEs project files.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4529 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-20 21:38:55 +00:00
nadro a8b5d9f837 - Added Android HelloWorld example. You must do following steps to run it:
1. Assign your Android SDK path to ANDROID_HOME environment variable.
2. Add Android SDK (ANDROID_HOME) and Android NDK to your PATH environment variable.
3. Go to: source->Irrlicht->Android and call "ndk-build" or "ndk-build NDEBUG=1"
4. Go to: examples->17.HelloWorld_Mobile and call "ndk-build" or "ndk-build NDEBUG=1"
5. Call "ant debug" to create package
6. Connect device to PC (with USB debugging mode ON) or turn on emulator.
7. Call "adb -d install bin/HelloWorldMobile-debug.apk" (if you use emulator please add "-e" parameter instead of "-d") to install package on your device/emulator.
8. That's all! Now you can run example.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4528 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-18 18:30:16 +00:00
hybrid 60aa1bb56e Add check for APPLE_BGRA8888 extension
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4523 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-13 22:55:10 +00:00
nadro 148fe37436 - Improved Android build system and fix minor issues in sources.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4522 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-13 22:40:42 +00:00
nadro 4e090576f8 - Fixed issues with transparent materials in OpenGL ES 2.0 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4518 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-04 20:50:30 +00:00
hybrid 3736f851bb Memory cleanup fix by Luong Cong Dan
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4517 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-03 15:24:12 +00:00
nadro 66de02a12e - Added official example for iOS (both iPhone and iPad devices are supported).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4516 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-01 17:06:23 +00:00
nadro 3f5c6cafd7 - Fixed Android compilation issues. Thanks to mchiasson for prepare this patch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4512 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-18 05:10:42 +00:00
hybrid aec5a3afae Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4511 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-17 17:45:53 +00:00
nadro 875d0cfac8 - Fixed iOS compilation issues.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4509 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-16 21:22:46 +00:00
nadro 6d0c45ecc2 - Fixed OSX compilation issues (both trunk and ogl-es branches).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4508 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-14 11:58:33 +00:00
nadro 7458ed2537 - Fixed OGL ES2.x issues related to last updates of branch.
- Added OGL ES 1.x and 2.x drivers to VS2012 project.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4506 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-07 21:27:11 +00:00
hybrid 04681c9bb0 Remove unused shader callback methods onsetattributes and onunsetattributes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4505 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-06 23:09:18 +00:00
hybrid 6580be4689 Remove unused PostRender method, wich was used by the old ogl-es2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4504 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-06 23:00:58 +00:00
hybrid 054bc96af0 Also fix compilation for ogl-es 2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4501 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-05 22:06:50 +00:00
hybrid f73be97aac Compiles with ogl-es 1.x again
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4499 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-05 12:53:10 +00:00
hybrid 0dae377265 Fix msvc project files to new names of ogl-es2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4495 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 22:01:22 +00:00
hybrid e6b8b8daf7 Merged from trunk, revisions 4488-4493. Only indentation changes, and to have the last merge revision in logs
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4494 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:44:31 +00:00
hybrid 3f0c8e3a3b Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:15:53 +00:00
hybrid d5e6d04769 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 17:27:12 +00:00
hybrid 4f4ca75a4f Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 16:01:12 +00:00