Commit Graph

1086 Commits (dbee39e634afa856a82bcfb4e51443d56a411d9d)

Author SHA1 Message Date
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
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 421af8e8fe Simplify example code.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4898 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-18 12:44:18 +00:00
cutealien 3ded564b15 Remove the listbox with Android commands again. Same info is available per log.
(I experimented with lifecycle states which is why this was added in the first place. But it didn't turn into
useful enough code for an example. the only interesting part turned out to the added counters - so I keep those in).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4897 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-18 12:11:08 +00:00
cutealien 381c6e6c32 Make the android example fit on smaller screens again.
Add some information which helps to figure out how that lifecycle stuff works.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4895 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-17 14:21:44 +00:00
cutealien a1283bd559 Replace Sydney by the Dwarf in the Android example. This allows to make the example code a little bit shorter. Which was not the reason. I just can't stand looking at Sydney anymore.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4894 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-17 12:11:19 +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
cutealien e6dcf28bd7 Android does not send delete-key events when it thinks it has no text. And I can't figure out how to tell it that it has text. So workaround - empty the editbox each time the soft-keyboard is shown.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4891 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-11 00:37:19 +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 22a5d99a58 Give correct credits.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4888 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-06-03 16:23:06 +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