Commit Graph

1360 Commits (master)

Author SHA1 Message Date
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 98a177e95b Can't use uniforms directly in for loops in glsl. Thx @feelthat for reporting.
(it worked nevertheless on most systems, just not legal glsl code and on some phones it won't compile)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5117 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-08-11 20:26:40 +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 39b98b218c Improve layout of android example a little bit and add a warning about stuff that doesn't work yet.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5064 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-03-02 22:55:32 +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
cutealien e0c835fd14 Add a LinuxGLES2 target for example 21.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5032 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-03 15:25:21 +00:00
cutealien d9dc76f94c Use EGLES2 as default device for now in example 21.
We will have to figure out a general solution once we merge that back to trunk.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5031 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-03 15:24:37 +00:00
cutealien 7d4fcf2de7 Fix a merge bug introduced in r2441.
Merged revisions 2375:2440 from trunk had introduced some brackets into example 21 which never had been in trunk. Those caused a crash when trying to load a map.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5030 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-03 15:23:39 +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 a4f4f587dd Final fix for texture matrix issue in OpenGL ES2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4964 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-03 22:55:38 +00:00
cutealien 6f67d6904a Rework specular calculations for fixed function pipeline:
- Reflection calculation fixed (thx @Nadro)
- Specular is now passed to the fragment shaders (as Irrlicht is using GL_SEPARATE_SPECULAR_COLOR in the fixed function pipeline).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4963 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-03 12:37:40 +00:00
cutealien 564a60f4aa Merge revision 4959:4961 from trunk to ogl-es
- Allow moving the camera around with the mouse in the MaterialViewer.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4962 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-02 21:41:41 +00:00
cutealien a52b5458f8 Merge revision 4954:4959 from trunk to ogl-es:
Fix bug in MaterialViewer - light control colors got initialized wrong.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4960 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-02 19:11:45 +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 d448851f71 Fix global ambient calculation for es2 fixed pipeline simulation once more (I think this time I finally got it correct).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4957 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-02 15:36:58 +00:00
cutealien 37e2691ede Update example cbp project file for MaterialViewer (last check-in wasn't yet correct).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4956 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-01 22:03:27 +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 1961023281 Manifest should also require es2.0 when the example does require it.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4946 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-26 01:14:29 +00:00
cutealien 84fa03f429 Global ambient must be added a little later to be similar to fixed function pipeline.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4945 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-26 01:07:17 +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 5def8f4fa9 Merge revision 4932:4938 from trunk to ogl-es (4932 ignored as it was the revert of an earlier patch which wasn't merged). We've now catched up to current trunk again.
- Fixed issue with functions for convert from/to UTF8 and shared libs.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4939 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 22:29:17 +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