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

579 Commits

Author SHA1 Message Date
Jens Ayton
213ce5a28f Added default script for player ship, so it isn't a special case. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3527 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:53:25 +00:00
Eric Walch
6acabb790f Moved "oolite-rocktunnel.dat" to the correct "Models" folder. Probably only wrong at the mac 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3489 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-09 18:34:21 +00:00
Jens Ayton
3cafc40ed8 Switched PlanetEntity over to OOTexture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3460 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 15:25:08 +00:00
Jens Ayton
20da5ba016 Fix for PlanetEntity leaking display lists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3452 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 19:17:43 +00:00
Jens Ayton
8a9a1e7b83 Added new debug function: console.writeMemoryStats(). Estimates total memory use by entities and textures, and how much texture data is visible (i.e. relevant to GPU swapping). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3434 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 14:51:13 +00:00
Jens Ayton
5f84c63462 Fixed some scaling and conversion bugs in OOCombinedEmissionMapGenerator. Mac DebugOXP New Ship menu item now works like :spawn macro. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3366 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-18 16:28:05 +00:00
Marc
15fcc13c8a - added new resource files to mac build 
- brought most copyright notices up to date.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3361 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 23:50:35 +00:00
Jens Ayton
a7cf62d05f Support for GPU-specific settings. Dust now works/isn't slow (depending on platform) on GMA9xx. Default shader mode is now FULL except on 9xx/GeForce 5200. Full shader mode is disabled on GMA9xx. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3339 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 12:45:10 +00:00
Jens Ayton
3de5adccc1 Centralized setting of GL_POINT_SMOOTH and GL_LINE_SMOOTH, since they're never deliberately disabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3338 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 09:53:02 +00:00
Jens Ayton
46c40ec186 More graceful handling of disappearing docking target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3308 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:21:06 +00:00
Jens Ayton
423d317234 Resurrected Mac sound inspector (as part of Debug OXP). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3306 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 13:33:03 +00:00
Jens Ayton
8392bee4a5 Fade dust motes to clear instead of black when shady. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3298 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 18:22:53 +00:00
Jens Ayton
0bf1a6732f Xcode project tweaks to put resources in proper subdirectories. Recommend deleting built app to avoid duplicates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3292 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 17:46:19 +00:00
Jens Ayton
29a4ff8c39 Disabled OOEnvironmentCubeMap, will resume post-MNSR. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3287 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 13:36:16 +00:00
Marc
fae7279bcb - added shortcuts for Previous.log, AddOns and snapshots folder to mac's Oolite menu. 
- minor xcode project cleanup, hopefully I didn't remove anything important...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3277 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-03 09:56:22 +00:00
Jens Ayton
0477421cc6 Prototype dynamic environment map renderer. Not used for anything and has serious rendering artefacts. Requires FBOs. Trigger from console with PS.call('debugDumpEnvironmentProbe'). Also, removed texture name cache - I'm not convinced it was doing anything useful, and it exploded when faced with recycled cube maps. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3271 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 20:34:41 +00:00
Jens Ayton
69deda0865 Refactored OOTexture into an abstract class and a concrete class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3267 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 15:55:12 +00:00
Jens Ayton
12016a853b Cleaned up redundant dual licensing headers as previously discussed. Gosh, there's a lot of them. Feel free to ad your name or 'and contributors' as appropriate. Also, excluded unused classes OOCamera and OOLight from build, but didn't delete them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3263 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 12:32:43 +00:00
Jens Ayton
4f5ee63561 Minor cleanuppery. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3256 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-01 17:55:01 +00:00
Jens Ayton
dd78bf3a6d Cube map textures are now converted to lat/long maps (with appropriate flipping) when GL_ARB_texture_cube_map is not available. Can be tested with disable-cube-maps preference, but note that this will break any custom shaders that expect cube maps. (Cube maps are always available if shaders are supported.) Performance concerns: well, the actual conversion process is faster than the scaling used to implement supersampling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3249 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 23:28:12 +00:00
Jens Ayton
f48c83b674 Logging tweaks: use OOLITE_SNAPSHOT_VERSION in log header if defined; less confusing message when failing to find AI plist for a ship's initial AI; stylistic consistency for JS planet errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3242 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 18:51:48 +00:00
Jens Ayton
926260dd38 Renaming. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3179 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:59:35 +00:00
Jens Ayton
ab623a5c94 * Big unified emission and illumination map thingy for non-shader mode. Known 
limitations:
  - causes synchronous wait for component textures to load.
  - Component textures are cached unnecessarily.
* cleanup of material dictionary handling.
* Added foo_color variants of material colour key names.
* Added illumination_color material property.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3178 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:21:29 +00:00
Jens Ayton
731fae187f Fixed some Mac build breakage, removed some debug code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3171 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 08:46:54 +00:00
Marc
e07cf99430 - Oopsie! Actually added the new tunnel shape. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3169 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 07:59:17 +00:00
Jens Ayton
ca06516f4c Cleaned up texture pixel-twiddling code a bit. Added extract_texture texture option (for, e.g., using one channel of a shader effect map as a glow map in non-texture mode). Mac: renamed custom static libpng to libpng_for_oolite, to avoid linking to wrong library when normal libpng installed in /usr/local/lib. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3165 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-15 23:51:41 +00:00
Jens Ayton
065d44deef Implemented non-power-of-two scalers for two-channel textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3159 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-12 22:36:46 +00:00
Jens Ayton
dcdbbdfbea Implemented multi-texture material for emission_map in non-shader mode (uses GL_ARB_texture_env_combine; included test case, which depends on shader test suite). Also a bunch of material code cleanup (and messup, to support multiple sets of texture coordinates). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3155 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-12 18:05:46 +00:00
Jens Ayton
c9cdbc7631 Added extra shader validation, controlled by DEBUG_SHADER_VALIDATION flag. Removed DEBUG_ENTITIES and merged DEBUG_OCTREE and DEBUG_OCTREE_TEXT into DEBUG_OCTREE_LOGGING. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3148 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 16:03:43 +00:00
Jens Ayton
d267cf71bf Implemented fallback to simple shader mode when full shader doesn't build, and added test case. Added debug flag to disable callback behaviour, used in shader test suite. Also moved debug flags to their own header. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3144 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-11 13:57:02 +00:00
Jens Ayton
0c19da2b47 Support for grey+alpha textures. (Part of this was accidentally included in previous commit.) Also fixed confusion of GL format and internalFormat in texture code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3134 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-09 19:35:39 +00:00
Jens Ayton
48e2ffb5ea Removed superfluous build settings that caused a build error in Xcode 3.2.2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3104 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 15:52:56 +00:00
Jens Ayton
a79eae0acc Better error logging when loading a saved game fails. Fixed up some script comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3080 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 23:07:23 +00:00
Jens Ayton
a1114c9b72 Fixed models being copied to wrong place (Mac only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3061 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 17:29:22 +00:00
Jens Ayton
02e4b2bf8a Fixed Mac build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3060 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 15:05:22 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:23:31 +00:00
Jens Ayton
a4382b451f Fixed bug where space dust velocity ignored inertial velocity of player, taking only thrust into account. Exposed player velocity to JS. Initial work on fixing player-only shader binding issue described at http://aegidian.org/bb/viewtopic.php?p=103930#103930 . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3051 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 18:04:06 +00:00
Jens Ayton
93f35500f7 Preparing Xcode project for Mac nightly builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3041 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-24 22:40:11 +00:00
Jens Ayton
690f02cb32 Updated Xcode project for libpng 1.4.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3020 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 18:15:51 +00:00
Jens Ayton
4284da31cd Ships with the same model but different material dictionaries now work properly. Changed mechanism for saving and restoring wormholed ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2994 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 22:20:55 +00:00
Jens Ayton
7fa2001692 Slight variations in colour and specularity on oceans. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2958 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-10 16:06:45 +00:00
Marc
bb93c112da - yet more go-faster tweaks to the texture generator. 
- integrated the previously separate atmosphere generator inside OOPlanetTextureGenerator, to avoid noise generator overheads.
- added NEW_ATMOSPHERE compile-time switch to OOPlanetEntity.

- tidying up of contract market generators: while they're still slow, some dead code was removed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2918 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-30 09:17:01 +00:00
Marc
562d33d19d Custom Screens Part IIb: updated the mac project file to include the new stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2910 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-24 22:55:25 +00:00
Jens Ayton
bf5ee3b2ce Reintroduced all models removed in r2787 (except exhaust.dat) based on the cleaned-up base ships. These models are now unused in Oolite, but some are referenced by OXPs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2893 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-17 22:10:12 +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
Marc
44df4a0f56 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2868 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 00:38:24 +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
1e2e56b4b1 NEW_PLANETS now applies to scripted planets. If NEW_PLANETS, the old PlanetEntity and TextureStore are now completely excluded. Most of the kludges for dealing with both types of planet are gone. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2857 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-07 18:43:48 +00:00