freeminer
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
980 Commits
1 Branch
0 Tags
33 MiB
Commit Graph

92 Commits (master)

Author SHA1 Message Date
cutealien c50d34a3a5 Clarify android documentation some more. 
git-svn-id: http://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 ffd4444b51 Minor change to docs. 
git-svn-id: http://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 347a478e63 - Added support for GLX manager (Hybrid is author of this patch, I just tested it). 
git-svn-id: http://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 fc9dc7f6ea Improve Android example and documentation some more. 
git-svn-id: http://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 20a8e3108e Add more documentation (about the logging system in Irrlicht/Android). 
git-svn-id: http://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 6b5d98ac07 Just some cleanup. 
git-svn-id: http://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 f2c944ec0f - 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: http://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 72e924bf0c Add yield and sleep for the Android device. 
git-svn-id: http://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 80724c4f80 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: http://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 218fa09d33 More documentation. 
git-svn-id: http://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 85cc90aeec Simplify example a little bit. 
Add documenation.


git-svn-id: http://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 1a353ad8e7 Add iPhone folder as placeholder as that also will need to be cleaned up in the future. 
git-svn-id: http://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 df1efb4426 Move Android example into it's own example folder. 
git-svn-id: http://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 51e6ac4493 Merge r4616-4617 from trunk: 
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.


git-svn-id: http://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 2ec142d192 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: http://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 a805261893 - 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: http://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 24d2223820 - 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: http://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 c49575276e - Added official example for iOS (both iPhone and iPad devices are supported). 
git-svn-id: http://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 6389d65762 Compiles with ogl-es 1.x again 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4499 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-05 12:53:10 +00:00
hybrid e52f7c693c Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-04 16:15:53 +00:00
hybrid bb6f7b3cb9 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 17:27:12 +00:00
hybrid ac5d58cd84 Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 16:01:12 +00:00
hybrid a774707164 Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-28 17:04:07 +00:00
hybrid f70a39f7f5 Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4487 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-28 14:54:50 +00:00
nadro 49c11b0690 - Clean-up OGL ES2 driver (mainly stuff related to textures). 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4481 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-19 15:54:47 +00:00
nadro dd6f2f46c7 - Added VS2012 projects. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4439 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-16 00:59:25 +00:00
nadro 3d4fb58230 - First version of rewritten OpenGL ES 2.0 driver (IDE projects aren't updated, 2d drawing methods doesn't work, only basic functionality of fixed pipeline materials). This driver will be improved soon. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4435 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-15 00:31:37 +00:00
Nadro 3263c04acb - Added initial support for Android OS with example no. 8. Thanks for a gsfare and hiker for their hard work for this commit. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4309 dfc29bdd-3216-0410-991c-e03cc46cb475
 2012-09-06 23:14:12 +00:00
hybrid ad17a5f2de Fix textureBlend function rename, which seems to have not been propagated from trunk. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4248 dfc29bdd-3216-0410-991c-e03cc46cb475
 2012-07-16 14:55:50 +00:00
hybrid 05d081f620 Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-10-16 10:48:26 +00:00
hybrid 40fd2fc874 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-09-08 22:15:27 +00:00
hybrid 5a8bfaa8d9 Next large merge from trunk, revisions 3729-3830 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-09 07:08:47 +00:00
hybrid 0fa01ea22c More flexible driver choice 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3828 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-08 17:17:32 +00:00
hybrid 52db69aeed Pass high level shader files to ogl-es drivers. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3804 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-06 15:01:38 +00:00
hybrid 40f2be1ce5 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3727 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-05-18 22:21:50 +00:00
hybrid e12163dac4 Fix compilation problems due to last update. Fix vc10 project files 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-01-17 08:37:00 +00:00
hybrid c7a7055a25 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-01-14 15:36:50 +00:00
hybrid 2ba228a486 New OpenGL-ES 2.x driver. This is a fully shader based render pipeline, which is compatible with, e.g., latest iPhone and other smartphone systems, and embedded devices such as the Pandora game console and the Beagle board. 
The whole implementation of the new driver was provided by the folks from Amundis (http://amundis.fr/index.php?lang=en). There are more projects to come from them. Many thanks to Thibault and his colleagues for providing the code for inclusion in the engine.
Please note that you have to remove not only the OpenGL driver (automatically done in IrrCompileConfig once the ogl-es driver is enabled there), but also the linking against the opengl32.lib in the project files. Otherwise no rendering will happen.
Also note that the driver currently does not support all features of the engine. Some materials are not fully working, the shadow system seems to be missing, and the mipmapping is broken. These things will be fixed in future bug fixes.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3370 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-08-08 17:46:48 +00:00
hybrid a8183ff5eb Merged from trunk, revisions 3300-3365. Another large bugfix merge. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-07-18 21:25:27 +00:00
hybrid 28c067bac4 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-06-01 22:52:38 +00:00
hybrid 6e7c44fe95 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
 2010-01-23 20:13:43 +00:00
hybrid 2832a61dd2 Merged revisions 2781:2892 from trunk. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2893 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-11-20 10:08:00 +00:00
hybrid 0aa5845e59 Merged revisions 2695:2780 from trunk. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2781 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-11-02 17:20:21 +00:00
hybrid 1584e0d569 Merged revisions 2441:2694 from trunk. This is a huge update which brings the ogl-es branch to the latest 1.6 state. No updates for the ogl-es driver have been incorporated, this branch might not even compile properly right now. I'm just very happy that the merge finally went through... 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2695 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-09-16 12:48:19 +00:00
hybrid 6ff85907c0 Merged revisions 2375:2440 from trunk. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-07-03 09:11:53 +00:00
hybrid 9d0cf6c3ba Merged from trunk revisions 2144:2363 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2364 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-05-05 00:09:53 +00:00
hybrid 211f574c82 Merged from trunk, all revisions from 1977 to 2143. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2144 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-01-27 13:23:36 +00:00
hybrid c5d29d0786 Merged all revisions up to 1976 from trunk into ogl-es branch. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-12-19 09:56:25 +00:00
hybrid 9847717193 Merged revisions 1726:1852 from trunk for the recent updates. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-27 23:52:13 +00:00
hybrid b4e8a117c7 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-12 10:11:25 +00:00