Commit Graph

123 Commits (dbee39e634afa856a82bcfb4e51443d56a411d9d)

Author SHA1 Message Date
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
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
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 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 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 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
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
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 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 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 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 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 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 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 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 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
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
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
cutealien 9f8e6c0e9d Recommend a more useful logcat command in the example.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4701 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-26 17:18:09 +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
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 cca3739a42 Clarify android documentation some more.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4677 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-11 00:42:41 +00:00
cutealien e8cda2e80f Minor change to docs.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4676 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-09 00:28:01 +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 ff38001b7b Improve Android example and documentation some more.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4667 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-14 12:06:01 +00:00
cutealien 655107489b Add more documentation (about the logging system in Irrlicht/Android).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4663 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-13 17:55:36 +00:00
cutealien d7fbfaf8a4 Just some cleanup.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4662 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-13 14:34:59 +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 def5ca45f5 More documentation.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4656 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 22:46:10 +00:00
cutealien afce617bc4 Simplify example a little bit.
Add documenation.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4655 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 22:01:24 +00:00
cutealien a3b9f78d12 Add iPhone folder as placeholder as that also will need to be cleaned up in the future.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4653 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 11:30:39 +00:00
cutealien b036579c6f Move Android example into it's own example folder.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4652 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 11:27:50 +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
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
nadro a8b5d9f837 - Added Android HelloWorld example. You must do following steps to run it:
1. Assign your Android SDK path to ANDROID_HOME environment variable.
2. Add Android SDK (ANDROID_HOME) and Android NDK to your PATH environment variable.
3. Go to: source->Irrlicht->Android and call "ndk-build" or "ndk-build NDEBUG=1"
4. Go to: examples->17.HelloWorld_Mobile and call "ndk-build" or "ndk-build NDEBUG=1"
5. Call "ant debug" to create package
6. Connect device to PC (with USB debugging mode ON) or turn on emulator.
7. Call "adb -d install bin/HelloWorldMobile-debug.apk" (if you use emulator please add "-e" parameter instead of "-d") to install package on your device/emulator.
8. That's all! Now you can run example.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4528 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-05-18 18:30:16 +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
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