Commit Graph

86 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 cbe0894397 Merging r6250 through r6254 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:04:38 +02:00
cutealien 195d12f57b Merging r6073 through r6074 from trunk to ogl-es branch.
The support for UINT shader constants added in this is just returning warnings in GLES drivers as this would need ES 3.0


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6115 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-12 15:42:43 +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 c9f5503436 Merging r5843 through r5862 from trunk to ogl-es branch
Adapting both GLES drivers to new addHighLevelShaderMaterial interfaces.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5890 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:45:59 +01:00
cutealien 252abab03d Merging r5652 through r5663 from trunk to ogl-es.
This is mostly about cubemap changes. ES drivers compile, but not tested
if cubemaps work with them.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5664 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-11-25 15:44:47 +00:00
cutealien f184d58cfe Merge revisions r5520 through r5523 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5524 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-21 13:57:06 +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 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 0fc5d21a40 Merge revision 5277:5282 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5288 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-18 17:24:46 +00:00
nadro bf419bedf3 - Merged rev 5255 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5256 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-13 11:09:36 +00:00
nadro db0dac2f09 - Merged rev 5226-5244 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5246 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-17 13:08:20 +00:00
nadro bf3273cb5f - Merged rev 5222-5223 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5224 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-17 19:48:24 +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 179c3d6cb0 - Merged rev 5199-5200 from trunk.
Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(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@5201 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-29 22:45:24 +00:00
nadro 58cba0b3c6 - Merged revision 5195-5197 from trunk.
Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(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@5198 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-28 23:18:00 +00:00
nadro 0cc2e6dc45 - Merged revision 5185-5190 from trunk.
- Fixed cubemap texture support for OpenGL drivers.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(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@5191 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-27 22:39:12 +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 6a85f02978 Merge revision 4911:4919 from trunk to ogl-es (4918 ignored as it got reverted again in trunk):
- Fixed issues with setViewPort method under OpenGL


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4933 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-18 13:22:35 +00:00
nadro 532627be51 - Fixed issue with crash at COpenGLDriver::removeTexture call.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4908 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-29 18:03:22 +00:00
cutealien c8fe2d4e3b Merge revision 4793:4795 from trunk to ogl-es.
NOTE: not yet 100% certain if bridgecalls are deleted in the correct place - will have to let Nadro check that later on.
- Minor improvement in SMaterial::isTransparent method.
- Added separate blending support for both OpenGL and D3D9.
- Added blend factor to SMaterial.
- Improved transparent nodes handling.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4846 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:58:33 +00:00
cutealien 14fed808ce Merge revision 4781:4782 from trunk to ogl-es:
- Fixed issue with OpenGL MRTs indexed blending.
- Optimized OpenGL blending calls.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4839 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 15:57:30 +00:00
nadro c8191d7a1f Added NSOpenGL manager.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4697 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-19 23:07:35 +00:00
nadro bce0ada646 - Added support for GLX manager (Hybrid is author of this patch, I just tested it).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4668 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-16 01:13:35 +00:00
cutealien 69639235cb Merge r4560-4561 from trunk:
- Fixed compilation issues with CG support enabled.
- Moved setBasicRenderStates methods calls in shader based material renderers to the same place as in standard fixed pipeline material renderers (first lines of OnSetMaterial method).
- Fixed bug with texture states in OpenGL.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4642 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:09:02 +00:00
cutealien dc91c57ddf Merge r4559 from trunk:
Improved switch between fixed and programmable pipeline materials.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4641 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 23:06:31 +00:00
cutealien 5cc50195e7 Merge r4546-4547 from trunk:
Fix syntax problems in Cg renderer base classes, which came from the override changes.
Third round of override macro updates. Should have touched all functions stating virtual for now. This might still have missed some, as sometimes the virtual keyword is missing on derived functions. And some open points are also still under consideration, will be fixed in future.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4636 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:41:53 +00:00
cutealien 6740009946 Merge r4545 from trunk:
Second round of override checks
Exposed some more functions:
getArchiveName returning name (path) of archive
getColor and getColorHSL for color select dialog
get/setDoubleClickTime in device for setting the time offset necessary to have two separate clicks instead of a double-click
Removed deprecated getXJoint and getMS3DJoint functions
NOTE: CAndroidAssetFileArchive::getArchiveName had to be added additionally to this patch.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4635 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 22:37:26 +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
cutealien e9c9da9a9c Merge r4540 from trunk:
Fix name and parameters of draw2dImageBatch call, which was not yet used due to wrong override.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4632 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-07 21:42:11 +00:00
nadro 5dca9a0a06 - Added support for texture cube in OpenGL driver.
- Fixed issue related to regenerateMipMapLevels in OpenGL driver.
- Added missing files to VS2012 project.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4610 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-18 22:41:30 +00:00
hybrid 2d4193888e Improvements of the context manager in order to prepare context switching.
Implement WGL context manager
OGLES2 driver was not yet working again, might be a different problem, though. Andoird device was not tested.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4605 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-13 23:20:30 +00:00
hybrid 2ec010d0a5 Merged revisions 4511-4534 from trunk. OpenGL bug fix, wchar filesystem fix, clone method fix, tris fix, heightmap optimization, x mesh loader fix
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4535 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-06-04 14:47:05 +00:00
hybrid aec5a3afae Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4511 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-17 17:45:53 +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 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 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 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 102926d963 First set of fixes to make ogl-es driver usable with latest Irrlicht API again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2706 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-01 17:00:20 +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 9faf6eca97 Use includes with full paths for OSX.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2249 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-03-04 08:16:56 +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 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