Commit Graph

184 Commits (master)

Author SHA1 Message Date
cutealien 3ff5abe55d Merging r6364 through r6379 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-09 10:07:30 +02:00
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 ced66e610c Merging r6196 through r6248 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:04:14 +02:00
cutealien 51598db3bb Merging r6145 through r6171 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-20 22:40:36 +01:00
cutealien c17023f55c Merging r6128 through r6139 from trunk to ogl-es branch.
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-10-01 19:58:50 +02:00
cutealien fb6aac08ed Merging r6075 through r6106 from trunk to ogl-es branch.
Burnings renderer changes.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6116 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:25:29 +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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
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 382a64fddb Fix some bugs introduced by me while applying emscripten patch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5407 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-11 12:00:30 +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 dd6a7ddc71 Change the naming scheme for examples.
Instead of giving new number to examples for different platforms, use the same number and just add the platform extensions. That makes it a little easier to add more platforms and also to add more examples for different platforms.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5405 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-10 12:36:08 +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 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
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 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