Commit Graph

1173 Commits (master)

Author SHA1 Message Date
cutealien 241e343ba1 Potential fix for a compile problem on some Android systems.
See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=4&t=51196&p=296927#p296927


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5250 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-03 20:25:49 +00:00
nadro 216af56b04 - Merged rev 5247 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5248 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-17 13:38:01 +00:00
nadro db0dac2f09 - Merged rev 5226-5244 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5246 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-17 13:08:20 +00:00
nadro f2c8b5760a - Fixed compilation issues on iOS when built-in main is disabled.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5236 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-06 16:36:04 +00:00
nadro 5029043db0 - Minor fix for iOS device handling.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5235 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-06 16:33:55 +00:00
nadro 27bf238aa5 - Fixed texture rendering in both OpenGL ES1 and ES2 drivers on iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5234 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 18:39:39 +00:00
nadro 50903517fc -Added support for embed Irrlicht view into existing UIView (iOS).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5232 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 18:33:17 +00:00
nadro 56690ed51d - Minor fix for previous commit.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5231 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 00:51:08 +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 e5383e1041 - Added application state events support for iOS platform.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5229 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-02 18:49:31 +00:00
nadro bf3273cb5f - Merged rev 5222-5223 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5224 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-17 19:48:24 +00:00
nadro 0200408475 - Fixed issue with depth color formats in OpenGL drivers (example no. 13 works properly at now).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5221 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-17 12:44:24 +00:00
nadro e604a608eb - Merged rev 5212-5219 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5220 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-15 21:06:53 +00:00
nadro e6fe1abc16 - Fixed texture rendering issues in OpenGL ES drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5217 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-14 22:51:01 +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
cutealien d845c35e7d Merge revision 5207:5210 from trunk to ogl-es
- Initialize ContextManager pointer and release it's memory at the end.
- Fix: Prevent division by 0 in CGUIScrollBar::setPos
- Fix: addFileArchive now grab()'s the archive when you pass one in by pointer.
Android example now no longer crashes. But it's textures are still broken.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5211 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-12 20:42:55 +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 179c3d6cb0 - Merged rev 5199-5200 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@5201 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-29 22:45:24 +00:00
nadro 58cba0b3c6 - Merged revision 5195-5197 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@5198 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-28 23:18:00 +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 0cc2e6dc45 - Merged revision 5185-5190 from trunk.
- Fixed cubemap texture support for OpenGL drivers.

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@5191 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-27 22:39:12 +00:00
nadro e8db0e6662 - Merged revision 5183 from trunk.
- Fixed support for Android.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Cubemap textures in OpenGL drivers
* 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@5184 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-14 16:40:11 +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 58fa0cf341 One of the COGLESDriver draw2DImage renamed to draw2DImageBatch as in other drivers. Thx @feelthat for reporting.
Added _IRR_OVERRIDE macros to both GLES drivers and fixed one more overload where it had gone wrong.
Enabled c++11 compiling on in c::b project files on Linux to find those kind of troubles faster.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5122 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-08-29 12:43:09 +00:00
cutealien 3dbf7c9de6 Return reference to a local static instead of a reference to 0 in an error cases (was undefined c++).
Thx @floriang for reporting at http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=50877



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5113 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-07-30 21:53:21 +00:00
cutealien 045e381941 Get the back-key in Android working with Irrlicht edit-boxes.
Also some debug-output (all out-commented for now, just useful for debugging Irrlicht itself).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5063 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-03-02 21:10:06 +00:00
cutealien 54d361d5c0 Fix 2 bugs with virtual-keyboard input on Android which could both lead to crashes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5061 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-03-02 16:05:20 +00:00
cutealien b0217b078d Add a E_TEXTURE_CREATION_FLAG called ETCF_ALLOW_MEMORY_COPY to allow keeping texture copies in memory for fast locking.
It's disabled by default, but always used for fonts.
Also return now 0 for mipmaps when locking as that part was/is not yet supported.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5037 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-11 13:19:05 +00:00
cutealien c40929096b Add gyroscope and accelerometer support for Android.
Patch is from ent1ty and was posted here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=6&t=37235&p=288022
Note: We plan to change this interface before merging with svn trunk (input-devices will get their own class).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5035 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-08 17:55:26 +00:00
cutealien 831962cedb Give EMT_TRANSPARENT_ALPHA_CHANNEL it's own fragment shader. Fixes problem in q3 map reported by feelthat in the forum.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5033 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-03 16:19:30 +00:00
nadro e5d3488c1b Improvements in COGLES2Texture::lock method:
- support for textures bigger than a screen size.
- support for NPOT textures.
- performance optimizations.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5002 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-22 16:09:51 +00:00
nadro f34b554cde - Fixed COGLES2Texture::lock issue related to transparency textures. Thanks CuteAlien for your help in diagnose this issue.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4999 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-19 18:30:59 +00:00
nadro 55f761aa0e - Fixed wrong data size in COGLES2Texture::lock method.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4996 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-16 18:27:40 +00:00
nadro 31f5257a1a - Fixed RGB color formats and COGLES2Texture::unlock issue which caused image corruptions on some devices.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4995 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-13 18:10:17 +00:00
nadro 13c1adeae8 - Fixed minor bug in COGLES2Texture::lock method.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4994 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-09 21:35:52 +00:00
nadro 971059c81c - Improved texture handling in OpenGL ES2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4993 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-09 18:41:49 +00:00
nadro bba02a5d20 - Fixed COGLES2Texture::lock method.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4992 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-08 17:34:34 +00:00
nadro afec6508a8 - Solved issue with high memory usage by ITexture objects in OpenGL ES2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4990 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-04 18:26:18 +00:00
nadro dbee39e634 - Minor code improvements, replaced if-else block by switch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4981 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-27 18:19:19 +00:00
cutealien 7ac215ee11 Just some cleanup (spelling, double breaks, Irrlicht variable style, static-cast instead of c-casts, fix intialize re-order warnings)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4976 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-16 14:35:26 +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 b200ad6f46 Merge revision 4971:4973 from trunk to ogl-es:
- IGUIProfiler has now more and better display filters.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4974 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 19:42:11 +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
nadro d50be349ca Fixed issue with ECFN_DISABLED state in OGL ES and ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4965 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-11 09:37:30 +00:00
nadro f9806e994c - Fixed issue with texture matrices and built-in OpenGL ES2 materials.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4958 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-02 18:22:36 +00:00
cutealien 43817f07f7 Merge revision 4939:4954 from trunk to ogl-es:
- Bugfix: Cloning CBillboardSceneNode now copies colors and sizes.
- Last fix to enable numkeys on X11 had broken the normal DELETE key on X11. So reworked the fix some more.
- Array index was used before limit check
- Add an array with driver name strings for the driver enums.
- Cleaning up Meshviewer example. 
Also added a project target for LinuxGLES2 for the MaterielViewer cbp (this should be done for all examples at some point).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4955 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-01 22:02:09 +00:00
cutealien 36de8ea6a4 LightType did send too much data (wasn't causing troubles as the values got overwritten again)
Solid material shader should only have 1 texture coordinate.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4949 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-29 23:42:39 +00:00
cutealien 25991b1d87 Add support for SMaterial::EmissiveColor to fixed pipeline simulation with es2 shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4944 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-26 00:36:19 +00:00
cutealien b5ac7335b8 Add global ambient light to gles2 fixed function simulation shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4942 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-25 00:19:42 +00:00
cutealien 0e9e909bed Add IVideoDriver::getAmbientLight function so shader callbacks can access global ambient light easier.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4941 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-24 23:51:06 +00:00
cutealien 89df868452 Merge revision 4926:4931 from trunk to ogl-es:
- EditBox works now with numpad on X11
- Remove unnecessary cast


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4938 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:25:25 +00:00
cutealien 8c0d397d52 Merge revision 4924:4925 from trunk to ogl-es:
- Fix bug with multiple SetPixelFormat calls.
- Fixed bug related to memory release in PNG image loader. Thanks elephoenix for it.
- Fix crash in CGUIListBox when users pressed end key folled by any other key in an empty, focused list box (thanks at porcus for report and patch).
- Fix use of enabling defines for wal2 (halflife) image loader. Thanks to hendu for noticing.
- Fix proper screenshot creation in test by inserting the stabilizeScreenBackground call.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4937 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:19:49 +00:00
cutealien 22bf85884d Merge revision 4922:4923 from trunk to ogl-es:
- Added helper functions for converting between wchar and utf-8.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4936 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:03:14 +00:00
cutealien 0887bc1269 Merge revision 4920:4921 from trunk to ogl-es:
- Added sphere frustum culling support.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4935 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 21:57:30 +00:00
cutealien 6a85f02978 Merge revision 4911:4919 from trunk to ogl-es (4918 ignored as it got reverted again in trunk):
- Fixed issues with setViewPort method under OpenGL


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4933 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 13:22:35 +00:00
cutealien 8880c053c6 Merge revision 4887:4910 from trunk to ogl-es:
- Reduce amount of logging output in skinned mesh loading a little bit.
- Removed DllMain from the static windows build 
- Fixed several selection, highlighting and clipping bugs in CGUITreeview 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4931 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 12:19:24 +00:00
cutealien d8b0866947 Merge (manually) revision 4883:4886 from trunk to ogl-es:
- Added NETWM support for maximize/minimize under Linux. Fixed aliasing in X11 text conversion.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4930 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 12:16:16 +00:00
cutealien a8a13f3d4a Merge 4875:4883 from trunk into ogl branch. Ignored 4872:4875 as the only patch 4875 was silently merged in 4908 already.
- Fixed issue with color mask in OpenGL.
- Removed glGetError calls (IBO and VBO update) from release builds.
- Fixed issue with BlendFactor in D3D8, D3D9 and OpenGL drivers.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4929 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 12:01:06 +00:00
cutealien ee30e8b369 Merge 4854:4872 from trunk:
- Ignore some more files (*.d, *.layout, *.depend)
- Fixed issue with missing separate blending entry in OpenGL query feature.
- ISceneNode::deserializeAttributes uses now old values for parameters which are not in the attributes


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4928 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 11:11:43 +00:00
nadro 61581047fa Added OGLES1 support for FB device.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4920 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-12 18:38:11 +00:00
nadro b74dc59d38 Added support for landscape orientation at init. Orientation is based on value from *.plist file (please select just one - initial orientation).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4916 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-11 18:21:34 +00:00
nadro 532627be51 - Fixed issue with crash at COpenGLDriver::removeTexture call.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4908 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-29 18:03:22 +00:00
nadro 53371c5611 - Optimized 2D drawing in OpenGL ES2 driver.
- Fixed issue with points drawing in OpenGL ES2 driver.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4907 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-28 17:49:05 +00:00
nadro 86cc2a9556 - Added stencil shadow support for OpenGL ES1 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4906 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-23 19:08:16 +00:00
nadro 5d7a5e76c1 - Improved 2D material renderer in OpenGL ES2 driver.
- Added stencil shadow support for OpenGL ES2 driver.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4905 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-22 21:45:38 +00:00
nadro 12a9df7e82 - Improved EMT_ONETEXTURE_BLEND material for OpenGL ES2.0 driver (it solve issue with black volume light in example no. 08).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4903 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-15 18:30:46 +00:00
nadro b36a92de2e - Added per vertex lighting and per fragment fog to all OpenGL ES2 built-in materials (spot light is missing).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4902 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-14 17:11:18 +00:00
nadro d4cd9c33cb - Fixed OGL ES2 built-in materials:
* Added missing materials.
 * Improved compatibility with materials from other drivers (shaders are mapped mostly 1:1).
 * Improved performance.
 * Improved portability.

Lighting and fog are still unsupported except normal and parallax map materials.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4900 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-10 17:21:22 +00:00
cutealien 0eb7e5ffb4 Proposal for passing through system events. And example adapted to show them. Interface is still under discussion.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4893 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-16 23:30:56 +00:00
cutealien eae6011d66 Android - DetachThread on APP_CMD_DESTROY as it crashed otherwise since it attaches the thread on keyboard input.
Thanks @Neirdan for reporting.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4892 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-13 17:12:36 +00:00
nadro ca469b401d - Removed unnecessary call from OpenGL ES2 material renderer.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4890 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-10 23:18:46 +00:00
cutealien cc428473cc - Handle Android keyboard input in the engine.
- Extend example to show/hide a soft keyboard
- Extend example to use fake mouse-events for gui (as it's probably going to take a long time until I get to working on a better solution)
Input-handling needs some JNI calls. I've put that in a new jni namespace (check CKeyEventWrapper files). 
The general idea is that every time we add a jni wrapper to Irrlicht we create a wrapper class which wraps just those functions which are needed internally.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4887 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-03 16:16:37 +00:00
nadro 6c8e9ec729 - Fixed issue with BlendFactor in OpenGL ES1 and ES2 drivers.
- Added missing from the last merge EVDF check.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4884 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-26 16:40:42 +00:00
nadro 02b07f10f2 - Removed glGetError calls from release builds.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4881 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-25 15:43:33 +00:00
nadro a3c24d3a51 - Fixed issue with color mask in both OpenGL ES1 and ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4880 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-25 15:34:18 +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 a36581472c Add CGLManager to c::b project file.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4877 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-23 15:51:59 +00:00
nadro bd088a6dc2 - Added texture stage cache to both OpenGL ES1 and ES2 drivers.
- Fixed FBO issues in both OpenGL ES1 and ES2 drivers.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4876 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-22 17:07:49 +00:00
cutealien 661a19338e Get rid of a few compile warnings.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4871 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-15 11:42:49 +00:00
cutealien 17d33b9b99 Change error output. Add some debug-info. Some whitespace changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4870 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-15 10:13:14 +00:00
cutealien 02d0cb4e2f Add GLES files to c::b project.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4868 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-14 10:54:46 +00:00
nadro bb2d984425 - Fixed blending issues in OGL ES1.x driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4866 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-13 18:05:12 +00:00
nadro 6af1380c7f - Fixed iOS/OSX projects.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4863 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-12 20:02:09 +00:00
nadro 03fceb34d3 - Added separate blending support to both OpenGL ES1.x and 2.0 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4861 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-10 21:47:14 +00:00
cutealien 1e8048f561 Fix crash on releasing device (error was introduced when merging from trunk).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4859 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-09 14:23:38 +00:00
cutealien 50aa5056e3 Fix compiling with egl on Linux (thx @entity for reporting)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4858 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-09 12:16:50 +00:00
cutealien 00c55181a9 Add profiler files to Android.mk
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4857 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 22:42:22 +00:00
cutealien 07d70d8058 Merge revision 4824:4854 from trunk to ogl-es (catched up to trunk):
- Fix dependencies for example 30
- minor stuff


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4855 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 20:18:14 +00:00
cutealien 305eabda93 Merge revision 4822:4823 from trunk to ogl-es:
- Merged new versions of libpng and jpeglib from vendor branch. Had to fix some minor things in JPG reader and the jconfig.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4854 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 20:13:45 +00:00
cutealien 901ec7b0da Merge revision 4812:4822 from trunk to ogl-es:
- Fix compile troubles on VS. Thx @Foaly for reporting.
- Animated dwarfes are more fun.
- Reset group-page as well when calling CGUIProfiler::firstPage.
- Ignore binary 17.
- Add examples 17 and 30+ to Linux build support.
- Fix warnings.
- Fix typo in comment.
- CGUIProfiler can now handle it when a group doesn't fit on a single page.
- Add interface for easier access to scrollbars for IGUIListBox, IGUITreeView and IGUITable
- Add IGUITable::getItemHeight


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4853 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:38:19 +00:00
cutealien bf9f3a3b5d Merge revision 4802:4812 from trunk to ogl-es:
- Fix serializing colors as strings and add a general test for serializing attributes as strings.
- Link to X11 on c::b project file for tests (got changed recently in other project files).
- Fix IAttributes::setAttribute implementation for textures (did do nothing before).
- Fix recently introduced crash when there is no hovered element but a focused gui element. Thanks @  christianclavet for reporting.
- Fixed D3D8 compilation issues.
- Fixed one problem with Borland compiler, but gave up after that. (Borland 5.5 just doesn't cut it anymore).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4852 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:34:24 +00:00
cutealien c8d1310f84 Merge revision 4801:4802 from trunk to ogl-es:
- Fix build on Visual Studio (sorry, didn't know VS still doesn't support strtoull).
- Fixed a few warnings on Windows.
- BuildAllExamples project files now working for VS 2011 and VS 2008


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4851 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:31:14 +00:00
cutealien 8d9bb2cf91 Merge revision 4799:4800 from trunk to ogl-es (XCode build still broken - couldn't figure out how to merge xcode project files correctly):
- Improved mouse handling on OS X 10.6 and newer.
NOT MERGED: Fixed compilation issues on OS X.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4849 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:17:49 +00:00
cutealien a441665d67 Merge revision 4798:4799 from trunk to ogl-es (might break some builds - will be fixed again later today):
- Make CUserPointerAttribute::setString work on 64-bit systems


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4848 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:13:53 +00:00
cutealien d6d4221eb0 Merge revision 4795:4798 from trunk to ogl-es:
- Add examples 30+ to the buildAllExamples script.
- Rewrite profiler implementation some more to get around linker troubles.
- Remove superfluous if which always resulted in true. Thx @dcb for reporting (Bug #430).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4847 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:06:45 +00:00
cutealien c8fe2d4e3b Merge revision 4793:4795 from trunk to ogl-es.
NOTE: not yet 100% certain if bridgecalls are deleted in the correct place - will have to let Nadro check that later on.
- Minor improvement in SMaterial::isTransparent method.
- Added separate blending support for both OpenGL and D3D9.
- Added blend factor to SMaterial.
- Improved transparent nodes handling.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4846 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:58:33 +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
cutealien 7ffac2cad5 Fix compiling of COGLESDriver and COGLES2Driver (got broken when the isTransparent stuff got merged).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4844 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:23:12 +00:00
cutealien 5508ba4d23 Merge revision 4789:4790 from trunk to ogl-es:
- Add override font to IGUITable


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4843 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:10:30 +00:00
cutealien 2fc9d4403b Merge revision 4785:4788 from trunk to ogl-es:
- IGUITable can now disable the active column.
- IGUIElement::getElementFromPoint now virtual.
- remove redundant includes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4841 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:05:21 +00:00
cutealien 03b231db76 Merge revision 4782:4785 from trunk to ogl-es:
- Minor improvements in D3D8/D3D9 blend operation mechanism.
- Prepared OpenGL methods related to separate blending for use.
- Minor fixes in blend operation mechanism.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4840 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:59:15 +00:00
cutealien 14fed808ce Merge revision 4781:4782 from trunk to ogl-es:
- Fixed issue with OpenGL MRTs indexed blending.
- Optimized OpenGL blending calls.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4839 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:57:30 +00:00
cutealien f50e1af202 Merge revision 4771:4781 from trunk to ogl-es:
- Example 22 no longer select a random texture after loading a new texture (thanks at mongoose7 for reporting).
- Fix bug in IGUISkin serialization which messed up serialization of the button-pressed offsets (Thanks at @Midnight for reporting).
- Remove force blending mechanism and improve blending handling in material renderers.
- Fixed issue with wrongly enabled Z-writing for transparent shader materials. Thanks Hendu for this fix.
- Fixed issue with missing blending when transparent shader material is used with blending operation set to EBO_NONE.
- IGUIStaticText::getTextHeight returns now the correct height for texts with newlines even WordWrap is not set.
- Crashfix for CGUIEditBox. CGUIEditBox::setMultiLine must break text when changed or other functions like getTextDimension can crash afterward for strings with newline characters.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4838 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:27:32 +00:00
cutealien 25a02805d3 Merge revision 4761:4771 from trunk to ogl-es:
- Add same compiler flags to c::b project file as are used in Makefile (-fno-exceptions -fno-rtti -fstrict-aliasing).
- More behavior control for particles:
  - ParticleSystemSceneNode does now affect the particle movement direction by default. Can be disabled to get old behavior.
  - Allow interpolating postions which is useful when particles are attached to fast-moving nodes (to avoid regular patterns).
- Invisible behavior flags from check-in yesterday re-implemented with new general behavior flags.
- Allow more control over particle behavior when the ParticleSystemSceneNode is invisible.
- Remove unusued member variables (found with clang)
- ISceneNodeAnimators can now be disabled and paused.
- Moved StartTime in the ISceneNodeAnimators class instead of derived classes.
- Get rid of some nested anon types.
- Remove superfluous parantheses (causing warnings in clang).
- Fix missing return value in CGUIButton::ButtonImage::operator=
- Remove comma at end of enum.
- Maya camera no longer get's stuck in "rotating" state when a mouse-up event is lost (thx @ JLouisB for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4837 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:23:50 +00:00
cutealien 6d650ec027 Merge revision 4745:4761 from trunk to ogl-es:
- Focus behavior of IGUIEnvironment now controllable (right-click focus, mouse-over focus). Disabled elements no longer get the focus unless users enforce it.
- CGUITreeView: Irrlicht elements can't just set ID's otherwise user-elements stop working.
- CGUITreeView: Make the horizontal scrollbar (mostly) work. Selection still messed up, but was that way before and least h-scrolling works now somewhat.
- Remove lot's of setFocus and removeFocus calls. Also several places where elements check if they have the focus inside events.
- Buttons can now now have 7 more image-states, 1 more sprite-state and the sprites are now scaleable.
- IGUIEnvironment::hasFocus can work with a const pointer.
- Spritebanks can now draw scaled sprites.
- Improve spritebank slightly (more comfort functions and documentation).
- CGUIEditBox and the GUI-Editor now convert pasted text correctly using mbstowcs.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4836 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:16:46 +00:00
cutealien cb5e99dade Merge revision 4743:4745 from trunk to ogl-es (could not do a compile check for this as I have no egl environment set-up).
- Cleanup - membervariables start with uppercase letters. No good deed goes unpunished - that was no fun to merge.
- Fix typo.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4835 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:10:42 +00:00
cutealien 7df315e8e1 Merge revision 4742:4743 from trunk to ogl-es:
- Improved i18n key input for X11. Which means languages like cyrillic work now.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4834 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:36:17 +00:00
cutealien 70e65dfb30 Merge revision 4741:4742 from trunk to ogl-es:
- Enable TranslateMessage again for external Windows.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4833 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:25:18 +00:00
cutealien 863ae8d7a9 Merge revision 4732:4741 from trunk to ogl-es:
- Fix bug that ListBox would not allow to 'tab' to the next element (thx @ FlavourBoat for reporting)
- Fix: Buttons can now change the image several times and the pressed image will always be updated. Fixing Bug #197 by some anonymous coder.
- Fix some ignore files.
- IGUIEnvironment::getNextElement now public (was only in CGUIEnvironment before).
- Add an overwrite mode to editbox. This is patch #275 provided by Adam (aka kingadami)
- Add serialization for the CGUIImage::DrawBounds stuff from last check-in.
- Add IGUIImages::setDrawBounds/getDrawBounds to allow coding stuff like progress bars.
- Irrlichtify variable names (membervariables start upper-case).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4832 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:12:33 +00:00
cutealien 549d13ab04 Merge revision 4724:4732 from trunk to ogl-es (also noticed I did a copy-paste error on last check-in and wrote "branch" instead of "trunk" - I always meant trunk certainly):
- Improve documentation for tabcontrol.
- Write (subjectively) nicer xml's by using slightly different linebreak rules.
- Add IGUIImages::setSourceRect/getSourceRect to allow using only parts of an image (can also be used to mirror and scroll them).
- Reduce a bunch of log messages in B3DLoader from ELL_INFORMATION to ELL_DEBUG (thx@ entity for telling
- Collada dae-loader now set's the vertex colors (thx @sf17k for report and test-models)
- Change the rest of the attributes interfaces to pass parameters by const ref instead of per value.
- Ensure vector3df and all classes containing a vector3df are passed by reference instead of per value. Thanks @Danyal Zia for the patch (#280).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4831 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 14:01:54 +00:00
cutealien c73006c7a4 Merge revision 4724 from branch to ogl-es:
- Fix SDL device compilation. VideoDriver is now always dropped after Scenemanager and FileSystem after those two to prevent memory-leaks in some situations.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4830 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 13:46:18 +00:00
cutealien fbc4fa7da1 Merge revision 4711:4723 from branch to ogl-es:
- Fix c::b project obj folder names. Some static builds had used the shared folders (thx @ gerdb for reporting)
- C::B project files work again on newer Linux-distributions which have cleaned up their dev-lib dependencies.
- Fix a reorder warning.
- triangle3d constructor and line3d::getIntersectionWithSphere passing vectors now as const-ref instead of per value. Thx @nemo for reporting.
- Mention another fonttool to create Irrlicht fonts (by Armen).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4829 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 13:25:22 +00:00
nadro 1319f4a7d6 Added OGLES2 support for FB device. Thanks to @glemercier for patch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4777 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-04-17 18:22:01 +00:00
nadro 3e104521a0 Improve keyboard management in FB device. Thanks to @glemercier for patch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4776 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-04-17 17:35:48 +00:00
cutealien fd180c7ed5 Merge material changes for COGLES1MaterialRenderer_LIGHTMAP and COpenGLMaterialRenderer_TRANSPARENT_ALPHA_CHANNEL which had been done in OGL in trunk (r2740) to ensure materials look the same on all platforms (thx @porcus for reporting the problem with TRANSPARENT_ALPHA_CHANNEL_REF).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4716 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-10 11:08:23 +00:00
nadro e209687752 Fixed Android touch events.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4715 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-06 18:38:03 +00:00
nadro f0fb3fcb66 Changed touch event handler. This commit break Android compilation process (it will be fixed in next commit).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4714 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-05 21:46:45 +00:00
cutealien 2c8fabd44b Add a few more log messages for error hunting.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4713 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-03 22:07:55 +00:00
cutealien cc90c060f4 Remove some logging message which I had only enabled to hunt a bug.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4712 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-03 19:50:27 +00:00
cutealien 5ec052ff0f Merge revision 4668-4710 from branch to ogl-es:
- Add ITexture::getSource which can be used to check where the last IVideoDriver::getTexture call found the texture.
- Add IMeshTextureLoader interface and replace texture-loading algorithms in most meshloaders.
- Prevent some precision troubles on some compilers when working with vector3d<s32>.
- CGUICheckBox no longer gives up focus on EMIE_LMOUSE_LEFT_UP (thx @Demre for reporting)
- Bugfix: IGUIElement::addChild now prevents setting an element as it's own child.
- GUI editor improvements (prevent crash, improve UI)
- Add IrrlichtDevice::setWindowSize. 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4711 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-03 18:30:39 +00:00
cutealien a53825de38 Allow trailing slashes in addDirectoryToFileList.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4700 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-25 12:31:17 +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 6e6890a9f4 Minor comments improvements.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4691 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-16 13:44:27 +00:00
nadro 8b85ce31ed Fixed linking issues on iOS platform.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4690 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-16 13:41:43 +00:00
nadro 4e5ead4268 Fixed OSX and iOS compilation issues (for C++11 also).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4688 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-13 21:09:38 +00:00
cutealien 37b154102b Merge trunk revisions 4630 to 4685:
- Makefile for the new IrrFontTool links now correctly to libfontconfig
- Bugfix: getFont for xml-fonts now also works for fonts inside archives (thx @Neirdan for bugreport)
- Add function mergeFilename + tests
- Add ISceneNodeAnimator::setStartTime/getStartTime to allow resetting movement animators. 
- Get Irrlicht to compile with IRRLICHT_FAST_MATH on Linux (out-define code which was written for VS and remove #warn which is not a preprocessor command recognized by GCC).
- Make key-release events also show the correct Char value on Windows (thx @zerochen for report+fix here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49499)
- Fix input with numlock-keys on Linux. Thx @zerochen for report and help with bugfixing.
- Linux version of makedocumentation.sh now works like the DOS version and creates html docs.
- Add some error checking in test.
- Indentation


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4686 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-13 13:01:14 +00:00
cutealien 5b63d4ef81 - addDirectory renamed to addDirectoryToFileList and now in IFileArchive so users can add any assets folders.
- asset directories which are added are now released again (was leaking before)
- "media" is no longer added automatically to assets folders by the engine, but must be added by users now (example is extended to do that).
- root assets folder no longer added in CAndroidAssetFileArchive but in CIrrDeviceAndroid to avoid calling a virtual function in a constructor (it had worked in this case for now - still was ugly and should never be done)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4679 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-11 23:35:59 +00:00
cutealien 216177e99d Cleanup Android assets reader (preparation before doing further changes):
- CFileSystem::addFileArchive must grab the archive, this should also be fixed in trunk. CIrrDeviceAndroid instead has to drop the archive after adding it.
- Kick public static Activity variables which are not necessary (that's basically globals and made code correspondingly harder to understand)
- Remove createAndroidAssetFileArchive function which is not public accessible and not used anywhere.
- Fix indention
- Irrlichtify variable names (locals start lowercase)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4678 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-11 21:35:31 +00:00
nadro 42b587dee0 - Moved includes related to OpenGL from CWGLManager header to source.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4671 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-20 23:11:17 +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 dde9097b2f - Renamed SExposedVideoData::window to SExposedVideoData::Window
- Fontsize in Android example depends now on the dpi. This also adds example code of how to access the Android Java code from c++.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4661 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-13 14:20:31 +00:00
cutealien fcbb91c797 Add yield and sleep for the Android device.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4658 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-09 15:54:15 +00:00
cutealien 537caf276e Add events to the Android example (can now move the logo around with touch-events).
Make some functions in Android device private which don't need to be public.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4657 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-09 13:15:18 +00:00
cutealien b74d7c5ed5 Merge r4618-4629 from trunk. Branch has now catched up to trunk again :-)
Fix memory access in d3dx mipmap generation. Thanks to hellflip for the hint.
Developer documentation - adding a release checklist.
Improve speed for finalizing skinned meshes (removal of unnecessary frames after loading) (thx @ichtyander for the testmodel)
Down from ~20 seconds to ~0,5 seconds :-)
Minor bugfix for my last check-in. dropBadKeys now finds some more broken frames.
Changing calling convention for static lib release fast CPU to Cdecl because FastCall did not actually compile (conflicts with pnglib). Also the same setting is used when compiling as dll, so I guess this setting was simply not tested. Thanks @AReich for reporting. See thread for more info:  http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49462


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4651 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:09:09 +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
cutealien 4ea8bd628f Merge r4602-4608 from trunk:
Collada loader now instantiates camera nodes which had been ignore so far (thx @NemoStein for the test .dae)
Add render calls to two windows, where possible


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4649 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:55:58 +00:00
cutealien d757b9d75c Merge r4600 from trunk:
Update to OpenGL 4.4 headers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4648 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:51:18 +00:00
cutealien 52ce5d3127 Merge r4580-4594 from trunk:
Removed unnecessary glFinish call on OSX platform. Thanks devonsoft for report this bug.
Merge near identical code in CTriangleSelector::createFromMesh and CTriangleSelector::updateFromMesh (createFromMesh now using updateFromMesh).
vector2d::equals now has an tolerance parameter for passing the epsilon (like vector3d has already). Note that this changes the default behavior of vector2d::equals as well as functions using it like the operators for ==, !=, <, >, <=, >= when using vector2d with f64 as the tolerance is increased in that case (for f32 and integer values it shouldn't make any difference).
line2d::intersectWith has a new parameter to allow ignoring intersections with coincident lines
Revert VS10 project file to previous version as it got accidentally checked in with static linking enabled (sorry).
Fix more typos in documentation and add a little more docs (thx @Yoran for reporting).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4647 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:38:20 +00:00
cutealien 7dc4d7c9e3 Merge r4579 from trunk:
Merged revision 4534-4578 from 1.8 branch:
- Fix crash in SoftwareDriver2 when Material was EMT_DETAIL_MAP but texture[1] was not set (Thanks for fix by chronologicaldot)
- Fix issue in CAnimatedMeshSceneNode::clone which cause crash. (reported and fixed by luthyr)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4646 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:31:31 +00:00
cutealien 89a17996f3 Merge r4572-4578 from trunk:
Add intersect method to create intersect box, provided by hendu
Fix order problem and missing deletes in OpenGL extension strings.
Reverting my changes from r4569 as they also break stuff by now. Will continue the discussion in http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940
Reverted changes related to CallBack->OnSetMaterial call.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4645 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:29:30 +00:00
cutealien 2ee8d1ccd3 Merge r4571 from trunk:
Update to latest glext headers, add new extension strings, fix one order bug
NOTE: Latest glext headers had already been in this branch, so only other patches applied.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4644 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:23:29 +00:00
cutealien 2be14de251 Merge r4562-4570 from trunk:
Remove wrong _IRR_OVERRIDE_'s which prevented compiling on Linux.
Updated changes text file.
EMT_TRANSPARENT_ALPHA_CHANNEL_REF working again like in older Irrlicht versions (1.4 or so):
It uses again SMaterial::MaterialTypeParam instead of a hardcoded values and makes an exception when MaterialTypeParam is 0 (using it like 0.5 instead) to ensure it works by default. See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940 for new discussion.
_IRR_OVERRIDE_ needed a few more checks on gcc to prevent compile warnings on some systems.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4643 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:14:52 +00:00
cutealien 69639235cb Merge r4560-4561 from trunk:
- Fixed compilation issues with CG support enabled.
- Moved setBasicRenderStates methods calls in shader based material renderers to the same place as in standard fixed pipeline material renderers (first lines of OnSetMaterial method).
- Fixed bug with texture states in OpenGL.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4642 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:09:02 +00:00
cutealien dc91c57ddf Merge r4559 from trunk:
Improved switch between fixed and programmable pipeline materials.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4641 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:06:31 +00:00
cutealien d10d3799ea Merge r4558 from trunk:
Optimized OpenGL shaders renderer.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4640 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:57:00 +00:00
cutealien 6f49422ab5 Merge r4556-4557 from trunk:
Add a CMatrix4::getRotationDegrees where you can pass the scale vector if you know it (faster and useful otherwise sometimes).
Fix material deserialization. Empty textures were producing a texture named '0' (zero), which lead to annoying warnings all over the place. This empty string is hopefully safe everywhere.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4639 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:53:20 +00:00
cutealien 05f3c9eaa4 Merge r4552-4555 from trunk:
Merged libpng 1.6.2 from vendor branch. Updated pnglibconf.h to latest predefined config file to catch up with latest setup requirements.
Merged version 9 of libjpeg from vendor branch.
Merge from vendor branch version 1.2.8 of zlib


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4638 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:48:49 +00:00
cutealien c0276ebb7f Merge r4548-4549 from trunk:
Add equals check with tolerance in heigthmap optimizer
Unify texture transformation for tex coord system with mesh loader.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4637 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:44:29 +00:00
cutealien 5cc50195e7 Merge r4546-4547 from trunk:
Fix syntax problems in Cg renderer base classes, which came from the override changes.
Third round of override macro updates. Should have touched all functions stating virtual for now. This might still have missed some, as sometimes the virtual keyword is missing on derived functions. And some open points are also still under consideration, will be fixed in future.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4636 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:41:53 +00:00
cutealien 6740009946 Merge r4545 from trunk:
Second round of override checks
Exposed some more functions:
getArchiveName returning name (path) of archive
getColor and getColorHSL for color select dialog
get/setDoubleClickTime in device for setting the time offset necessary to have two separate clicks instead of a double-click
Removed deprecated getXJoint and getMS3DJoint functions
NOTE: CAndroidAssetFileArchive::getArchiveName had to be added additionally to this patch.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:37:26 +00:00
cutealien 70169e0cff merge r4543-4544 from trunk:
First round of override updates.
Some fixes:
Added get/setCurrentRenderPass to scene manager (internally renamed, exposed)
Removed destructor from light scene node.
Removed getType calls from archive loaders (one file archives have this)
Removed some internal exposures and virtual attributes for protected classes
Remove white spaces before semicolon


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4634 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:57:38 +00:00
cutealien 2256ea8d4e Merge r4541-4542 from trunk:
Expose getSpeed and setSpeed of particle attraction affector


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4633 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:45:53 +00:00
cutealien e9c9da9a9c Merge r4540 from trunk:
Fix name and parameters of draw2dImageBatch call, which was not yet used due to wrong override.


git-svn-id: svn://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 79daf2a837 Merge r4538 from trunk:
Add the geoplane from hendu. This surface improves visualization of large surfaces.


git-svn-id: svn://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 85faa09fb7 Add ogles2 files for Linux makefile.
git-svn-id: svn://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 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 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
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 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
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
hybrid ed9566079e Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4487 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 14:54:50 +00:00
nadro 27bdfd5beb - Fixed some of fixed pipeline materials in OGL ES2 driver (many of examples works fine now).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4482 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-20 00:30:45 +00:00
nadro 919c037d05 - Clean-up OGL ES2 driver (mainly stuff related to textures).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4481 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-19 15:54:47 +00:00
nadro f97abe8a38 - Added support for handle ViewController (ViewController must be assigned to 'window.rootViewController' for automatic integration them with Irrlicht UIView before device creation process).
- Touch positions are properly returned in each orientation mode (active only when ViewController was assigned before device creation process).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4476 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-11 17:05:13 +00:00
nadro 1e6a598645 - Fixed iOS compilation issues related to latest changes in OGL ES2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4445 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-17 14:49:37 +00:00
nadro 0cc6e91cb8 - Fixed Android compilation issues.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4441 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-17 04:12:34 +00:00
nadro 293236417f - Added VS2012 projects.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4439 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-16 00:59:25 +00:00
nadro a682d8393d - Fixed 2d material rendering in OGL ES2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4436 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-15 19:23:46 +00:00
nadro 40b42e6010 - First version of rewritten OpenGL ES 2.0 driver (IDE projects aren't updated, 2d drawing methods doesn't work, only basic functionality of fixed pipeline materials). This driver will be improved soon.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4435 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-15 00:31:37 +00:00
nadro 0511665722 - Fixed next issues (added attributes binding) related to shaders in OGL ES2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4396 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-12-13 01:59:23 +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 ae1ac7b70f - Added support for Device Motion on iOS platforms.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4383 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-11-26 08:56:57 +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 a4059718db - Added support for retina displays.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4338 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-23 01:03:27 +00:00
hybrid a6deb1a0d1 Fix uniform warning output.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4332 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-18 16:12:20 +00:00
hybrid 932df8b01d Update ogl-es extension headers to latest versions.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4331 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-18 11:45:34 +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
hybrid 1312b51159 Oops, another typo, missing close brace
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4250 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-19 12:27:34 +00:00
hybrid cfb32c5ec4 Fix primitive render calls, which could happen to contain less vertices and indices than stated by the parameters. Now the calculation is based on the actually transferred number of elements.
Not sure why, but the draw2DImageBatch in ogl-es2 driver seemed to lack index calculation completely. I've added this now, should be required.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4249 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-19 11:31:32 +00:00
hybrid 553806b029 Fix typo from last update (missing curly brace).
Fix whitespaces

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4247 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-16 14:53:07 +00:00
nadro 902ef62234 - Fixed bugs related to OpenGL ES 1.x and 2.x in Linux and Win32 devices.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4246 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-14 12:42:09 +00:00
nadro 5d8cb2efce - Fixed many issues with OGL ES 2.0 driver under iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4245 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 23:16:59 +00:00
nadro f5cda1464a - Improvement OGL ES 2.0 support in iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4244 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:25:59 +00:00
nadro 6fc41cf8c0 - Minor improvements is OpenGL ES driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4243 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:24:34 +00:00
nadro dbc2c053ed - Fixed OpenGL ES 2.0 compilation issues.
- Added OpenGL ES 2.0 support for iOS.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4242 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 01:18:54 +00:00
hybrid 38189b9d55 Fix compile error due to name change of method
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4240 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:12:24 +00:00
nadro e49efc5498 - Updated ogl-es branch to rev4182.
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 22:43:38 +00:00
hybrid 2c9a184fb6 Fix wrong qualification in header, found by DaHuntha
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4073 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-02-11 23:08:26 +00:00
hybrid 15c3dc795a Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +00:00
hybrid 5caf2b4045 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 22:15:27 +00:00
hybrid 7687813257 Fix extension initialization in ogles1 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3845 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-10 12:56:59 +00:00
hybrid d7f53dadf7 Remove opengl32.lib from project, it's linked via pragma
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3843 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 23:22:11 +00:00
hybrid 8a0144ae8d Add driver attrributes for ogles2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3839 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 16:19:22 +00:00
hybrid ed4b37f8bc Add drawPixel for ogles1
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3838 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:56:17 +00:00
hybrid 847c8c2922 Add driver attributes for ogles1
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3837 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:53:26 +00:00
hybrid 372ce58cbf Add draw pixel method
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3836 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:52:15 +00:00
hybrid 6ff10b391e Add bool return values on shader creation in order to signal problems and avoid illegal mem access on broken shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3834 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 13:12:48 +00:00
hybrid 095bc0d9d9 Adjust to new screenshot API
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3832 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:47:45 +00:00
hybrid 7ae68647e9 Next large merge from trunk, revisions 3729-3830
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 07:08:47 +00:00
hybrid 93e22a392c Add support for relaxing device configuration parameters in order to find a suitable surface and context.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3827 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-08 17:15:48 +00:00
hybrid 5e3cafcd42 Oops, typo fixed.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3815 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:16:34 +00:00
hybrid aff1c98d5f Update to latest extensions, just as for ogl-es2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3814 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:13:26 +00:00
hybrid f8dccff6eb Fix extension support checks
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3813 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:12:25 +00:00