Commit Graph

1038 Commits (cc428473ccde1a6a5f8010e21db40aacd9fcb853)

Author SHA1 Message Date
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
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 cc6f7b2ec3 Merge revision 4788:4789 from trunk to ogl-es:
- Add placeholder folders for examples which are in other branches.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4842 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:08:25 +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 313e58c404 Set same minSdkVersion in AndroidManifest.xml as used in the other places.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4728 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-21 00:13:35 +00:00
nadro 963eda9047 Fixed issue with 'freezed' logo.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4718 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-11 22:14: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