Commit Graph

52 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
cutealien 207b598a43 Merging r6275 through r6286 from trunk to ogl-es branch
- Fixing warnings
- Updating bzip2 and zlib libraries


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-01-14 12:23:21 +01: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 fb6aac08ed Merging r6075 through r6106 from trunk to ogl-es branch.
Burnings renderer changes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:25:29 +02:00
cutealien 6f8df7fc29 Merging r5946 through r5966 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5967 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:53:23 +01: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 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 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
nadro ce6b7562ce Merge revision 4977:5180 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:32:01 +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
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
hybrid 15c3dc795a 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: svn://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 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 7bae34bc61 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: svn://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 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 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 b24d213745 Merged revisions 2375:2440 from trunk.
git-svn-id: svn://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 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 51484af6d3 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-12 10:11:25 +00:00
hybrid 7b4d76de26 Fixed some things in .obj texture handling.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1439 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-31 11:31:19 +00:00
hybrid d296e17fdb Fixed normal generation for obj files without normals.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1437 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-07-31 09:47:37 +00:00
hybrid c55da82a0c Merged revisions 1357:1366 from 1.4 branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1367 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-06-12 11:15:45 +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 304c3b2449 Fixed mem leak.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1319 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-22 16:12:24 +00:00
hybrid 6a0d4ea7b2 Changed ExposedVideoData to use void* under Windows, fixes problems on 64bit systems. Some other 64bit warnings silenced. All changes provided by Kosuha.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1313 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-09 09:15:12 +00:00
hybrid 7c19d2db5f Use the filesystem methods to deal with paths.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1294 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-19 10:22:33 +00:00
hybrid fb9366b41d Made obj group support optional via SceneParameter.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1264 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-26 17:15:13 +00:00
hybrid 96a5c452cd Added group support for .obj files.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1263 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-26 16:35:52 +00:00
hybrid 913ef64b5e Fixed obj bumpmap and clamp support.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1255 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-25 01:32:36 +00:00
hybrid a3a41d8085 Major update to LWO loader to support more material properties and work with more meshes. Changed some meshloader constructors to take scenemanager instead of other parameters. Fixed obj loader texture loading with mixed file separators.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1215 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-29 16:59:36 +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 154b5d91b8 Merged from 1.4 branch revisions 1155:1172
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1173 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-14 00:23:02 +00:00
hybrid 68cd81b194 Split texture layer properties from SMaterial. Changed all texture access etc. in source code and examples. There is also a method to access textures now, which would allow to grab and drop them...
Also disabled dx8 by default.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@992 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-20 15:33:36 +00:00
hybrid df946a1ce6 Removed unnecessary irr namespace prefixing.
Added STL mesh file format reader and writer. This is a pretty simple format, but I wanted to try the mesh writer interface.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@983 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-19 14:08:28 +00:00
hybrid 61a5af828e Some fixes for method signature unification and some other C++ fixes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@977 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-18 14:01:28 +00:00
hybrid f74f7586e2 Some more constification, but still not done. Now we have also SEvent in OnEvent as const ref, so most user apps will need some kind of upgrade for the new library version.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@964 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-16 23:41:55 +00:00
hybrid efc44f9bf7 More file position data type changes. Also reflecting this in user code.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@954 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-14 09:07:11 +00:00
hybrid 7c965509aa Fixed the unary minus bug reported by elvman.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@922 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-07 18:22:50 +00:00
hybrid 04ed098fe8 Fix the relative addressing for all types.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@919 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-07 08:57:15 +00:00
irrlicht b85584c8e1 renamed IUnknown to IReferenceCounted
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@916 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-07 06:11:47 +00:00
hybrid bda0b6e35f Merged SkinnedMesh branch 658:895 into trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@896 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-04 18:51:42 +00:00
hybrid cbc0fcc31d Avoid warning from MSVC
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@854 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-21 15:19:50 +00:00
hybrid 5cba00344b Fixed some more bugs in .obj loading, introduced in recent updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@847 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-19 20:56:27 +00:00
hybrid 4c74d89e82 Some minor changes. Simplified the .obj loader, also fixed some bugs.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@830 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-13 23:28:44 +00:00
hybrid 21efe402ba Fix relative indices in obj files.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@826 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-08 13:19:28 +00:00
hybrid ef4443353b Changed addArrowMesh parameter order. Changed OBJ loader to use stringc instead of dynamically allocated char array.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@766 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-07 20:08:47 +00:00