MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,360 Commits
2 Branches
0 Tags
38 MiB
Commit Graph

50 Commits (master)

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 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 a90caf6867 Merging r5918 through r5944 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5945 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-03-09 15:51:25 +01:00
cutealien 1e6c870ba2 Merging r5892 through r5916 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5917 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-03-09 15:46:26 +01:00
cutealien b8cf4ca4bf Split ogles2 shader for 2D rendering into a texture and non-texture variant. 
That's otherwise hard to do from user-code because 2d rendering works a little different than 3d.
This way it renders faster and also won't cause any warnings in WebGL.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5445 dfc29bdd-3216-0410-991c-e03cc46cb475
 2017-04-21 12:11:19 +00:00
nadro 50903517fc -Added support for embed Irrlicht view into existing UIView (iOS). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5232 dfc29bdd-3216-0410-991c-e03cc46cb475
 2016-01-03 18:33:17 +00:00
nadro 3fbea082cc - Fixed compilation issues on iOS. 
- Rewrote from scratch class related to iOS device (Application delegate is hidden inside Irrlicht -> events will be exposed outside in upcoming commit).
- Added iOS example (at now example structure for iOS looks the same like for the other platforms - without application delegate).
- Integrated iOS projects with existing XCode projects.
- Added external context manager with support for EAGL.
- Removed *.xib dependencies from iOS project.
- Added missing _IRR_OVERRIDE_ for some methods.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5213 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-12-13 19:13:45 +00:00
nadro ed78a4e3d1 - Merged rev 5202 from trunk. 
- Fixed support for OSX.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5203 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-12-05 17:34:57 +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 98a177e95b Can't use uniforms directly in for loops in glsl. Thx @feelthat for reporting. 
(it worked nevertheless on most systems, just not legal glsl code and on some phones it won't compile)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5117 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-08-11 20:26:40 +00:00
cutealien 831962cedb Give EMT_TRANSPARENT_ALPHA_CHANNEL it's own fragment shader. Fixes problem in q3 map reported by feelthat in the forum. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5033 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-02-03 16:19:30 +00:00
nadro a4f4f587dd Final fix for texture matrix issue in OpenGL ES2 driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4964 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-10-03 22:55:38 +00:00
cutealien 6f67d6904a Rework specular calculations for fixed function pipeline: 
- Reflection calculation fixed (thx @Nadro)
- Specular is now passed to the fragment shaders (as Irrlicht is using GL_SEPARATE_SPECULAR_COLOR in the fixed function pipeline).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4963 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-10-03 12:37:40 +00:00
nadro f9806e994c - Fixed issue with texture matrices and built-in OpenGL ES2 materials. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4958 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-10-02 18:22:36 +00:00
cutealien d448851f71 Fix global ambient calculation for es2 fixed pipeline simulation once more (I think this time I finally got it correct). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4957 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-10-02 15:36:58 +00:00
cutealien 36de8ea6a4 LightType did send too much data (wasn't causing troubles as the values got overwritten again) 
Solid material shader should only have 1 texture coordinate.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4949 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-09-29 23:42:39 +00:00
cutealien 84fa03f429 Global ambient must be added a little later to be similar to fixed function pipeline. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4945 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-09-26 01:07:17 +00:00
cutealien 25991b1d87 Add support for SMaterial::EmissiveColor to fixed pipeline simulation with es2 shaders. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4944 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-09-26 00:36:19 +00:00
cutealien b5ac7335b8 Add global ambient light to gles2 fixed function simulation shaders. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4942 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-09-25 00:19:42 +00:00
nadro 53371c5611 - Optimized 2D drawing in OpenGL ES2 driver. 
- Fixed issue with points drawing in OpenGL ES2 driver.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4907 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-07-28 17:49:05 +00:00
nadro 5d7a5e76c1 - Improved 2D material renderer in OpenGL ES2 driver. 
- Added stencil shadow support for OpenGL ES2 driver.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4905 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-07-22 21:45:38 +00:00
nadro 12a9df7e82 - Improved EMT_ONETEXTURE_BLEND material for OpenGL ES2.0 driver (it solve issue with black volume light in example no. 08). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4903 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-07-15 18:30:46 +00:00
nadro b36a92de2e - Added per vertex lighting and per fragment fog to all OpenGL ES2 built-in materials (spot light is missing). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4902 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-07-14 17:11:18 +00:00
nadro d4cd9c33cb - Fixed OGL ES2 built-in materials: 
* Added missing materials.
 * Improved compatibility with materials from other drivers (shaders are mapped mostly 1:1).
 * Improved performance.
 * Improved portability.

Lighting and fog are still unsupported except normal and parallax map materials.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4900 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-07-10 17:21:22 +00:00
nadro 4e090576f8 - Fixed issues with transparent materials in OpenGL ES 2.0 driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4518 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-05-04 20:50:30 +00:00
nadro 66de02a12e - Added official example for iOS (both iPhone and iPad devices are supported). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4516 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-05-01 17:06:23 +00:00
nadro 7458ed2537 - Fixed OGL ES2.x issues related to last updates of branch. 
- Added OGL ES 1.x and 2.x drivers to VS2012 project.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4506 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-07 21:27:11 +00:00
hybrid d5e6d04769 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 17:27:12 +00:00
hybrid 4f4ca75a4f Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-02 16:01:12 +00:00
nadro 27bdfd5beb - Fixed some of fixed pipeline materials in OGL ES2 driver (many of examples works fine now). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4482 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-20 00:30:45 +00:00
nadro a682d8393d - Fixed 2d material rendering in OGL ES2. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4436 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-15 19:23:46 +00:00
nadro 40b42e6010 - First version of rewritten OpenGL ES 2.0 driver (IDE projects aren't updated, 2d drawing methods doesn't work, only basic functionality of fixed pipeline materials). This driver will be improved soon. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4435 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-01-15 00:31:37 +00:00
nadro 5d8cb2efce - Fixed many issues with OGL ES 2.0 driver under iOS. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4245 dfc29bdd-3216-0410-991c-e03cc46cb475
 2012-07-13 23:16:59 +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 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 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
hybrid 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
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 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
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
hybrid 57ddd994dc Partially reverted the skybox changes, such that now only a right/left texture exchange is needed. Skyboxes are still correctly oriented and other tools are still compatible. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1021 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-10-05 07:48:53 +00:00
hybrid ebf823a832 Fixed logo position and image extension recognition. Added supported formats to window text. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1015 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-10-01 08:59:15 +00:00
hybrid ced5e21846 Fixed the skybox textures orientation. They are now displayed non-flipped. Existing skybox textures have to be exchanged and rotated, though. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1011 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-28 23:10:53 +00:00
hybrid ee11d66c0f Fix transparent particles. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@876 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-08-29 21:34:18 +00:00
hybrid 3253bc95c2 Another fix for the radius problem of lights. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@839 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-08-15 03:40:14 +00:00
bitplane b739adade8 removed demoback.bmp because demoback.jpg is now used in the demo 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@703 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-06-09 23:45:47 +00:00
bitplane c00ce1d372 Moved everything to /trunk 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-05-20 18:03:49 +00:00