Commit Graph

50 Commits (master)

Author SHA1 Message Date
MoNTE48 c9cde45d0e Merging r6256 from trunk to ogl-es branch (fixing OSX again)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-30 23:06:51 +02: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 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 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
MoNTE48 674778e45a Update irrMath.h: remove s16 roundingError() 2019-11-12 17:39:24 +01:00
MoNTE48 eaee0c16e1 Other patches 2019-08-15 16:29:59 +02: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 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 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 37b154102b Merge trunk revisions 4630 to 4685:
- Makefile for the new IrrFontTool links now correctly to libfontconfig
- Bugfix: getFont for xml-fonts now also works for fonts inside archives (thx @Neirdan for bugreport)
- Add function mergeFilename + tests
- Add ISceneNodeAnimator::setStartTime/getStartTime to allow resetting movement animators. 
- Get Irrlicht to compile with IRRLICHT_FAST_MATH on Linux (out-define code which was written for VS and remove #warn which is not a preprocessor command recognized by GCC).
- Make key-release events also show the correct Char value on Windows (thx @zerochen for report+fix here: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49499)
- Fix input with numlock-keys on Linux. Thx @zerochen for report and help with bugfixing.
- Linux version of makedocumentation.sh now works like the DOS version and creates html docs.
- Add some error checking in test.
- Indentation


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4686 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-13 13:01:14 +00:00
cutealien d87aec8a3b Merge r4616-4617 from trunk:
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4650 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-01-08 00:00:33 +00:00
hybrid aec5a3afae Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4511 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-17 17:45:53 +00:00
hybrid 0753afac9d Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 17:04:07 +00:00
nadro e49efc5498 - Updated ogl-es branch to rev4182.
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 22:43:38 +00:00
hybrid de2e004b83 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-14 15:36:50 +00:00
hybrid ab5739f571 Merged from trunk, revisions 3300-3365. Another large bugfix merge.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-07-18 21:25:27 +00:00
hybrid 7bae34bc61 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-06-01 22:52:38 +00:00
hybrid d07fc00916 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-23 20:13:43 +00:00
hybrid 2061a3862f Merged revisions 2695:2780 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2781 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-02 17:20:21 +00:00
hybrid 72e83023ec Merged revisions 2441:2694 from trunk. This is a huge update which brings the ogl-es branch to the latest 1.6 state. No updates for the ogl-es driver have been incorporated, this branch might not even compile properly right now. I'm just very happy that the merge finally went through...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2695 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-09-16 12:48:19 +00:00
hybrid 75b5403b5b Merged from trunk revisions 2144:2363
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2364 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-05-05 00:09:53 +00:00
hybrid 55e2c6d600 Merged from trunk, all revisions from 1977 to 2143.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2144 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-01-27 13:23:36 +00:00
hybrid 30100db0a5 Merged all revisions up to 1976 from trunk into ogl-es branch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-12-19 09:56:25 +00:00
hybrid cc7f977f60 Merged revisions 1726:1852 from trunk for the recent updates.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-27 23:52:13 +00:00
hybrid 51484af6d3 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-11-12 10:11:25 +00:00
hybrid cdffc4a5d6 Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-05-22 11:51:37 +00:00
hybrid 755e117078 Merged from 1.4 branch revisions 1316:1328.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1329 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-04-29 11:34:54 +00:00
hybrid 7e65d90e54 Fixed types mismatch.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1300 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-26 13:40:01 +00:00
hybrid 2a9ae4bea7 Fixed the missing Windows API check for _WIN32 and _WIN64, both in trunk and 1.4. Finished the API enhancements in quaternion and vector classes. All methods now return the object where necessary.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1297 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-03-19 21:48:23 +00:00
hybrid beea38a195 Merged from 1.4 branch revisions 1235:1250
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1251 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-02-21 00:20:39 +00:00
hybrid 154b5d91b8 Merged from 1.4 branch revisions 1155:1172
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1173 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-14 00:23:02 +00:00
hybrid 07670acf7e Merged 1134:1151 from branch 1.4
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1152 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-04 11:10:37 +00:00
engineer_apple 24334f193c added Initial Windows Mobile 6 Version.
- Windows Mobile 6 SDK
- Visual Studio 2005 only
Minor:
- Burningvideo: MipMap Selection repaired
- renamed private Driver function getTextureSizeFromImageSize to
  getTextureSizeFromSurfaceSize


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1146 dfc29bdd-3216-0410-991c-e03cc46cb475
2008-01-02 10:28:12 +00:00
hybrid 738951ff4b Fixed some type issues with sqrt. Fixed rect.isValid to work with all types and avoid useless tests. Cleaned up some variable uses and scopes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1004 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-26 16:18:11 +00:00
hybrid f4bc95371b First larger constification. Made serialization const. Some other constification and signedness changes. Minor other code changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@959 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-14 22:25:59 +00:00
hybrid 17ed8d5b60 Some new convenience functions and fixes for template usage.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@946 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-12 17:46:58 +00:00
hybrid fb1d24d219 More compiler warning fixes. Switched automatic culling without camera off as suggested on the forum.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@918 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-07 08:40:19 +00:00
irrlicht 5a4c66cd67 visual studio 6.0 compatibility
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@917 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-07 06:29:57 +00:00
hybrid bad0b24603 Fixed lerp usage for non-scalars. Added refs to allow max and min to be used for other ordered structures.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@905 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-05 11:57:57 +00:00
hybrid a6c880c3c0 Finally reverted almost all changes regarding round. Seems to be a too recent feature as almost no compiler supports it.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@903 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-05 09:25:04 +00:00
hybrid 2551458919 Renamed core::round to core::round_ just as for the other replacement functions already available in standard headers. Fixed a signed/unsigned warning.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@900 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-05 08:51:10 +00:00
hybrid a4c0195901 Hmm, this seems to be faster ;-) Anyway, Solaris won't like it just as the :: namespace. We'll see.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@899 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-05 08:16:07 +00:00
hybrid a2b4dde31f Fixed the irrMath problem with c-math round function. Fixed a big endian problem in ms3d. Fixed a warning from endif comment. Changed version to alpha as the current repository is not feature complete.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@897 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-04 21:54:48 +00:00
hybrid f3a8858e09 Fixed inline assembler for gcc in irrMath. Removed some code using the irrMath functions.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@894 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-09-03 15:15:12 +00:00
hybrid ba5c3b0879 Wrong macro parameter fixed
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@873 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-29 16:24:26 +00:00
hybrid 8ce11fa5ba Avoid some optimization macros if not compiling with FAST_MATH.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@871 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-29 16:11:19 +00:00
hybrid 3838470ccf Fixed a comparison bug when using 0 tolerance. Found by wolfpack and fixed by vitek.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@846 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-08-19 20:51:48 +00:00
bitplane a22e4abf94 stole lightfeather's quaternion::toEuler function by mm765 (with permission) as it deals with singularities. added a constant for pi/2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@795 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-07-17 15:42:32 +00:00
hybrid feaf212248 More fixing of Sphere texture coords. Now we have proper spherical mapping, but a weird seam at the date line - when using the earth.bmp.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@650 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-05-22 14:19:01 +00:00
bitplane c00ce1d372 Moved everything to /trunk
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
2007-05-20 18:03:49 +00:00