Commit Graph

194 Commits (ced66e610c6c740f1388e8205bfb3c48fcf22794)

Author SHA1 Message Date
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 ae0da9c949 Merging r6186 through r6192 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6193 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-02-22 09:08:40 +01:00
cutealien 43dde8734d Merging r6173 through r6179 from trunk to ogl-es branch
- Adding optional support for touch input in X11

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6180 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-01-18 20:55:04 +01:00
cutealien a691451e09 Merging r6173 through r6176 from trunk to ogl-es branch
Also adding -DPNG_ARM_NEON_OPT=0 to other places in Makefile as we don't have arm optimization for neon currently in our png lib.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6177 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-28 18:09:45 +01: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 73c5b296bb Merging r6107 through r6116 from trunk to ogl-es branch
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-14 11:34:02 +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 967bc1ecee Merging r6039 through r6072 from trunk to ogl-es branch.
Note: Not yet caught up with trunk.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6114 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-12 15:42:43 +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 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 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
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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
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 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
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
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
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 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
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 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 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