4f7240d361
Fix compilation problems with both ogl-es drivers being enabled at the same time. Currently, the ogles 1.x driver won't work in such a configuration, though, at least with the emulator libs. So make sure you still enable only one ogles driver at a time.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3787 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-04 10:54:58 +00:00
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
58d6c11fa0
Fix compilation problems due to last update. Fix vc10 project files
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-17 08:37:00 +00:00
9b277bea38
Make shader path for ogles2 configurable via define.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3561 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-14 17:30:24 +00:00
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
4f6edf5e2e
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: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3370 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-08-08 17:46:48 +00:00
ab5739f571
Merged from trunk, revisions 3300-3365. Another large bugfix merge.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-07-18 21:25:27 +00:00
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
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
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
eabe3b66aa
Add another define check for better recognition of IPhone targets, as suggested by FuzzYspo0N.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2788 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-03 17:05:06 +00:00
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
e90ac51539
Adapt IPhone device creation to new multi-device scheme.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2762 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 18:52:35 +00:00
acb46f443e
Fix IPhone platform recognition and defines.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2761 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 13:30:51 +00:00
c46c4411e7
Fix missing endif.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2756 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 09:15:30 +00:00
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
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
2a708e0174
Fix interface changes from latest merge
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2365 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-05-05 21:14:21 +00:00
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
be8a2cf192
Fix some differences between trunk and branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2146 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-27 14:15:59 +00:00
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
1df5e063fb
Fix compilation on iPhone platform, submitted by grafikrobot.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2051 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-06 21:06:19 +00:00
e905a9ef0c
Added iPhone device and ogl-es support for it. Patch submitted by grafikrobot.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2022 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-03 01:02:59 +00:00
40966c5a1a
Add and comment the ogl-es extension define. Make opengl and ogl-es mutually exclusive by default.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2015 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-02 11:09:37 +00:00
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
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
0504cb817e
A compilable version of the ogl-es1 driver.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1727 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-12 23:04:00 +00:00
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
a9b64e9e5c
Removed some consts from POD type return values. Added missing imlementations in SSkinMeshBuffer.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1517 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-28 14:20:05 +00:00
fd61d6dd19
Removed some consts from POD type return values.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1516 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-28 14:08:12 +00:00
341dc16566
-added support for 32bit buffers in the opengl and directx9 drivers :) hopefully not buggy...
...
(may need to add support for directx8 and software?)
-made terrainNode use DynamicMeshBuffer, so it can use 32bit buffers. (no more size limits now on terrains!!! )
if the terrainNode loads an image over 256x256, it is set to 32bit, smaller sizes will use 16bit for better speed.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1515 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-28 04:00:22 +00:00
57485235b9
Added some vector operations which take just one scalar as argument.
...
Optimized isBetweenPoints for vector2d
Added some virtual qualifiers for better readability
Added some terrain interface methods which are not properly working, yet
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1513 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-26 11:46:07 +00:00
682a1200a8
Replaced transformBox by transformBoxEx to avoid major malfunction of the transformations when the transformation includes rotations.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1511 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-25 13:46:22 +00:00
d9c0ceb6ea
Change parameter to bool.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1509 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-20 08:51:31 +00:00
e78db30247
Docs update for trunk and branch.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1508 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-20 08:36:41 +00:00
2489bda2e8
Merged 1499:1506 from 1.4 branch: Doc updates, getEmitter added.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1507 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-20 08:24:52 +00:00
37e15009b5
Const correctness for a pointer.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1499 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-15 08:46:57 +00:00
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
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
565fc47062
Merged 1486-1488 from 1.4 branch, IImage methods exposed and MeshManipulator moved.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1489 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-13 23:48:33 +00:00
674b535c2b
Added hint on proper IMeshBuffer usage.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1484 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-10 21:26:35 +00:00
9f390fe59c
Make isBetweenPoints-check include the begin and end points.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1483 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-10 16:14:03 +00:00
b5d6000f8d
Added new mMeshManipulator method scaleTCoords to scale texture coords of a mesh. Added two new access methods to texture coords of vertices of a meshbuffer. This allowed to replace the template for planar mapping as well.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1479 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-09 12:04:56 +00:00
69389d0c9e
Renamed scaleMesh to scale, added support for meshbuffer scaling.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1478 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-09 10:34:58 +00:00
76547f8f97
Added support for proxy meshes as source of the shadow volume. This enables the use of a simplified version of a mesh for the generation of the shadow volume, which can significantly improve the render performance with shadow volumes. Patch provided by tonic.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1477 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-08 19:39:24 +00:00
3c45d6f44a
Merge with 1..4 branch revisions 1444:1475, namely the irrMap bug and changes.txt updates.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1476 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-08 15:25:43 +00:00
696baaa789
Removed signedned of colors, fixing the color flicker in software rendering.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1475 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-08 15:15:44 +00:00
07fa12d085
Added copy constructor and assignment operator to cope with const member.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1474 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-08 12:53:27 +00:00
5a1c69a9b3
Minor cleanup and constification of camera node.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1458 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-07 12:45:53 +00:00
f25d01b31b
Allow read-only locking of textures, which may improve the performance due to optimized access to the data and skipped updates when unlocking.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1456 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-08-07 11:59:42 +00:00
hybrid
lukeph