23 Commits

Author SHA1 Message Date
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
nadro
42660d13aa - Updated ogl-es branch to rev4182.
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: http://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
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
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
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
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
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
5e04a990eb Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-05-22 11:51:37 +00:00
bitplane
d8a6c6fcad Added debug data strings to most classes
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1340 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 20:54:12 +00:00
lukeph
2c6df8aa23 -fixed a bug in setting shader constants.
passing arrays were not working, can an openGL programmer check this is now right?

-let the user add a shader without a pixel or vertex shader, as docs state.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1080 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-12-03 08:03:21 +00:00
lukeph
7d8186cd7e added:
virtual void OnSetMaterial(const SMaterial& material) { }

to IShaderConstantSetCallBack, so the callback is able to set constants based on the properties of the used material.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@1060 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-11-18 13:03:57 +00:00
hybrid
c9fe29ad65 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: http://svn.code.sf.net/p/irrlicht/code/trunk@992 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-20 15:33:36 +00:00
hybrid
b6f6dec4d5 Made both materials const in OnSetMaterial.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@975 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-18 12:11:10 +00:00
hybrid
d95be8cb94 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: http://svn.code.sf.net/p/irrlicht/code/trunk@964 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-16 23:41:55 +00:00
hybrid
675cdfcb76 Fixed manual mipmap generation and removed the last glu function.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@889 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-02 19:45:17 +00:00
hybrid
a6e2f42437 Use c++ casts instead of plain C ones.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@818 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-02 09:50:59 +00:00
hybrid
6d3327ccb0 Mem leak fixed in d3d RTT code identified by vitek. Some redundant code removed and OpenGL shader materials fixed for changing number of textures.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@807 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-25 12:51:43 +00:00
hybrid
fabcbfe8b2 Added a name parameter to render target textures just as for usual textures.
Exposed findTexture in IVideoDriver to check if a texture was already loaded.
Reordered some more OpenGL render state settings in the materials.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@783 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-13 13:53:34 +00:00
hybrid
9c1f4cb46e Inlined the OpenGL access methods, also renamed some of them to make the names more durable in case the official methods are promoted.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@691 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-06-05 17:56:10 +00:00
bitplane
30b56d2ec5 Moved everything to /trunk
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-05-20 18:03:49 +00:00