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

389 Commits

Author SHA1 Message Date
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
Jens Ayton
5ddbe997b1 New planets now have procedural diffuse maps. Unfortunately, the generator seems to hang from time to time. Incidentally, the log entries saying Dequeued generator <OOPlanetTextureGenerator 0x133d7bcf0>{{(null) -- failed}} are not an actual failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2807 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 21:57:57 +00:00
Jens Ayton
7754f83cb7 Oops! That last commit wasn't really ready. Here's the rest of the fix, along with some half-baked new planet stuff (disabled with NEW_PLANETS in Universe.m). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2803 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 16:48:14 +00:00
Jens Ayton
7dcf2df39c Basic but working new planet drawable. Can be tested on ships by enabling BALL_WORLD in ShipEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2799 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 14:36:22 +00:00
Jens Ayton
ae974039d2 Eliminated deprecated -cString method (again). Mac JS console now works in 64-bit mode. Unfortunately, this requires using different versions of RBSplitView for different architectures, since the 64-bit-compatible version doesn't work with Tiger. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2795 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 23:59:00 +00:00
Jens Ayton
9c076a03ab Basic-debug.oxp can now be built with a makefile in DebugOXP/, instead of being build in tools/simpleDebugConsole by the Xcode project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2794 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:41:50 +00:00
Jens Ayton
b3f7f8508a Tidying up in project directory. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2793 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:25:17 +00:00
Jens Ayton
878f382106 Split suns out into a separate SunEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2792 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:17:57 +00:00
Jens Ayton
6edfa48452 Xcode project updates for removed models. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2790 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:07:27 +00:00
Jens Ayton
b346df7716 Fixed debug flags in master copy of oolite-debug-console.js. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2786 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-27 15:21:14 +00:00
Jens Ayton
1df30db2aa Fixed bug where name key in dictionary-form texture specifiers was ignored. Planet geometry thing can now generated DATs in an unwrapped mode to help verify texture mapping - wish I'd thought of that eariler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2775 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-21 17:41:35 +00:00
Jens Ayton
5dd0443728 Refactored AI GraphViz stuff for slightly better legibility and put it in its own file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2743 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 14:29:42 +00:00
Jens Ayton
8bb929b658 AI GraphViz handles set/switchAITo: followed by setStateTo:; added an entry for DEBUG_GRAPHVIZ to log header. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2738 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-12 17:32:42 +00:00
Jens Ayton
c2cb7d94e0 Implemented tricky part of polygon sprite outline generation, less tricky part to follow. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2693 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-24 18:34:39 +00:00
Jens Ayton
09e61dbdc9 Added polygon-sprite-dump-svg preference to save on graph paper. (This will be useful when I implement outline tesselation this weekend.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2686 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-21 19:43:22 +00:00
Jens Ayton
bc3a113b0f Incomplete support for general polygons in missile icons. (In case of splodey, setting the OLD_ICONS macro in HeadUpDisplay.m to 1 will revert to the old drawing code.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2661 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 12:23:24 +00:00
Marc
47f9f2c920 * corrected manifest miscount when ship in flight. 
* last change to player.ship.manifest: manifest.food & similar are now read/write manifest quantities. Internally all commodities are now going to be referenced by the canonical identifiers, commodities.plist still overrides the displayName - the .manifest.list array is unchanged, and still read-only.
* renamed 2 ship properties for consistency: ship.availableCargoSpace & ship.cargoCapacity now become ship.cargoSpaceAvailable & ship.cargoSpaceCapacity.

- more code tidying.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2637 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 09:09:08 +00:00
Jens Ayton
287da97963 Weekend of SVN Death fixes: partial fix for planet texture mapping suckiness (disabled by default, see FIXED_TEX_COORDS in PlanetEntity.m). Fixed crash when constructing JS timer with invalid parameters. Some cleanup and stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2636 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-05 13:13:06 +00:00
Jens Ayton
09843c8073 ...and removed now-unused flare256.png texture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2603 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 19:36:08 +00:00
Jens Ayton
2f12c5c4e2 Moved laser and explosion flashes over to OOLightParticleEntity, and changed OOLightParticleEntity size from an NSSize to a single diameter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2602 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 19:35:13 +00:00
Jens Ayton
6b2e74be02 Reinstated plasma impact bursts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2601 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 18:27:47 +00:00
Jens Ayton
3132dc8fe4 Moved plasma shots over to the new hotness. Bloom effect on plasma impact is temporarly disabled pending yet another new OOLightEntity subclass. Also fixed a bug where turrets would hold fire until target was well inside of range, instead of just outside as per comment. Also also, removed entity isParticle ivar. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2600 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 17:36:59 +00:00
Jens Ayton
426815f740 Freed ECM blasts from their ParticleEntity bonds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2546 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 16:06:33 +00:00
Jens Ayton
ec4aa91753 Spent several hours worrying about the need to deep copy data before async cache flush and the performance implications of doing so, then realised there was no reason that would be necessary. Currently back to async flushing without deep copy, and profiling code. The profiling timer implementation for Windows is untested and may be broken. Also, fixed a nasty bug in OODeepCopy() where empty dictionaries ere turned into sets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2541 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:02:55 +00:00
Jens Ayton
c988131375 Data cache writes are now asynchronous, for great snappy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2537 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 22:03:36 +00:00
Jens Ayton
ab8aebe696 Turned OOTextureLoadDispatcher into more general OOAsyncWorkManager. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2536 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 21:47:05 +00:00
Jens Ayton
dafcec17b1 Here's a thought: instead of asking libpng for data in the wrong order and then swapping it, how about asking for data in the right order? It's a crazy idea, but it might just work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2530 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 18:17:38 +00:00
Jens Ayton
657d4556a8 Updating Xcode project to keep up with GNUmakefile for once. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2529 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 18:09:51 +00:00
Marc
baa5430180 - got xcode to compile with the renamed javascript-errors.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2497 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 16:25:48 +00:00
Marc
fabfc9b391 - F7 screen now shows the nova sun for systems destroyed by novae, planets everywhere else. 
- moving from screen to screen now always resets the background image.
- fixed xcode compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2494 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 14:51:21 +00:00
Jens Ayton
712097c550 Gave sparks the slimming treatment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2480 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 10:44:29 +00:00
Jens Ayton
68d44cb438 Sundry OOGL()-ification, and added temp code to dump the instance size of various entity classes at startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2474 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 15:06:58 +00:00
Jens Ayton
8a9c0b0551 Factored exhaust plumes into a separate class. Moved instance variables used only by exhaust entities into said new class, saving several megabytes of memory. Added Entity memory consumption (not including drawables and materials) to FPS display as a graphic reminder that they're still too big. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2467 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 23:13:20 +00:00
Jens Ayton
d83e9031c8 More static analyzer fun: fixed flagrant abuse of -init in -[Universe reinitAndShowDemo:], don't create a nav boy if creating a station fails, get systeminfo before asking it for a government in [-Universe witchspaceShipWithPrimaryRole:] (so skipping of escorts in safe systems works). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2438 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 19:28:13 +00:00
Jens Ayton
c50eec56f8 Cleaned up among feature macros; updated log header appropriately; simplifed log header generation a bit; fixed clean build of Mac debug configuration (Debug.oxp no longer wants OoliteDev.app). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2430 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 15:06:22 +00:00
Jens Ayton
6244814f2f Fixed Mac Deployment configuration (it isn't supposed to be exporting anything). Log header now lists [GLSL Shaders] and [OXP Debug Features] as appropriate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2429 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:54:06 +00:00
Marc
e93b8aa9ee Mac build: 
- really removed all traces of 10.3 from the build settings now(probably)
- changes to codebase to enable Deployment builds to link properly, might affect other platforms builds.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2428 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 13:37:28 +00:00
Marc
ea62edcb5e * mac builds on trunk: 
- removed all stray references to 10.3, and testRelease should now build properly on PPCs too.
- Still couldn't correct the 4 missing debug exports from Deployment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2427 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 09:05:30 +00:00
Marc
cc12a609bc - got it to compile & execute ok on Xcode 3.1 for debug & test release configurations. There are still 4 -exported_symbols missing from the deployment configuration, though... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2426 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-08 08:26:30 +00:00
Jens Ayton
982bd06d68 Tweak to Xcode project: Oolite is now named Oolite.app in all configurations, to avoid an incompatibility between Xcode 3.2 and Xcode 3.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2425 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 21:53:05 +00:00
Jens Ayton
7d85d3391d New! Hardcore OpenGL error checking action. Compile time option (OO_CHECK_GL_HEAVY) to check for OpenGL errors before and after, ideally, every single GL function call. (Exception: for immediate-mode drawing, checking is done before glBegin() and after glEnd().) Temporarily enabled by default in Mac debug builds for compatiblity testing. Oh, and fixed a bug where shader programs that fail to build could sometimes be deleted twice. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2424 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 20:37:44 +00:00