Commit Graph

893 Commits (0dae37726542fa6dfb3c1c9b13643a20a8f450e3)

Author SHA1 Message Date
hybrid 0dae377265 Fix msvc project files to new names of ogl-es2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4495 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 22:01:22 +00:00
hybrid e6b8b8daf7 Merged from trunk, revisions 4488-4493. Only indentation changes, and to have the last merge revision in logs
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4494 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:44:31 +00:00
hybrid 3f0c8e3a3b Final merge of ancient file revisions. Most stuff seems up to date now, only OSX device is probably completely broken and needs a fresh copy from trunk. Will merge latest trunk again in next run in order to have a proper version number in the logs again.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4492 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-04 16:15:53 +00:00
hybrid d5e6d04769 Merged another, now very ancient, revision from trunk in order to remove the old msvc6 project files. Seems we missed this merge also. And added two missing files, to reduce the distance between trunk and branch some more
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4491 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 17:27:12 +00:00
hybrid 4f4ca75a4f Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4490 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-04-02 16:01:12 +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
hybrid ed9566079e Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4487 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-28 14:54:50 +00:00
nadro 27bdfd5beb - Fixed some of fixed pipeline materials in OGL ES2 driver (many of examples works fine now).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4482 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-20 00:30:45 +00:00
nadro 919c037d05 - Clean-up OGL ES2 driver (mainly stuff related to textures).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4481 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-19 15:54:47 +00:00
nadro f97abe8a38 - Added support for handle ViewController (ViewController must be assigned to 'window.rootViewController' for automatic integration them with Irrlicht UIView before device creation process).
- Touch positions are properly returned in each orientation mode (active only when ViewController was assigned before device creation process).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4476 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-03-11 17:05:13 +00:00
nadro 1e6a598645 - Fixed iOS compilation issues related to latest changes in OGL ES2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4445 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-17 14:49:37 +00:00
nadro 0cc6e91cb8 - Fixed Android compilation issues.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4441 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-17 04:12:34 +00:00
nadro 293236417f - Added VS2012 projects.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4439 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-16 00:59:25 +00:00
nadro a682d8393d - Fixed 2d material rendering in OGL ES2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4436 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-15 19:23:46 +00:00
nadro 40b42e6010 - First version of rewritten OpenGL ES 2.0 driver (IDE projects aren't updated, 2d drawing methods doesn't work, only basic functionality of fixed pipeline materials). This driver will be improved soon.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4435 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-01-15 00:31:37 +00:00
nadro 0511665722 - Fixed next issues (added attributes binding) related to shaders in OGL ES2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4396 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-12-13 01:59:23 +00:00
nadro 53729b11ba - Fixed some OGL ES2 issues related to shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4395 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-12-12 01:26:39 +00:00
nadro ae1ac7b70f - Added support for Device Motion on iOS platforms.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4383 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-11-26 08:56:57 +00:00
nadro 4b2e44cff4 - Added Accelerometer and Gyroscope support for iOS.
- Added support for retina display under OGL ES2.
- Cleanup iOS device code.
 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4339 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-25 02:25:31 +00:00
nadro a4059718db - Added support for retina displays.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4338 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-23 01:03:27 +00:00
hybrid a6deb1a0d1 Fix uniform warning output.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4332 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-18 16:12:20 +00:00
hybrid 932df8b01d Update ogl-es extension headers to latest versions.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4331 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-18 11:45:34 +00:00
Nadro 509331664d - Fixed compilation issues on platforms other than Android.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4311 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-09-16 22:20:18 +00:00
Nadro 466ad034d3 - Added initial support for Android OS with example no. 8. Thanks for a gsfare and hiker for their hard work for this commit.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4309 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-09-06 23:14:12 +00:00
hybrid 1312b51159 Oops, another typo, missing close brace
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4250 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-19 12:27:34 +00:00
hybrid cfb32c5ec4 Fix primitive render calls, which could happen to contain less vertices and indices than stated by the parameters. Now the calculation is based on the actually transferred number of elements.
Not sure why, but the draw2DImageBatch in ogl-es2 driver seemed to lack index calculation completely. I've added this now, should be required.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4249 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-19 11:31:32 +00:00
hybrid 9262b0848f Fix textureBlend function rename, which seems to have not been propagated from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4248 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-16 14:55:50 +00:00
hybrid 553806b029 Fix typo from last update (missing curly brace).
Fix whitespaces

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4247 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-16 14:53:07 +00:00
nadro 902ef62234 - Fixed bugs related to OpenGL ES 1.x and 2.x in Linux and Win32 devices.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4246 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-14 12:42:09 +00:00
nadro 5d8cb2efce - Fixed many issues with OGL ES 2.0 driver under iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4245 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 23:16:59 +00:00
nadro f5cda1464a - Improvement OGL ES 2.0 support in iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4244 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:25:59 +00:00
nadro 6fc41cf8c0 - Minor improvements is OpenGL ES driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4243 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:24:34 +00:00
nadro dbc2c053ed - Fixed OpenGL ES 2.0 compilation issues.
- Added OpenGL ES 2.0 support for iOS.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4242 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 01:18:54 +00:00
hybrid f4f8fc5b49 Add ogl-es drivers to driver choice
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4241 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:58:42 +00:00
hybrid 38189b9d55 Fix compile error due to name change of method
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4240 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:12:24 +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 2c9a184fb6 Fix wrong qualification in header, found by DaHuntha
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4073 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-02-11 23:08:26 +00:00
hybrid 15c3dc795a Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +00:00
hybrid 5caf2b4045 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 22:15:27 +00:00
hybrid 7687813257 Fix extension initialization in ogles1 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3845 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-10 12:56:59 +00:00
hybrid d7f53dadf7 Remove opengl32.lib from project, it's linked via pragma
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3843 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 23:22:11 +00:00
hybrid 8a0144ae8d Add driver attrributes for ogles2.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3839 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 16:19:22 +00:00
hybrid ed4b37f8bc Add drawPixel for ogles1
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3838 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:56:17 +00:00
hybrid 847c8c2922 Add driver attributes for ogles1
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3837 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:53:26 +00:00
hybrid 372ce58cbf Add draw pixel method
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3836 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:52:15 +00:00
hybrid edf7ddbe43 Name of ogl-es 1 driver is different...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3835 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:51:16 +00:00
hybrid 6ff10b391e Add bool return values on shader creation in order to signal problems and avoid illegal mem access on broken shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3834 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 13:12:48 +00:00
hybrid b48ed15144 Add checks for OGLES when testing for driver names in test utils
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3833 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:48:46 +00:00
hybrid 095bc0d9d9 Adjust to new screenshot API
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3832 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:47:45 +00:00
hybrid 7ae68647e9 Next large merge from trunk, revisions 3729-3830
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 07:08:47 +00:00