Commit Graph

60 Commits (c2c991d224f7367b902d5c0751d75819a8c140e8)

Author SHA1 Message Date
cutealien c2c991d224 Merging r6288 through r6336 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6337 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-01 23:45:10 +03:00
MoNTE48 c9cde45d0e Merging r6256 from trunk to ogl-es branch (fixing OSX again)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:06:51 +02:00
cutealien ced66e610c Merging r6196 through r6248 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:04:14 +02:00
cutealien 73c5b296bb Merging r6107 through r6116 from trunk to ogl-es branch
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:34:02 +02:00
cutealien b42fbc5ab1 Merging r5975 through r6036 from trunk to ogl-es branch.
GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-12 14:24:32 +02:00
cutealien 4d9c660504 Merging r5812 through r5842 from trunk to ogl-es branch
Also added some comments to gl-es drivers about missing polygon offset code.
The merges had some changes for that in the OpenGL driver, but both es drivers have no code at all about this.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5889 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:45:40 +01:00
cutealien 990d475fbb Merging r5686 through r5778 from trunk to ogl-es branch (part 2)
(was in wrong folder in last commit, so only source folder got checked in).
Also adapt ES1 and ES2 driver to remove texture from OGL texture cache
(that was fixed in GL driver in the parts that got merged).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5780 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:30:26 +00:00
cutealien 3a1a4a78ea Merge revisions r5540 through r5547 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5548 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-23 20:23:20 +00:00
cutealien ff7a1c154f Merge revisions r5476 through r5483 from trunk to ogl-es-
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5484 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-11 18:34:38 +00:00
cutealien 56e72da4a7 Merge revisions r5455:r5474 from trunk to ogl-es
Add color-mask fixes to ogles2 and webgl drivers.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5475 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-07 15:20:59 +00:00
cutealien d00ade6cbd Merge revisions r5434:r5436 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5437 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:15:26 +00:00
cutealien f1ee785039 Merge revisions r5337:r5415 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5416 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 15:33:31 +00:00
cutealien 88b27cbdeb Fix last merge (revisions 5316:5335 from trunk to ogl-es).
Sorry, accidentally only the android sub-folder got checked-in and the rest was missing.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5366 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-03-13 14:54:20 +00:00
cutealien 5ec052ff0f Merge revision 4668-4710 from branch to ogl-es:
- Add ITexture::getSource which can be used to check where the last IVideoDriver::getTexture call found the texture.
- Add IMeshTextureLoader interface and replace texture-loading algorithms in most meshloaders.
- Prevent some precision troubles on some compilers when working with vector3d<s32>.
- CGUICheckBox no longer gives up focus on EMIE_LMOUSE_LEFT_UP (thx @Demre for reporting)
- Bugfix: IGUIElement::addChild now prevents setting an element as it's own child.
- GUI editor improvements (prevent crash, improve UI)
- Add IrrlichtDevice::setWindowSize. 


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4711 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-03-03 18:30:39 +00:00
cutealien 70169e0cff 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: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4634 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:57:38 +00:00
hybrid 0753afac9d Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 17:04:07 +00:00
nadro e49efc5498 - Updated ogl-es branch to rev4182.
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 22:43:38 +00:00
hybrid 5caf2b4045 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
git-svn-id: svn://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 7ae68647e9 Next large merge from trunk, revisions 3729-3830
git-svn-id: svn://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 e379658827 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.
git-svn-id: svn://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 de2e004b83 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: svn://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 d07fc00916 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: svn://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 329f550b17 Merged revisions 2781:2892 from trunk.
git-svn-id: svn://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 2061a3862f Merged revisions 2695:2780 from trunk.
git-svn-id: svn://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 72e83023ec 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: svn://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 75b5403b5b Merged from trunk revisions 2144:2363
git-svn-id: svn://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 55e2c6d600 Merged from trunk, all revisions from 1977 to 2143.
git-svn-id: svn://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 30100db0a5 Merged all revisions up to 1976 from trunk into ogl-es branch.
git-svn-id: svn://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 cc7f977f60 Merged revisions 1726:1852 from trunk for the recent updates.
git-svn-id: svn://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 763acaa745 Merge revisions 1495:1497 from 1.4 branch. GUIImage fix by CuteAlien. Default value changes in particle system and scene manager.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1498 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-14 15:36:21 +00:00
hybrid 9c33ae93ad Merge revisions 1489:1494 from 1.4 branch. Mainly cleanup, removal of .NET wrapper, and postEventFromUser patch to return if the event was absorbed.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1495 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-14 08:55:40 +00:00
hybrid 89b96c6609 Increased and synced the default parameter for polys per octree node.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1452 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-07 10:21:09 +00:00
hybrid e6e34950af Added some enhancements for scene graph traversal and an example for collision checking with .irr scenes from rogerborg.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1432 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-30 21:24:19 +00:00
hybrid 0ebbe96031 Moved the arrow mesh parts into separate mesh constructor methods for cylinder and cone. Not yet exposed in the API.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1410 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-08 15:04:34 +00:00
hybrid a0709c155f Fixed a bug in the terrain mesh generation.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1408 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-08 11:26:39 +00:00
hybrid cdffc4a5d6 Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-05-22 11:51:37 +00:00
hybrid 755e117078 Merged from 1.4 branch revisions 1316:1328.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1329 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 11:34:54 +00:00
bitplane f524ab2b03 ISceneNodeAnimator now inherits IEventReceiver, cameras send events to their animators. FPS and Maya cameras are now animators.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1321 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-24 21:39:22 +00:00
hybrid 897a3fa6a6 Merged from branch 1.4 revisions 1290:1305.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1306 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-30 23:19:12 +00:00
hybrid 9eb99c5bd7 Fixed quaternion warnings. Fixed returned interface pointers for newly introduced scene node changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1299 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-26 12:56:25 +00:00
hybrid 5bc1bdc13e Merged from 1.4 branch revisions 1198:1217
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1218 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-30 00:07:52 +00:00
hybrid e66d6fa7a3 Fixed some warnings, bugs, and still the annoying merge conflict.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1197 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 23:56:39 +00:00
hybrid acd01e92b2 Really fixed all merge conflicts, found by The Anaconda.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1194 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 07:00:02 +00:00
hybrid 4b36179303 Fixed merge conflict.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1191 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 00:32:59 +00:00
hybrid 99aa627e76 Merged from 1.4 branch revisions 1174:1188
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1189 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-21 00:24:28 +00:00
hybrid b1c52e4dbe Minor coding changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1166 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-06 22:34:09 +00:00
teella 24989c4487 Volumetric lighting for Irrlicht
Example useage added to 08.Special FX demo



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1160 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-06 13:13:24 +00:00
engineer_apple 201ce2c119 -------------------------------------------
Changes in version 1.4 (... 13.11.2007)
- Fixed somed CQuake3ShaderSceneNode problems.
- Changed BurningsVideo internal Vertex Format. version changed to 0.39
- SceneManager:
   Removed the seperate rendering states for quake3 Shader Scene Nodes.
   Nodes are now solid or transparent. ( but still more states are needed )


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1046 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-13 14:35:29 +00:00
hybrid fbdbc934a4 Some code doc updates by Dorth.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1040 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-06 23:29:59 +00:00
hybrid 738951ff4b Fixed some type issues with sqrt. Fixed rect.isValid to work with all types and avoid useless tests. Cleaned up some variable uses and scopes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1004 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-26 16:18:11 +00:00