Commit Graph

980 Commits (master)

Author SHA1 Message Date
Ilya Zhuravlev 66969cc26d Merge remote-tracking branch 'origin/ogl-es-svn' 2014-02-11 19:36:04 +04:00
Ilya Zhuravlev 9acf0ae1ad Fix bug with pointers' Touched detection on Android, simplify code a bit.
http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49410
2014-02-11 19:33:50 +04:00
Ilya Zhuravlev 04acf72c50 Fix bug with RTT textures being drawn as vertically flipped.
See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49574
2014-02-11 19:11:36 +04:00
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
Ilya Zhuravlev 8fea0b1f7a Add .gitignore and "lib/Android" directory. 2014-02-04 17:03:56 +04:00
Ilya Zhuravlev 9c967484f4 Apply irrlicht.patch that was provided in my Android branch of Freeminer. 2014-02-04 16:54:24 +04:00
nadro fedb951331 - Moved includes related to OpenGL from CWGLManager header to source.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4671 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-20 23:11:17 +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 36fc52fa0e Merge r4618-4629 from trunk. Branch has now catched up to trunk again :-)
Fix memory access in d3dx mipmap generation. Thanks to hellflip for the hint.
Developer documentation - adding a release checklist.
Improve speed for finalizing skinned meshes (removal of unnecessary frames after loading) (thx @ichtyander for the testmodel)
Down from ~20 seconds to ~0,5 seconds :-)
Minor bugfix for my last check-in. dropBadKeys now finds some more broken frames.
Changing calling convention for static lib release fast CPU to Cdecl because FastCall did not actually compile (conflicts with pnglib). Also the same setting is used when compiling as dll, so I guess this setting was simply not tested. Thanks @AReich for reporting. See thread for more info:  http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49462


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4651 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:09:09 +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
cutealien 717f3dbee5 Merge r4600 from trunk:
Update to OpenGL 4.4 headers


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4648 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:51:18 +00:00
cutealien 7f4a932786 Merge r4580-4594 from trunk:
Removed unnecessary glFinish call on OSX platform. Thanks devonsoft for report this bug.
Merge near identical code in CTriangleSelector::createFromMesh and CTriangleSelector::updateFromMesh (createFromMesh now using updateFromMesh).
vector2d::equals now has an tolerance parameter for passing the epsilon (like vector3d has already). Note that this changes the default behavior of vector2d::equals as well as functions using it like the operators for ==, !=, <, >, <=, >= when using vector2d with f64 as the tolerance is increased in that case (for f32 and integer values it shouldn't make any difference).
line2d::intersectWith has a new parameter to allow ignoring intersections with coincident lines
Revert VS10 project file to previous version as it got accidentally checked in with static linking enabled (sorry).
Fix more typos in documentation and add a little more docs (thx @Yoran for reporting).


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4647 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:38:20 +00:00
cutealien 5b0613bb10 Merge r4579 from trunk:
Merged revision 4534-4578 from 1.8 branch:
- Fix crash in SoftwareDriver2 when Material was EMT_DETAIL_MAP but texture[1] was not set (Thanks for fix by chronologicaldot)
- Fix issue in CAnimatedMeshSceneNode::clone which cause crash. (reported and fixed by luthyr)


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4646 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:31:31 +00:00
cutealien 57da09927a Merge r4572-4578 from trunk:
Add intersect method to create intersect box, provided by hendu
Fix order problem and missing deletes in OpenGL extension strings.
Reverting my changes from r4569 as they also break stuff by now. Will continue the discussion in http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940
Reverted changes related to CallBack->OnSetMaterial call.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4645 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:29:30 +00:00
cutealien 604981a813 Merge r4571 from trunk:
Update to latest glext headers, add new extension strings, fix one order bug
NOTE: Latest glext headers had already been in this branch, so only other patches applied.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4644 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:23:29 +00:00
cutealien 4abfd79c23 Merge r4562-4570 from trunk:
Remove wrong _IRR_OVERRIDE_'s which prevented compiling on Linux.
Updated changes text file.
EMT_TRANSPARENT_ALPHA_CHANNEL_REF working again like in older Irrlicht versions (1.4 or so):
It uses again SMaterial::MaterialTypeParam instead of a hardcoded values and makes an exception when MaterialTypeParam is 0 (using it like 0.5 instead) to ensure it works by default. See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940 for new discussion.
_IRR_OVERRIDE_ needed a few more checks on gcc to prevent compile warnings on some systems.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4643 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:14:52 +00:00
cutealien eca637b727 Merge r4560-4561 from trunk:
- Fixed compilation issues with CG support enabled.
- Moved setBasicRenderStates methods calls in shader based material renderers to the same place as in standard fixed pipeline material renderers (first lines of OnSetMaterial method).
- Fixed bug with texture states in OpenGL.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4642 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:09:02 +00:00
cutealien b1569fc21e Merge r4559 from trunk:
Improved switch between fixed and programmable pipeline materials.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4641 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:06:31 +00:00
cutealien 2e47c58bbb Merge r4558 from trunk:
Optimized OpenGL shaders renderer.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4640 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:57:00 +00:00
cutealien 3ff0f3e1b6 Merge r4556-4557 from trunk:
Add a CMatrix4::getRotationDegrees where you can pass the scale vector if you know it (faster and useful otherwise sometimes).
Fix material deserialization. Empty textures were producing a texture named '0' (zero), which lead to annoying warnings all over the place. This empty string is hopefully safe everywhere.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4639 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:53:20 +00:00
cutealien 96cc100d68 Merge r4552-4555 from trunk:
Merged libpng 1.6.2 from vendor branch. Updated pnglibconf.h to latest predefined config file to catch up with latest setup requirements.
Merged version 9 of libjpeg from vendor branch.
Merge from vendor branch version 1.2.8 of zlib


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4638 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:48:49 +00:00
cutealien d94c042077 Merge r4548-4549 from trunk:
Add equals check with tolerance in heigthmap optimizer
Unify texture transformation for tex coord system with mesh loader.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4637 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:44:29 +00:00
cutealien 38be77641c Merge r4546-4547 from trunk:
Fix syntax problems in Cg renderer base classes, which came from the override changes.
Third round of override macro updates. Should have touched all functions stating virtual for now. This might still have missed some, as sometimes the virtual keyword is missing on derived functions. And some open points are also still under consideration, will be fixed in future.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4636 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:41:53 +00:00
cutealien 1514ac0194 Merge r4545 from trunk:
Second round of override checks
Exposed some more functions:
getArchiveName returning name (path) of archive
getColor and getColorHSL for color select dialog
get/setDoubleClickTime in device for setting the time offset necessary to have two separate clicks instead of a double-click
Removed deprecated getXJoint and getMS3DJoint functions
NOTE: CAndroidAssetFileArchive::getArchiveName had to be added additionally to this patch.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:37:26 +00:00
cutealien 27f62cdf2d merge r4543-4544 from trunk:
First round of override updates.
Some fixes:
Added get/setCurrentRenderPass to scene manager (internally renamed, exposed)
Removed destructor from light scene node.
Removed getType calls from archive loaders (one file archives have this)
Removed some internal exposures and virtual attributes for protected classes
Remove white spaces before semicolon


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4634 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:57:38 +00:00
cutealien 8d97140126 Merge r4541-4542 from trunk:
Expose getSpeed and setSpeed of particle attraction affector


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4633 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:45:53 +00:00
cutealien 27b535f472 Merge r4540 from trunk:
Fix name and parameters of draw2dImageBatch call, which was not yet used due to wrong override.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4632 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:42:11 +00:00
cutealien 7165eac356 Merge r4539 from trunk:
Add override patch by hendu, to check for proper deriving in the class tree. Added MSVC support for this feature, should work beginning with MSVC 2010


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4631 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:32:13 +00:00
cutealien 02b47a50bb Merge r4538 from trunk:
Add the geoplane from hendu. This surface improves visualization of large surfaces.


git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4630 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:27:44 +00:00
hybrid 5c49acaee6 Add ogles2 files for Linux makefile.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4615 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 23:11:07 +00:00
hybrid e03dc5a35e Reindent.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4614 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 23:09:06 +00:00
hybrid d240aad4cb Reorder and reindent.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4613 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 23:08:17 +00:00
hybrid 1fca8b0615 Fix Data access under Linux.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4612 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 07:14:04 +00:00
nadro c23ca0a16e - Added support for texture cube in OpenGL ES2.0 driver.
- Fixed compilation errors on Android platform.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4611 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 01:05:49 +00:00
nadro a56541b387 - Added support for texture cube in OpenGL driver.
- Fixed issue related to regenerateMipMapLevels in OpenGL driver.
- Added missing files to VS2012 project.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4610 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-18 22:41:30 +00:00
hybrid d9ef08c609 Improvements of the context manager in order to prepare context switching.
Implement WGL context manager
OGLES2 driver was not yet working again, might be a different problem, though. Andoird device was not tested.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4605 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-13 23:20:30 +00:00
nadro 58721c6e8a Added comments to EGL manager.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4603 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-05 20:56:26 +00:00
hybrid b6251df6e8 Indentation fixed
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4601 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-01 12:35:58 +00:00