Commit Graph

1333 Commits (ced66e610c6c740f1388e8205bfb3c48fcf22794)

Author SHA1 Message Date
Maksim 7fdb63d3cc iOS: add scaling support 2020-04-19 17:12:39 +02:00
Maksim 9574090ad9 iOS: update compiler vertsion, disable unused features 2020-04-19 17:12:39 +02:00
MoNTE48 3a9a15e948 libjpeg 9d of 12-Jan-2020 2020-04-13 20:39:20 +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 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 d5e0914d30 Fix compiling on Debian 10 and remove GLES1 support on Linux.
It seems Debian10 dropped support for GLES1. So with my only test-platform gone, I'll disable it by default for all Linux platforms. It's still enabled in Android (for now). Thought in the long run no one should  use GLES1 anymore anyway.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5893 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:46:16 +01:00
cutealien 6ee00a39fd Merging r5877 through r5891 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5892 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:46:11 +01:00
cutealien 14ffa95ccd Merging r5863 through r5876 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5891 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-03-09 15:46:04 +01: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 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
MoNTE48 674778e45a Update irrMath.h: remove s16 roundingError() 2019-11-12 17:39:24 +01:00
MoNTE48 48395bc1dd libpng - disable NEON (fix Undefined symbols on iOS, arm64) 2019-08-29 17:04:53 +02:00
MoNTE48 e2f5e5ed08 libpng 1.6.37 2019-08-29 14:46:00 +02:00
MoNTE48 2e7564b860 Update IEventReceiver.h 2019-08-17 02:10:06 +02:00
MoNTE48 adeb69d5ad Android: back button fix 2019-08-15 16:50:46 +02:00
MoNTE48 1f79f15bb3 iOS: xcodeproj fixes and optimizations 2019-08-15 16:30:42 +02:00
MoNTE48 eaee0c16e1 Other patches 2019-08-15 16:29:59 +02:00
MoNTE48 52880eaf1a iOS: patches 2019-08-15 16:29:49 +02:00
MoNTE48 908542b78f They forgot about iOS... 2019-08-08 22:26:31 +02:00
cutealien ab46f76665 Merging r5809 through r5810 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5811 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-05-20 21:08:01 +00:00
cutealien 237eb07bf4 Merging r5807 from trunk to ogl-es branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5808 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-04-24 21:10:47 +00:00
cutealien 291fb2ffac Merging r5788 through r5805 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5806 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-04-23 20:17:39 +00:00
cutealien 902aa7fa5e Merging r5780 through r5786 from trunk to ogl-es branch
Note: EGL context manager continues to ignore calls trying to change the context.
So no multithreading support for that one so far.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5787 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-03-14 23:03:26 +00:00
cutealien 990d475fbb Merging r5686 through r5778 from trunk to ogl-es branch (part 2)
(was in wrong folder in last commit, so only source folder got checked in).
Also adapt ES1 and ES2 driver to remove texture from OGL texture cache
(that was fixed in GL driver in the parts that got merged).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5780 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:30:26 +00:00
cutealien d236d99c6c Merging r5686 through r5778 from trunk to ogl-es branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5779 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:20:38 +00:00
cutealien 0f217d3c5a Fix paths in android example documentation.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5687 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 23:21:30 +00:00
cutealien 202977fe38 Merging r5679 through r5685 from trunk to ogl-es branch
- Fix several problems with SMaterial serialization.
- SMaterial.ZWriteFineControl only using 1 bit now.
- Remove compile warnings.
- Switch Irrlicht to 8 textures per Material as default by increasing value of _IRR_MATERIAL_MAX_TEXTURES_.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5686 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 23:15:56 +00:00
cutealien ac376727d0 Merging r5678 from trunk to ogl-es branch
- Add global variable MATERIAL_MAX_TEXTURES_USED for texture limit
- COpenGLCoreFeature::TextureUnit renamed to COpenGLCoreFeature::MaxTextureUnits
Drivers for ES1, ES2 and WebGL also adapted.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5685 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 23:11:18 +00:00
cutealien dad0695522 Merging r5673 through r5677 from trunk to ogl-es branch:
- OpenGL driver no longer changes active texture as often when it doesn't have to do anything with the texture.
- setMaterial no longer changes texture-matrices in GL and D3D9 when no texture-pointer is set.
- No longer overwrite memory when compiling with _IRR_MATERIAL_MAX_TEXTURES_ set to a value > 8
- Checking TextureMatrix pointer before de-allocating.
- Create pdb file also in release in vs2010 project file.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5684 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 22:52:49 +00:00
cutealien 021839deee Merging r5664 through r5672 from trunk to ogl-es:
- Allow to create images with floating point formats. 
- No longer set world transform twice in CMeshSceneNode.
- Add IMaterialRenderer::getShaderConstantSetCallBack to allow access to user provided shader callbacks.
- Reset blend and alphatest states in GL and GLSL shader materials.
- Fix memory leak in OpenGL for automatic generated rendertarget depthbuffer textures.
- Remove .aps file from source control.
- Get rid of compile warnings in CAnimatedMeshHalfLife.cpp


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5683 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 22:47:46 +00:00
cutealien 00c13a165b Add comment (thx @DevSH for hint about glCopyTexImage2D)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5665 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-11-25 23:19:58 +00: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 60708ed1cb Merging r5650 through r5651 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5652 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-10-29 21:37:01 +00:00
cutealien 5a4274203b Merging r5623 through r5649 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5650 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-10-29 21:25:43 +00:00
dbocksteger 59699aa05c Added Default-value for ISceneNode->Name so the code won't crash if someone tries to compare it with empty...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5647 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-10-04 07:34:28 +00:00
cutealien 4ea4f3be95 Make it easier to enable support for compiling emscripten to wasm.
Add some documentation.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5638 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-08-18 19:50:51 +00:00
cutealien b69f9f387a Check-in correct html for emscripten example.
Sorry, I never noticed that one was missing and it instead had a useless tutorial.hmtl in the folder :-(

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5637 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-08-17 10:56:13 +00:00
cutealien bdb412cd44 Merge revisions r5604 through r5621 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5622 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-06-17 20:01:00 +00:00
cutealien 67d3ffbc1f Merge revisions r5598 through r5602 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5603 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-02-18 16:06:44 +00:00
cutealien 08312fa15c Fix compile error.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5600 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-01-09 20:59:20 +00:00
cutealien a54461fc10 Fix compiling with _IRR_COMPILE_WITH_WEBGL1_ disabled. Thx@ hissingshark for reporting.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5599 dfc29bdd-3216-0410-991c-e03cc46cb475
2018-01-09 20:54:41 +00:00
cutealien 248526d9d5 Apply fix from r5595 to correct LastMaterial in OpenGLDriver to the OGL ES drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5598 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-12-31 20:51:50 +00:00
cutealien e3d6a907ff Merge revisions r5570 through r5596 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5597 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-12-31 20:48:18 +00:00
cutealien 68480aacc7 ECF_D16 is only available in WebGL with WEBGL_depth_texture extension.
Add some more debug output to opengl texture in debug when things go wrong.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5573 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-11-07 22:19:39 +00:00
cutealien 12323e4115 Merge revisions r5568 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5569 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-11-06 14:40:56 +00:00
cutealien 87db86ddfd Merge revisions r5554 through r5566 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5567 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-11-06 14:27:34 +00:00
cutealien 56317e5278 Get 24bit/32bit rendertarget textures working in WebGL.
WEBGL_depth_texture doesn't use same symbols as OES_packed_depth_stencil & OES_depth32 and also does not allow attaching depth and stencil buffers to RTT like other GL versions.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5557 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-30 16:08:23 +00:00
cutealien 54ba627a72 Separate es2 and WebGL extension handlers. Should allow to get RTT's with depht buffers > 16bit to work.
While names of WebGL extensions are 90% identical to ES2, at some point the WebGL committee seems to have decided 
that it's better to give new names to the same stuff (RTT's with depth-buffer for example, but I'm sure they had a good reason?).
So we have to split this and now have mostly independent extension handlers. Still - WebGLDriver is lazy and derives from 
ES2Driver and that derives from ES2ExtensionHandler... so unfortunately WebGL driver has now 2 extension handlers.
The way it's solved for now is that extension strings are handled by the webgl extension handler and everything else
stays for now with the ES2ExtensionHandler. Maybe we can split/merge stuff later in a better way, but I see no easy to implement improvement.
Could be we could pass extension handlers as template paramter to drivers maybe, but that's just an idea for now.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5556 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-27 16:48:00 +00:00
cutealien 87546d90ad To stay in Irrlicht style add 'virtual' qualifiers in derived classes.
Also improve some code comments.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5555 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-26 18:51:02 +00:00