Commit Graph

1172 Commits (master)

Author SHA1 Message Date
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
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 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 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
cutealien 397a27fbc9 Remove superfluos call to emscripten_set_canvas_size when handling sdl_resize.
This should be the other way round - sdl resize event gets triggered when emscripten_set_canvas_size is called.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5510 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-20 15:39:42 +00:00
cutealien 3304309867 Bugfix: Inform videodriver about new size when created by getting size from canvas (on emscripten).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5509 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-20 13:21:05 +00:00
cutealien 854cdd5573 Rever accidentally checked-in changes for SDL_Flags (was not tested yet and not yet working).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5505 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-18 18:24:31 +00:00
cutealien bad05c903d Can now use canvas size in emscripten by passing 0,0 for width/height in createDevice.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5504 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-18 17:55:46 +00:00
cutealien 2117249df1 Break up long log messages on Android as they are cut otherwise.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5503 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-16 14:55:14 +00:00
cutealien 80718d0e60 Merge revisions r5484 through r5501 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5502 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-16 14:30:26 +00:00
cutealien a3d31d7a48 Make internalFormat and pixelFormat identical in ES 2 driver.
Noticed some driver bugs in emscripten when using ECF_D16 which were not identical and 
it seems that since ES 2.0 those values have to match. Specification is slightly fuzzy 
on the term (says "match", not "identical" or "equal"), but found no other interpretation online.
If I understand it correctly this also means in ES 2 we have no guarantee which format is really used internally.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5493 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-03 17:00:23 +00:00
cutealien 380d186d3f Rolled back to r5490. Was likely a misunderstanding
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5492 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-03 16:37:29 +00:00
cutealien 3a2a0eede9 Remove getZBufferBits from ogl-es drivers.
It's never used. Also if I guess the intended use for it correctly (figuring out internFormat to use for depth-buffer textures)
then there will be a problem with that implementation as it only works for OpenGL that way (maybe also ES1.0, not sure there, but for ES2.0 it looks wrong).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5491 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-03 16:08:44 +00:00
cutealien ff7a1c154f Merge revisions r5476 through r5483 from trunk to ogl-es-
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5484 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-11 18:34:38 +00:00
cutealien 7766187be4 Use new zbuffer-test (which was already in OpenGL) in OGL-ES1 and OGL-ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5477 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-08 13:11:46 +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 c3ed02c8d0 setRenderStates3DMode in ES1 and ES2 now use setBlendFunc with (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) instead of (GL_ONE, GL_ONE_MINUS_SRC_COLOR).
This prevents color blending with background when we only want alpha blending (when EBO_ADD is set in materials).
It's something that was changed a few years ago in the OpenGL driver, but never made it into the ES drivers.
Note that transparency in ES1 _is_ currently broken - but it was broken before this patch already (so another bug to hunt).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5473 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-07 10:21:30 +00:00
cutealien e1c93e64fb Fix crash introduced in r5213. Thanks @stoneageartisans for reporting.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5463 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-05-28 19:47:35 +00:00
cutealien b46adf170d Add line numbers to gl errors in es1 and es2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5462 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-05-25 14:57:27 +00:00
cutealien 92f42e41bf Add events when mouse enters/leaves canvas on emscripten. Handle that in fps-camera.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5457 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-26 16:05:03 +00:00
cutealien d4a0f30d82 Emscripten allows now mouse-locking in windowed-mode (on click on the canvas).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5456 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-26 14:12:12 +00:00
cutealien 81caa16886 Get pointer-locking working with SDL-device and emscripten (fullscreen only so far).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5455 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-25 13:54:19 +00:00
cutealien a12369f2ef Merge revisions r5450:r5453 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5454 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-24 13:51:58 +00:00
cutealien edccfadfec Merge revisions r5441:r5448 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5449 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-21 14:34:12 +00:00
cutealien dbb2590c55 Disable NPOT support for webgl driver. This also allows to enable mip-mapping again.
WebGL allows NPOT textures in very specific situations (no mips, no filters, no texture-repeats), but disabling it by default fixes a lot of problems.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5447 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-21 13:00:07 +00:00
cutealien 9fb422b496 Make most variables in OGLES2Driver private again (had been changed while developing WebGL driver).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5446 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-21 12:32:35 +00: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
cutealien 8be8f18f47 WebGL driver now supports most calls.
Exceptions are:
- drawStencilShadowVolume
- drawVertexPrimitiveList without VBO's
- Things using drawVertexPrimitiveList without VBO's: CParticleSytemSceneNode, VideoDriver:drawIndexedTriangleList, VideoDriver:drawIndexedTriangleFan
- Things using VideoDriver:drawIndexedTriangleList: CBillboardSceneNode, COctreeSceneNode without VBO (but that can use VBO's now always).
- Things using VideoDriver:drawIndexedTriangleFan: CSkyBoxSceneNode


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5444 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-20 15:05:07 +00:00
cutealien c4e74c6350 Essential driver functions for GUI now working in WebGL driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5443 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-20 12:28:11 +00:00
cutealien f2392c775b Remove debug code in OOGLES2Driver which got checked-in accidentally.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5442 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-20 10:08:37 +00:00
cutealien 4a5eaeb45d Add support for (experimental) WebGL1 driver for emscripten (still work in process).
It's a reduced OGLES2 driver which tries to work only with bound buffers.
This allows emsripten to compile without "-s FULL_ES2=1" (the WebGL simulation) 
which is a lot faster. Driver can already run simply examples, but is not yet complete.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5441 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:30:37 +00:00
cutealien d3c91b659d Merge revisions r5438:r5439 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5440 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:22:40 +00:00
cutealien d00ade6cbd Merge revisions r5434:r5436 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5437 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:15:26 +00:00
cutealien 14aef903e5 Merge revisions r5428:r5432 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5433 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-18 12:35:58 +00:00
cutealien 3ac8d2649a ogles1 and ogles2 drivers now support meshbuffers with other primitives than just triangles.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5432 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-18 12:30:57 +00:00
cutealien 8dfcbde957 Merge revisions r5419:r5425 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5426 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-15 17:18:44 +00:00
cutealien 37c8b9d64b Cleanup in comments.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5424 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-14 13:36:37 +00:00
cutealien 6d674faf84 Call SDL_SetVideoMode also for emscripten to get mouse-events working.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5422 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-13 15:24:15 +00:00
cutealien 15128e6e9f Merge revisions r5416:r5420 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5421 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-13 12:42:29 +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 63c2864db5 Add some docs to Makefile how to reduce Irrlicht size from there.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5415 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 14:51:36 +00:00
cutealien beb1f94695 Add flag -s NO_EXIT_RUNTIME=1 to emscripten build.
Improve emscripten example documenation.
Mention addition of emscripten support in changes.txt


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5413 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 13:48:44 +00:00
cutealien 8860c5c9ce Some compile flag changes for emscripten.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5412 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 11:02:55 +00:00
cutealien eae3c95085 Fix bugs I accidentally introduced in patching. Thanks at @labsin for going over this once more and sending me fixes again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5411 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 09:55:28 +00:00
cutealien 41c8c32435 Avoid having to change IrrCompileConfig for emscripten - do set corresponding define in Makefile.
Fix Makefile paths for emscripten.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5409 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-11 13:30:25 +00:00
cutealien 55040b8c57 Add experimental emscripten port. Thanks @labsin for the patch.
Note: To compile on Linux you currently have to enable the line with:
//#define _IRR_LINUX_PLATFORM_ //Hack
in IrrCompileConfig.h 
(will try to find another solution later, but currently working on Windows)
Not yet tested at all on Windows.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5406 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-10 13:54:55 +00:00
cutealien de850be768 Trying to get ogles2 running on Windows.
It compiles now (with PowerVR SDK), but haven't managed yet to get it working without crash (crashes on first call go glDrawElements so far).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5404 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-07 14:48:31 +00:00
cutealien 7b62795877 git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5403 dfc29bdd-3216-0410-991c-e03cc46cb475 2017-04-07 14:22:22 +00:00
nadro 5dae8edba4 - Fixed compilation issues on Xcode 8.x.
- Increased macOS deployment target to 10.9.
- Increased iOS deployment target to 8.0.
- (Known bug) Software drivers don't work in macOS Sierra.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5401 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-06 19:30:11 +00:00
cutealien 88b27cbdeb Fix last merge (revisions 5316:5335 from trunk to ogl-es).
Sorry, accidentally only the android sub-folder got checked-in and the rest was missing.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5366 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-03-13 14:54:20 +00:00
cutealien 6ea1113044 Merge revisions 5316:5335 from trunk to ogl-es:
- Fixed mipmaps rendering in Burning's driver.
- jpg loader can now load more jpg formats.
- SceneCollisionManager now using const camera pointers.
- Fix several bugs in multibyteToWString.
- Add clear function to strings.
- IReadFile::read and IWriteFile::write now returning size_t (like fread, fwrite in c-lib, but unfortunately unlike Android asset read function).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5336 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-09-10 13:16:43 +00:00
cutealien 237cacddaf Merge revision 5312:5315 from trunk to ogl-es.
- Update libpng to 1.6.23 (from 1.6.21)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5316 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-07-09 09:47:01 +00:00
cutealien 47ccb75105 Fix compiling android version on some systems (thx @bmiller for report)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5313 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-07-08 23:04:43 +00:00
cutealien be5793727d Merge revision 5303:5311 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5312 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-07-08 22:11:55 +00:00
cutealien 2a7094889a Merge revision 5277:5302 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5303 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-05-27 19:47:59 +00:00
cutealien d71de62995 Fix missing case in COGLES1Driver::getColorFormatParameters.
Thanks @ cheqnk for report and patch.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5296 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-04-22 08:34:24 +00:00
cutealien 008f76778e Fix compiling on iOS (thx @IrrlichtForiOS for report and bugfix).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5292 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-22 10:10:54 +00:00
cutealien 54b8cba398 Fix compiling part 2: Android.mk now using our local library include paths for zlib, libpng and jpeglib
(how did we never get version mismatch errors for zlib before?)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5291 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-18 17:56:48 +00:00
cutealien d16f529f18 Fix compiling (part 1 - still has some library troubles)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5290 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-18 17:36:56 +00:00
cutealien 54c19cd9a2 Merge revisions 5282:5288 from trunk to ogl-es branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5289 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-18 17:28:45 +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
cutealien 5c1deb8550 Merge revision 5276 from trunk to ogl-es
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5287 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-18 17:22:50 +00:00
nadro b371f08d4a - Merged rev 5258-5275 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5286 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-17 22:17:43 +00:00
nadro 9773157768 - Fixed issue with CurrentRenderTargetSize vs. CurrentRendertargetSize in OpenGL ES drivers. Thanks cheqnk for report.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5257 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-13 11:13:44 +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
cutealien cc3823e853 Merge revision 5248:5253 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5254 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-04 23:09:30 +00:00
cutealien 4bec38501f Remove some files from .cbp which no longer exist.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5251 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-03 20:30:58 +00:00
cutealien 241e343ba1 Potential fix for a compile problem on some Android systems.
See http://irrlicht.sourceforge.net/forum/viewtopic.php?f=4&t=51196&p=296927#p296927


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5250 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-03 20:25:49 +00:00
nadro 216af56b04 - Merged rev 5247 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5248 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-17 13:38:01 +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 f2c8b5760a - Fixed compilation issues on iOS when built-in main is disabled.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5236 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-06 16:36:04 +00:00
nadro 5029043db0 - Minor fix for iOS device handling.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5235 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-06 16:33:55 +00:00
nadro 27bf238aa5 - Fixed texture rendering in both OpenGL ES1 and ES2 drivers on iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5234 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 18:39:39 +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 56690ed51d - Minor fix for previous commit.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5231 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 00:51:08 +00:00
nadro 1318b5d614 -Added support for use custom UIApplicationDelegate in iOS apps.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5230 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 00:47:42 +00:00
nadro e5383e1041 - Added application state events support for iOS platform.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5229 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-02 18:49:31 +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 0200408475 - Fixed issue with depth color formats in OpenGL drivers (example no. 13 works properly at now).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5221 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-17 12:44:24 +00:00
nadro e604a608eb - Merged rev 5212-5219 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5220 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-15 21:06:53 +00:00
nadro e6fe1abc16 - Fixed texture rendering issues in OpenGL ES drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5217 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-14 22:51:01 +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
cutealien d845c35e7d Merge revision 5207:5210 from trunk to ogl-es
- Initialize ContextManager pointer and release it's memory at the end.
- Fix: Prevent division by 0 in CGUIScrollBar::setPos
- Fix: addFileArchive now grab()'s the archive when you pass one in by pointer.
Android example now no longer crashes. But it's textures are still broken.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5211 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-12 20:42:55 +00:00
nadro 878685affa - Merged rev 5205-5206 from trunk.
- Fixed version detecting mechanism for both OpenGL ES drivers.

Following features are still unavailable in ogl-es branch since rev 5181:
* 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@5207 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-07 20:06:53 +00:00
nadro a660cd1d38 - Fixed compilation issues on Android.
- Fixed compilation issues when OpenGL ES1 driver is enabled. (there are still rendering issues related to multitexturing visible in a few examples).

Following features are still unavailable in ogl-es branch since rev 5181:
* 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@5204 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-06 19:56:33 +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 4d03349573 - Merged revision 5192 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@5193 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-28 12:10:25 +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 e8db0e6662 - Merged revision 5183 from trunk.
- Fixed support for Android.

Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Cubemap textures in OpenGL drivers
* 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@5184 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-14 16:40:11 +00:00
nadro 96cf944466 Merge revision 5180 from trunk to ogl-es (during previous commit TortoiseSVN throw error, but it looks like merge was sent properly on the repo except modifications from this commit).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5182 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-11-12 22:50:30 +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 58fa0cf341 One of the COGLESDriver draw2DImage renamed to draw2DImageBatch as in other drivers. Thx @feelthat for reporting.
Added _IRR_OVERRIDE macros to both GLES drivers and fixed one more overload where it had gone wrong.
Enabled c++11 compiling on in c::b project files on Linux to find those kind of troubles faster.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5122 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-08-29 12:43:09 +00:00
cutealien 3dbf7c9de6 Return reference to a local static instead of a reference to 0 in an error cases (was undefined c++).
Thx @floriang for reporting at http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=50877



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5113 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-07-30 21:53:21 +00:00
cutealien 045e381941 Get the back-key in Android working with Irrlicht edit-boxes.
Also some debug-output (all out-commented for now, just useful for debugging Irrlicht itself).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5063 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-03-02 21:10:06 +00:00
cutealien 54d361d5c0 Fix 2 bugs with virtual-keyboard input on Android which could both lead to crashes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5061 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-03-02 16:05:20 +00:00
cutealien b0217b078d Add a E_TEXTURE_CREATION_FLAG called ETCF_ALLOW_MEMORY_COPY to allow keeping texture copies in memory for fast locking.
It's disabled by default, but always used for fonts.
Also return now 0 for mipmaps when locking as that part was/is not yet supported.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5037 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-11 13:19:05 +00:00
cutealien c40929096b Add gyroscope and accelerometer support for Android.
Patch is from ent1ty and was posted here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=6&t=37235&p=288022
Note: We plan to change this interface before merging with svn trunk (input-devices will get their own class).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5035 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-02-08 17:55:26 +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 e5d3488c1b Improvements in COGLES2Texture::lock method:
- support for textures bigger than a screen size.
- support for NPOT textures.
- performance optimizations.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5002 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-22 16:09:51 +00:00
nadro f34b554cde - Fixed COGLES2Texture::lock issue related to transparency textures. Thanks CuteAlien for your help in diagnose this issue.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4999 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-19 18:30:59 +00:00
nadro 55f761aa0e - Fixed wrong data size in COGLES2Texture::lock method.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4996 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-16 18:27:40 +00:00
nadro 31f5257a1a - Fixed RGB color formats and COGLES2Texture::unlock issue which caused image corruptions on some devices.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4995 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-13 18:10:17 +00:00
nadro 13c1adeae8 - Fixed minor bug in COGLES2Texture::lock method.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4994 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-09 21:35:52 +00:00
nadro 971059c81c - Improved texture handling in OpenGL ES2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4993 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-09 18:41:49 +00:00
nadro bba02a5d20 - Fixed COGLES2Texture::lock method.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4992 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-08 17:34:34 +00:00
nadro afec6508a8 - Solved issue with high memory usage by ITexture objects in OpenGL ES2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4990 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-12-04 18:26:18 +00:00
nadro dbee39e634 - Minor code improvements, replaced if-else block by switch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4981 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-27 18:19:19 +00:00
cutealien 7ac215ee11 Just some cleanup (spelling, double breaks, Irrlicht variable style, static-cast instead of c-casts, fix intialize re-order warnings)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4976 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-16 14:35:26 +00:00
cutealien bdbb6dffb6 Add profiling info for the es2 driver.
Adding profile info in functions used that starts being noticable in executation speed, so I've disabled profiling now by default (forgive me if enabling again continues to slip in once in a while - I profile a lot currently in this branch).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4975 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 22:50:34 +00:00
cutealien b200ad6f46 Merge revision 4971:4973 from trunk to ogl-es:
- IGUIProfiler has now more and better display filters.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4974 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 19:42:11 +00:00
cutealien 19a829138d Merge revision 4961:4971 from trunk to ogl-es:
- Allow moving the camera around with the mouse in the MaterialViewer.
- Allow compiling on VS with (/Zc:wchar_t-) set.
- bugfix: CUserPointerAttribute::setString had used wrong scanf string parameters (and as far as I can see never worked).
- Can now enable/disable backround drawing for IGUITable and IGUIProfiler.
- Make profiler start/stop calls use counters to make profiling recursive functions easier.
- IGUIProfiler can now work with any profiler using the IProfiler interface.
- Allow to freeze the IGUIProfiler interface.
- Allow IGUIProfiler to display all profile groups on the same page.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4972 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-15 00:55:50 +00:00
nadro d50be349ca Fixed issue with ECFN_DISABLED state in OGL ES and ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4965 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-11 09:37:30 +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 43817f07f7 Merge revision 4939:4954 from trunk to ogl-es:
- Bugfix: Cloning CBillboardSceneNode now copies colors and sizes.
- Last fix to enable numkeys on X11 had broken the normal DELETE key on X11. So reworked the fix some more.
- Array index was used before limit check
- Add an array with driver name strings for the driver enums.
- Cleaning up Meshviewer example. 
Also added a project target for LinuxGLES2 for the MaterielViewer cbp (this should be done for all examples at some point).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4955 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-01 22:02:09 +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