freeminer/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
942 Commits 1 Branch 0 Tags
Commit Graph

942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cutealien
27b535f472 Merge r4540 from trunk: 
Fix name and parameters of draw2dImageBatch call, which was not yet used due to wrong override.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4632 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-07 21:42:11 +00:00
cutealien
7165eac356 Merge r4539 from trunk: 
Add override patch by hendu, to check for proper deriving in the class tree. Added MSVC support for this feature, should work beginning with MSVC 2010


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4631 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-07 21:32:13 +00:00
cutealien
02b47a50bb Merge r4538 from trunk: 
Add the geoplane from hendu. This surface improves visualization of large surfaces.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4630 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-07 21:27:44 +00:00
hybrid
5c49acaee6 Add ogles2 files for Linux makefile. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4615 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-11-19 23:11:07 +00:00
hybrid
e03dc5a35e Reindent. 
git-svn-id: http://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
d240aad4cb Reorder and reindent. 
git-svn-id: http://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
1fca8b0615 Fix Data access under Linux. 
git-svn-id: http://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
c23ca0a16e - Added support for texture cube in OpenGL ES2.0 driver. 
- Fixed compilation errors on Android platform.

git-svn-id: http://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
a56541b387 - 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: http://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
d9ef08c609 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: http://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
58721c6e8a Added comments to EGL manager. 
git-svn-id: http://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
b6251df6e8 Indentation fixed 
git-svn-id: http://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
a805261893 - 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: http://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
119c12bdbb 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: http://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
0b9acb8f26 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: http://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
f2373ffc58 Should compile under Windows again 
git-svn-id: http://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
322adde04f - 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: http://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
eef94cf07e - 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: http://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
5c20d58b9e git-svn-id: http://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
0665e28b7b - 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: http://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
dcff3921d1 - 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: http://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
73e38cd080 Fixed issue with release touches input. 
git-svn-id: http://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
7e4f686724 Fixed compilation issues in OGL ES driver. 
git-svn-id: http://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
c3508117a1 - Fixed problem with application crash when texture was removed and material override for 2d rendering was enabled. 
git-svn-id: http://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
e0545f8107 COGLESTexture now using enums from ES1 instead of ES2 like it should. Thanks @entity for reporting. 
git-svn-id: http://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
6e0839b3d9 - Updated changes text file. 
git-svn-id: http://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
192fc19919 - Fixed issue with OGL ES2 lock method and KeepImage set to false. 
git-svn-id: http://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
6a0c3e6267 - Fixed compilation issues on Linux platform. 
git-svn-id: http://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
8396992d37 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: http://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
5be33d5f38 Added support for compressed textures in OpenGL ES1 driver. 
git-svn-id: http://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
2d4cb70ce0 - Improved texture creation system (it avoid create a texture when image is missing or color format isn't supported). 
git-svn-id: http://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
b6a6b4a8f0 Added support for PVR loader on iOS platforms. All ETC1, ETC2, PVRTC1 and PVRTC2 formats was checked on dedicated platforms. 
git-svn-id: http://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
636966da49 - 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: http://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
c277059e51 - 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: http://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
24d2223820 - 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: http://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
53c0a2900d Add check for APPLE_BGRA8888 extension 
git-svn-id: http://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
0d27c67c11 - Improved Android build system and fix minor issues in sources. 
git-svn-id: http://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
854c90a378 - Fixed issues with transparent materials in OpenGL ES 2.0 driver. 
git-svn-id: http://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
81b873e2c6 Memory cleanup fix by Luong Cong Dan 
git-svn-id: http://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
c49575276e - Added official example for iOS (both iPhone and iPad devices are supported). 
git-svn-id: http://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
d85d392ff2 - Fixed Android compilation issues. Thanks to mchiasson for prepare this patch. 
git-svn-id: http://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
20199e3912 Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes 
git-svn-id: http://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
50779c829e - Fixed iOS compilation issues. 
git-svn-id: http://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
1e130fd426 - Fixed OSX compilation issues (both trunk and ogl-es branches). 
git-svn-id: http://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
1b4c935129 - 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: http://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
26c124b466 Remove unused shader callback methods onsetattributes and onunsetattributes. 
git-svn-id: http://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
10f78238b0 Remove unused PostRender method, wich was used by the old ogl-es2 driver. 
git-svn-id: http://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
67fce90e7c Also fix compilation for ogl-es 2. 
git-svn-id: http://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
6389d65762 Compiles with ogl-es 1.x again 
git-svn-id: http://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
30c61b3b3c Fix msvc project files to new names of ogl-es2 driver. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4495 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-04 22:01:22 +00:00