Commit Graph

1360 Commits (master)

Author SHA1 Message Date
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
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 ad3f2dcbcb Merge revision 4800:4801 from trunk to ogl-es:
- Fix wrong names in project file.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4850 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 17:21:11 +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