freeminer/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
900 Commits 1 Branch 0 Tags
Commit Graph

900 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nadro
50779c829e - Fixed iOS compilation issues. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4509 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-16 21:22:46 +00:00
nadro
1e130fd426 - Fixed OSX compilation issues (both trunk and ogl-es branches). 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4508 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-14 11:58:33 +00:00
nadro
1b4c935129 - Fixed OGL ES2.x issues related to last updates of branch. 
- Added OGL ES 1.x and 2.x drivers to VS2012 project.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4506 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-07 21:27:11 +00:00
hybrid
26c124b466 Remove unused shader callback methods onsetattributes and onunsetattributes. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4505 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-06 23:09:18 +00:00
hybrid
10f78238b0 Remove unused PostRender method, wich was used by the old ogl-es2 driver. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4504 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-06 23:00:58 +00:00
hybrid
67fce90e7c Also fix compilation for ogl-es 2. 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4501 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-05 22:06:50 +00:00
hybrid
6389d65762 Compiles with ogl-es 1.x again 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4499 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-05 12:53:10 +00:00
hybrid
30c61b3b3c Fix msvc project files to new names of ogl-es2 driver. 
git-svn-id: http://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
f484ff5ca7 Merged from trunk, revisions 4488-4493. Only indentation changes, and to have the last merge revision in logs 
git-svn-id: http://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
e52f7c693c 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: http://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
bb6f7b3cb9 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: http://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
ac5d58cd84 Merged some older revisions which seemed to be missing, namely 3986-4057 from trunk 
git-svn-id: http://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
a774707164 Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates. 
git-svn-id: http://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
f70a39f7f5 Revert revision 4439 (temporarily) as the VS12 project files will come from trunk with the next merge 
git-svn-id: http://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
1d93196efb - Fixed some of fixed pipeline materials in OGL ES2 driver (many of examples works fine now). 
git-svn-id: http://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
49c11b0690 - Clean-up OGL ES2 driver (mainly stuff related to textures). 
git-svn-id: http://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
2a776c3647 - 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: http://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
71a65d69d4 - Fixed iOS compilation issues related to latest changes in OGL ES2 driver. 
git-svn-id: http://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
378358eb1f - Fixed Android compilation issues. 
git-svn-id: http://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
dd6f2f46c7 - Added VS2012 projects. 
git-svn-id: http://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
4c6eab5cee - Fixed 2d material rendering in OGL ES2. 
git-svn-id: http://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
3d4fb58230 - 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: http://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
3223bba74a - Fixed next issues (added attributes binding) related to shaders in OGL ES2. 
git-svn-id: http://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
2e02393fd6 - Fixed some OGL ES2 issues related to shaders. 
git-svn-id: http://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
6444bb9cdf - Added support for Device Motion on iOS platforms. 
git-svn-id: http://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
1f7a01362c - Added Accelerometer and Gyroscope support for iOS. 
- Added support for retina display under OGL ES2.
- Cleanup iOS device code.
 

git-svn-id: http://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
ead98e883b - Added support for retina displays. 
git-svn-id: http://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
567ca21735 Fix uniform warning output. 
git-svn-id: http://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
9727f231c0 Update ogl-es extension headers to latest versions. 
git-svn-id: http://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
36dcecf3df - Fixed compilation issues on platforms other than Android. 
git-svn-id: http://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
3263c04acb - 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: http://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
1327dd70d8 Oops, another typo, missing close brace 
git-svn-id: http://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
0dab3450df 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: http://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
ad17a5f2de Fix textureBlend function rename, which seems to have not been propagated from trunk. 
git-svn-id: http://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
1a2c064828 Fix typo from last update (missing curly brace). 
Fix whitespaces

git-svn-id: http://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
548cacec9a - Fixed bugs related to OpenGL ES 1.x and 2.x in Linux and Win32 devices. 
git-svn-id: http://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
f51b9618d9 - Fixed many issues with OGL ES 2.0 driver under iOS. 
git-svn-id: http://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
53ef330090 - Improvement OGL ES 2.0 support in iOS. 
git-svn-id: http://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
432e77d679 - Minor improvements is OpenGL ES driver. 
git-svn-id: http://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
2bf42923ee - Fixed OpenGL ES 2.0 compilation issues. 
- Added OpenGL ES 2.0 support for iOS.

git-svn-id: http://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
56454a3f6e Add ogl-es drivers to driver choice 
git-svn-id: http://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
0e2eff1d49 Fix compile error due to name change of method 
git-svn-id: http://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
42660d13aa - Updated ogl-es branch to rev4182. 
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: http://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
2d058c8fd3 Fix wrong qualification in header, found by DaHuntha 
git-svn-id: http://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
05d081f620 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: http://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
40fd2fc874 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month. 
git-svn-id: http://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
8c3a921399 Fix extension initialization in ogles1 driver. 
git-svn-id: http://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
47da0549d1 Remove opengl32.lib from project, it's linked via pragma 
git-svn-id: http://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
a28aed20a2 Add driver attrributes for ogles2. 
git-svn-id: http://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
5f5fa89772 Add drawPixel for ogles1 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3838 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-06-09 14:56:17 +00:00