Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,852 Commits 1 Branch 0 Tags
Commit Graph

22 Commits

Author SHA1 Message Date
cim
319e17a3c8 Fix shader compilation problem 2014-02-09 21:59:05 +00:00
cim
1035b65d6a Cube map support for new planets 2014-01-03 21:26:40 +00:00
Marc
baf5830463 - restored NEW_PLANETS shader files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4818 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-03-28 22:11:06 +00:00
Jens Ayton
1e08cd022f Use recommended keys for fallback material. Removed some new-planets stuff that isn't used. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4363 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 16:44:29 +00:00
Jens Ayton
f9603b2f0b Support for explicit per-vertex normals and tangents. Also support storing material names out-of-line for less redundancy/smaller files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2989 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-22 13:10:31 +00:00
Jens Ayton
64b4d4e9e3 Minor cleanup; made fallback material as weird-looking as it used to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2973 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-16 11:57:00 +00:00
Jens Ayton
c4cad73d63 Made planet texture generator several times faster. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2884 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-16 00:10:27 +00:00
Jens Ayton
044ae93959 Planet normal mapping is now disabled as intended in simple shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2883 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-15 21:45:46 +00:00
Jens Ayton
1c0251db3a Normal mapping for generated planets (full shader mode only). Normal/baked shadow intensity is now consistent when changing planet texture size. Switched to 1024x1024 except for reduced detail mode. NB: texture debug dump requires new methods which aren't implemented for SDL, but is switched off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2881 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-13 12:35:42 +00:00
Jens Ayton
f3fb4e8c34 Planet shader now handles lighting and specular mapping (and light mapping, but no light maps are generated yet). Known issue: terminator is distorted near poles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2879 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-12 19:10:55 +00:00
Jens Ayton
41f5d03697 Rudimentary planet shader (disabled with SHADY_PLANETS macro in OOPlanetEntity.m; texture mapping only, no lighting, but with per-pixel calculation of longitude component to completely eliminate distortion. Interacts badly with mip-mapping, though.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2860 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 22:42:23 +00:00
Jens Ayton
536fc338a6 Tangent support for shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1881 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-23 23:07:24 +00:00
Marc
3990d547dc Minor plists cleanup, added player.equipmentStatus & player.setEquipmentStatus, to allow damaging and repairing equipment via javascript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1511 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 03:38:50 +00:00
Marc
96330a81a4 Demo2 bugfixes & changes: demo ships calculated at each update, missing/broken ship models displayed as question marks on demo screen, missing textures displayed as no-textures-material. Updated question mark mesh and no-textures-material. Hopefully did not introduce any new bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1497 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:54:43 +00:00
Jens Ayton
9d9128bcb1 * Got Game Options submenu working under OS X. 
* Save reduced detail, wireframe and shader settings in preferences.
* Implemented variable shader complexity support.
Added default shader, used for all otherwise-unshaded ships with full shaders on, and for smooth ships or ships with effect maps specified in material dictionary with simple shaders.
* All ships now drawn with slight specular highlight by default (shininess = 10, intensity = 0.2) except in reduced detail mode.
* (JS) Made Ship.shipDescription read-write (except for the player).
* (JS) Added global function ExpandDescription(string : String), to perform substitutions like %H, [commander_name] and so forth. 
* (JS) Added global function RandomName(), intended to be like %R substitution. In so doing, I discovered that %R is broken, but left it as-is so it will generate the same name for existing descriptions. Added %X to do the same thing, but without the bugs. RandomName() is different from either in that it doesn't use the "predictable" PRNG, so it will provide a new name each time. To use the "predictable" variant in JavaScript, use ExpandDescription("%X"). 
* Ships that hyperspace out are no longer replenished in interstellar space.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1228 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-22 12:18:18 +00:00
Jens Ayton
a3cee138b8 Bumped version number to 1.69.2. Removed support for deprecated shader features. Added caching of GL texture names to avoid expensive glGenTextures()/glDeleteTextures() call. Set texture cache size to something sensible (50 at the moment), but textures are being leaked. Fixed loss-of-precision bug in OOCollectionExtractors' double methods. Added collection extractor methods for vectors, quaternions, and non-negative floats/doubles. Switched on -Werror for OS X build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1088 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-17 10:42:36 +00:00
Jens Ayton
9137ef4581 Clean-up of various methods in connection with documenting uniform binding mechanism. Tweak to syntax for said mechanism. Bumped version number to 1.69. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1011 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-08 12:59:08 +00:00
Jens Ayton
28855f728e Non-sucky fix for problem plists, hopefully. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@989 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-05-24 10:01:41 +00:00
Jens Ayton
8dfcfa9b58 XMLified problem plists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@979 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-05-21 17:15:07 +00:00
Jens Ayton
3c4929873f Made fallback material data-driven, for great justice. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@967 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-05-14 16:39:21 +00:00
Jens Ayton
f31ba4c5b3 Made time shader uniform not a special case. Made shader uniform bindings actaully update. Fixed crashing bug in texture cache. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@957 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-05-11 10:56:10 +00:00
Jens Ayton
73aafb43e1 Rewrite of shader code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@923 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-11 20:29:30 +00:00