Commit Graph

102 Commits (3ff5abe55d130ee511cc21067593c6203842f8a0)

Author SHA1 Message Date
cutealien 3ff5abe55d Merging r6364 through r6379 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-09 10:07:30 +02:00
MoNTE48 499dbb6f2a Use system zlib on Android, iOS and OSX 2021-12-27 11:26:14 +01:00
MoNTE48 acc3a1157c Disable XML and model writers 2021-12-25 10:33:48 +01:00
MoNTE48 c60bfa0737 OSX: Enable IRRLICHT_FAST_MATH 2021-12-25 10:33:48 +01:00
MoNTE48 c9cde45d0e Merging r6256 from trunk to ogl-es branch (fixing OSX again)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:06:51 +02:00
cutealien ced66e610c Merging r6196 through r6248 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:04:14 +02:00
MoNTE48 04dcc3c004 Return Archive Loader option 2021-02-15 10:42:12 +01:00
cutealien 43dde8734d Merging r6173 through r6179 from trunk to ogl-es branch
- Adding optional support for touch input in X11

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6180 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-01-18 20:55:04 +01:00
MoNTE48 361e4ecdc2 Fix building with ogles1 on iOS 2020-12-29 14:45:11 +01:00
cutealien 223279ebd9 Make it possible again to enable ES1 on Linux.
Seems Debian 11 adds it back.
Thanks @TheBrokenRail for patch.
Hidden in comments for patch #322: https://sourceforge.net/p/irrlicht/patches/322


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6175 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-28 18:09:20 +01:00
Maksim 47f7471971 Minor update for iOS/OSX 2020-11-26 15:29:14 +01:00
Maksim 9574090ad9 iOS: update compiler vertsion, disable unused features 2020-04-19 17:12:39 +02:00
cutealien 6f8df7fc29 Merging r5946 through r5966 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5967 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:53:23 +01:00
cutealien d5e0914d30 Fix compiling on Debian 10 and remove GLES1 support on Linux.
It seems Debian10 dropped support for GLES1. So with my only test-platform gone, I'll disable it by default for all Linux platforms. It's still enabled in Android (for now). Thought in the long run no one should  use GLES1 anymore anyway.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5893 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:46:16 +01:00
cutealien c9f5503436 Merging r5843 through r5862 from trunk to ogl-es branch
Adapting both GLES drivers to new addHighLevelShaderMaterial interfaces.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5890 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:45:59 +01:00
cutealien 291fb2ffac Merging r5788 through r5805 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5806 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-04-23 20:17:39 +00:00
cutealien 202977fe38 Merging r5679 through r5685 from trunk to ogl-es branch
- Fix several problems with SMaterial serialization.
- SMaterial.ZWriteFineControl only using 1 bit now.
- Remove compile warnings.
- Switch Irrlicht to 8 textures per Material as default by increasing value of _IRR_MATERIAL_MAX_TEXTURES_.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5686 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 23:15:56 +00:00
cutealien e3d6a907ff Merge revisions r5570 through r5596 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5597 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-12-31 20:48:18 +00:00
cutealien 87db86ddfd Merge revisions r5554 through r5566 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5567 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-11-06 14:27:34 +00:00
cutealien c20dc5cc6f Add support for ECF_A16B16G16R16F and ECF_A32B32G32R32F color formats for es2.
Use emscripten headers now for es2 when compiling with emscripten (instead of our own extension headers).
Try enabling es2 extensions for emscripten (compiles, but not yet tested)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5527 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-23 14:56:35 +00:00
cutealien 4a5eaeb45d Add support for (experimental) WebGL1 driver for emscripten (still work in process).
It's a reduced OGLES2 driver which tries to work only with bound buffers.
This allows emsripten to compile without "-s FULL_ES2=1" (the WebGL simulation) 
which is a lot faster. Driver can already run simply examples, but is not yet complete.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5441 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:30:37 +00:00
cutealien 37c8b9d64b Cleanup in comments.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5424 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-14 13:36:37 +00:00
cutealien 8860c5c9ce Some compile flag changes for emscripten.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5412 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 11:02:55 +00:00
cutealien 41c8c32435 Avoid having to change IrrCompileConfig for emscripten - do set corresponding define in Makefile.
Fix Makefile paths for emscripten.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5409 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-11 13:30:25 +00:00
cutealien 55040b8c57 Add experimental emscripten port. Thanks @labsin for the patch.
Note: To compile on Linux you currently have to enable the line with:
//#define _IRR_LINUX_PLATFORM_ //Hack
in IrrCompileConfig.h 
(will try to find another solution later, but currently working on Windows)
Not yet tested at all on Windows.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5406 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-10 13:54:55 +00:00
nadro 1318b5d614 -Added support for use custom UIApplicationDelegate in iOS apps.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5230 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 00:47:42 +00:00
nadro 3fbea082cc - Fixed compilation issues on iOS.
- Rewrote from scratch class related to iOS device (Application delegate is hidden inside Irrlicht -> events will be exposed outside in upcoming commit).
- Added iOS example (at now example structure for iOS looks the same like for the other platforms - without application delegate).
- Integrated iOS projects with existing XCode projects.
- Added external context manager with support for EAGL.
- Removed *.xib dependencies from iOS project.
- Added missing _IRR_OVERRIDE_ for some methods.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5213 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-13 19:13:45 +00:00
nadro 878685affa - Merged rev 5205-5206 from trunk.
- Fixed version detecting mechanism for both OpenGL ES drivers.

Following features are still unavailable in ogl-es branch since rev 5181:
* Support for iOS
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5207 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-07 20:06:53 +00:00
nadro a660cd1d38 - Fixed compilation issues on Android.
- Fixed compilation issues when OpenGL ES1 driver is enabled. (there are still rendering issues related to multitexturing visible in a few examples).

Following features are still unavailable in ogl-es branch since rev 5181:
* Support for iOS
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5204 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-06 19:56:33 +00:00
nadro ed78a4e3d1 - Merged rev 5202 from trunk.
- Fixed support for OSX.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5203 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-05 17:34:57 +00:00
nadro 4d03349573 - Merged revision 5192 from trunk.
Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5193 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-28 12:10:25 +00:00
nadro 96cf944466 Merge revision 5180 from trunk to ogl-es (during previous commit TortoiseSVN throw error, but it looks like merge was sent properly on the repo except modifications from this commit).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5182 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:50:30 +00:00
nadro ce6b7562ce Merge revision 4977:5180 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:32:01 +00:00
cutealien bdbb6dffb6 Add profiling info for the es2 driver.
Adding profile info in functions used that starts being noticable in executation speed, so I've disabled profiling now by default (forgive me if enabling again continues to slip in once in a while - I profile a lot currently in this branch).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4975 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 22:50:34 +00:00
cutealien 19a829138d Merge revision 4961:4971 from trunk to ogl-es:
- Allow moving the camera around with the mouse in the MaterialViewer.
- Allow compiling on VS with (/Zc:wchar_t-) set.
- bugfix: CUserPointerAttribute::setString had used wrong scanf string parameters (and as far as I can see never worked).
- Can now enable/disable backround drawing for IGUITable and IGUIProfiler.
- Make profiler start/stop calls use counters to make profiling recursive functions easier.
- IGUIProfiler can now work with any profiler using the IProfiler interface.
- Allow to freeze the IGUIProfiler interface.
- Allow IGUIProfiler to display all profile groups on the same page.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4972 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 00:55:50 +00:00
cutealien 0ec92a896c - Allow changing OGLES2 shader in SIrrCreationParameters instead of using the IRR_OGLES2_SHADER_PATH define.
- CGOLES2Driver::createMaterialRenderers() no longer crashes on missing shaders but just prints out warnings.
- Fix some minor memory-leaks in CGOLES2Driver::createMaterialRenderers() (was using delete instead of delete[])
- Rewrite CGOLES2Driver::createMaterialRenderers() to avoid redundant code
- Irrlichtify variable names in CGOLES2Driver::createMaterialRenderers() (local variables are lower-case!)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4878 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-23 17:28:19 +00:00
cutealien 374912b476 Merge revision 4790:4793 from trunk to ogl-es:
- Add a code profiler (stop-watch style).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4845 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:40:08 +00:00
nadro c8191d7a1f Added NSOpenGL manager.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4697 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-19 23:07:35 +00:00
nadro bce0ada646 - Added support for GLX manager (Hybrid is author of this patch, I just tested it).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4668 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-16 01:13:35 +00:00
cutealien d87aec8a3b Merge r4616-4617 from trunk:
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4650 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:00:33 +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
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
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 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
hybrid 0753afac9d Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 17:04:07 +00:00
nadro 53729b11ba - Fixed some OGL ES2 issues related to shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4395 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-12-12 01:26:39 +00:00
nadro 4b2e44cff4 - Added Accelerometer and Gyroscope support for iOS.
- Added support for retina display under OGL ES2.
- Cleanup iOS device code.
 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4339 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-25 02:25:31 +00:00
Nadro 509331664d - Fixed compilation issues on platforms other than Android.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4311 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-09-16 22:20:18 +00:00
Nadro 466ad034d3 - Added initial support for Android OS with example no. 8. Thanks for a gsfare and hiker for their hard work for this commit.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4309 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-09-06 23:14:12 +00:00