Commit Graph

1360 Commits (master)

Author SHA1 Message Date
cutealien 5bccd00a00 Link example 01 also to libs necessary for OGL ES1&2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5511 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-22 14:52:11 +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 7f190b80cd Add the code in emscripten hello_worldd which was missing in last 2 check-ins (sorry).
- Add a function to check for canvas resizes 
- Switch to WebGL1 driver


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5508 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-19 13:05:25 +00:00
cutealien 60d2798d9d Add some function which allows to check for canvas size changes in emscripten.
But not yet working well together with emscripten default html template (also not worse than before).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5507 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-18 18:42:50 +00:00
cutealien 6705452474 Switch to using WebGL1 driver by default for emscripten (better optimized).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5506 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-18 18:27:19 +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 4637ba2281 Add RTT example 13 for emscripten.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5498 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-05 12:34:45 +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 e316100012 Fix spelling in comment.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5479 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-09 12:26:16 +00:00
cutealien 61ef6f9c7d Rename target in HelloWorld_emscripten so it doesn't overwrite (or clean) the other hello-world.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5478 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-08 20:26:18 +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 2d72fa45fa Merge revisions r5426:r5427 from trunk to ogl-es.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5428 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-17 13:29:53 +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 1f04b0e514 Fix "make clean" for emscripten.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5414 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-12 14:20:13 +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 b6c2514cfb Comment fixes and alternative compile options (disabled) for emscripten in Makefile.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5410 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-11 16:28:57 +00:00