Commit Graph

1360 Commits (master)

Author SHA1 Message Date
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
cutealien 66530e3941 Add another way to select a context in CEGLManager.
Emscripten can't use eglChooseConfig so far (it won't return best context, but just any), 
so we have to work with eglGetConfigs instead and figure out the best egl context.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5554 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-25 17:37:07 +00:00
cutealien 3d19965f91 Merge revisions r5549 through r5552 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5553 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-25 12:48:36 +00:00
cutealien 70363e0819 Evaluate more device creation parameters in emscripten.
We can now use hardware antialiasing in emscripten.
Print some info about used SDL flags to log.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5551 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-23 22:03:18 +00:00
cutealien c376454941 Use SDL_FLAGS variable also in emscripten and ensure it always uses SDL_OPENGL.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5550 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-23 21:24:50 +00:00
cutealien cac82280ee Update emscripten example Makefile.
Using c++11 for emscripten.
Some minor link fixes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5549 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-23 21:18:14 +00:00
cutealien 3a1a4a78ea Merge revisions r5540 through r5547 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5548 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-23 20:23:20 +00:00
cutealien 44b211800b Add some more log messages for android app commands.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5543 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-09-24 19:36:33 +00:00
cutealien 65e41da94b Remove some warnings.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5541 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-30 13:28:36 +00:00
cutealien b5d46535e7 Remove warnings in ES1 and ES2 getColorFormatParameters functions as was done in OpenGL before.
(warnings are now produced instead of places calling those functions).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5540 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-30 13:27:27 +00:00
cutealien 7bd44b9733 Merge revisions r5532 through r5538 from trunk to ogl-es-
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5539 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-30 13:20:12 +00:00
cutealien 5450247e6b Merge revisions r5525 through r5530 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5531 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-24 14:11:29 +00:00
cutealien c20dc5cc6f Add support for ECF_A16B16G16R16F and ECF_A32B32G32R32F color formats for es2.
Use emscripten headers now for es2 when compiling with emscripten (instead of our own extension headers).
Try enabling es2 extensions for emscripten (compiles, but not yet tested)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5527 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-23 14:56:35 +00:00
cutealien e4b8e7210f Fix compiling es2 driver on platforms without GL_EXT_texture_rg.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5526 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-23 13:03:36 +00:00
cutealien 62ac2fd2e1 Implement queryTextureFormat for es1 and es2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5525 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-21 14:34:56 +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 33bfe098e7 Add support for more formats on ES2 (with extensions): ECF_R8, ECF_R8G8, ECF_R16F, ECF_G16R16F
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5522 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-18 14:50:10 +00:00
cutealien 20418b3126 Unify GLES extension handling.
Update ES extensions (first 290 now recognized)
Get examples 2 to compile in c::b (most other examples still need to fix linker settings)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5521 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-18 13:28:20 +00:00
cutealien 0a5bbcde85 Update ext headers for es1 and es2 with newest versions from khronos.
Remove eglext.h as it's not used anywhere in Irrlicht so far.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5520 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-17 20:44:56 +00:00
cutealien 246293a570 Merge revisions r5516 through r5518 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5519 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-16 12:06:39 +00:00
cutealien e54b5aa198 Fix some problems with keyboard input on emscripten. Most special or control characters no longer cause white-space in editbox, but are now used correctly.
Some keys (like AltGr) are still somewhat trouble. 
This is basically a workaround because SDL_event.key.keysym.unicode is deprecated on emscripten and returns different results than SDL on other platforms.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5516 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-07 18:22:24 +00:00
cutealien 53a1d9f724 Merge revisions r5503 through r5514 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5515 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-07 17:30:46 +00:00
cutealien 237111814f Fix compiling SDL without emscripten.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5513 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-07 14:18:16 +00:00
cutealien 32cef51975 Removing our newline when logging on emscripten as emscripten_log seems to add it's own newline.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5512 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-29 12:35:22 +00:00