Commit Graph

1360 Commits (master)

Author SHA1 Message Date
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 4665160a14 Add folder needed to build emscripten.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5408 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-11 12:04:04 +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
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 023dd4b641 - Updated documentation for external WindowId.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5233 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 18:38:21 +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 98c608dc7e - Added the application state events (not supported yet by any platform).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5228 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-01 22:55:09 +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