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

699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
5eacc5ba35 New attempt at cross-platform threaded texture loading. Also work on OOMesh implementation based on old Entity drawing code (fancy optimized version having stalled) and fixed problem that was causing synchronization of logcontrol.plist.xml to not happen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@946 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-29 14:55:48 +00:00
Jens Ayton
6f01dc4df3 Moved some resource manager caches into persistent cache. Fixed shipyard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@945 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-25 14:23:22 +00:00
Jens Ayton
0481b90f2a Changed synchronization mechanism used by async texture loader, because the old one didn't work on Windows. Relabelled all the files that are entirely by me as dual-licensed under GPL+MIT/X11 license. Work on OOMesh stuff, although it doesn't actually do anything useful yet. Probably other stuff done while BerliOS was down. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@944 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-23 22:21:38 +00:00
Jens Ayton
3e240cf86c Improved efficiency of retrieving unique (non-merged) files in ResourceManager. Changed OOTextureLoader semantics slightly to avoid memory leak when releasing a texture which hasn't completed loading yet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@943 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-20 23:51:27 +00:00
Jens Ayton
9e9923f285 Scaler work: rewrote high-level scaler function, implemented vertical-stretch scalers. Implemented test case (wow). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@942 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-20 17:33:55 +00:00
Jens Ayton
c7f364c736 Fixed thread-safety of logging, made indent level and indent stack per-thread. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@941 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-19 23:30:27 +00:00
Jens Ayton
69bb52f7e1 Now use OOTexture for text. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@940 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-17 18:35:32 +00:00
Jens Ayton
dcee0200b2 Attempt at fixing Windows build. Also started on GL_EXT_rectangle_texture support (mostly for HUDs and maybe mission screeen images). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@939 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-17 17:27:33 +00:00
Jens Ayton
d5f8ae15de Tweaks to OOCache to make it usable directly for self-pruning in-memory caches. Use one of said caches for OOTextures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@938 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-17 10:31:49 +00:00
Jens Ayton
c183b17568 Stuff that was preventing SDL builds from building. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@937 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-16 21:45:28 +00:00
Jens Ayton
9128d3db1f Improved mip-map code, now with 32-bit and 64-bit optimized flavours. (Todo: use 64-bit path on PPC G5 in 32-bit PPC Mac binary.) Renamed texture attributes to conform with Oolite conventions. Added texture_LOD_bias option (default: -0.25). Greyscale textures now really do load correctly, for real. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@936 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-16 14:15:35 +00:00
Jens Ayton
72e5c52ac7 Tweak to version-checking code to drop trailing words from version number, so stuff like '1.73.2 beta 5' works. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@935 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-16 07:43:29 +00:00
Jens Ayton
da01dc5e92 Intermediate stage of moving shipentity meshes into separate class. Builds with warnings, but works. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@934 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-15 16:15:19 +00:00
Jens Ayton
e149d53b5c Fiddling. Started on major changes, then rolled them back to check in before redoing them in a different way. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@933 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-15 15:04:26 +00:00
Jens Ayton
cf9a7b9709 Greyscale texture loading works. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@932 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-15 09:15:50 +00:00
Jens Ayton
20dfbe62b4 Fixed potential (but unlikely) thread safety issue in texture loading, removed redundant locks in OpenGL extensions manager. Use four texture-loading threads for testing (should be based on number of processors). Fixed player-spawns-with-no-shields bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@931 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-14 10:12:37 +00:00
Jens Ayton
cf1c8f8866 Fixed several uninitialized variable warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@930 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-14 00:41:35 +00:00
Jens Ayton
bdbe1b72ff New texture code (for models with shaders only). Somewhat buggy (notably, player ship is untextured after dying and respawning) but seems stable. Also removed a spurious assert from sound code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@929 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-14 00:07:32 +00:00
Jens Ayton
c66ebf27a0 Held Xcode's hand through the painful journey of discovering that changing where header files are means they're not in the sampe place any more. *muttermutterstupidpieceof...* 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@927 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-13 11:24:04 +00:00
Jens Ayton
d7f84cb164 Moved some files around a little bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@926 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-13 10:49:46 +00:00
Jens Ayton
9ead245895 Fixed code using for (i = 0; i != [[foo allKeys] count]; i++) antipattern. Cleanup of player saving: uses proper way of getting an XML property list (which is cross-platform), better error messages, less code duplication. Added Edit menu to OS X version, for use in dialog boxes. Bits of new texture model, but they're not used yet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@925 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-13 10:38:08 +00:00
Jens Ayton
d6f8e9d6d3 Removed some unused bits of old bounding-box collision handling code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@924 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-11 20:49:32 +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
Jens Ayton
e1d5ba7272 Tweaked key loading -- strings like "09" now get treated as numbers, even though "9" is treated as a string. Remade default keyconfig file - now has all current keys and is easier to read. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@922 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-10 09:33:41 +00:00
Jens Ayton
7192a86ec6 Removed entity recycling (and associated bugs) from demo screen code. Work on unifying damage-taking code. World scripts now get notifications of cause of death; set up for similar effect for NPC scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@921 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-09 17:55:19 +00:00
Jens Ayton
3aa4cab9c4 Moved station-specific collision logic into StationEntity. (Working on unifying player and NPC damage models and moving shields into ShipEntity.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@920 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-09 15:40:02 +00:00
Jens Ayton
6d3ec289bf Fiddled with player loading. Moved player loading to PlayerEntityLoadSave where it belongs. Added new target macros. Ripped out entity recycling mechanism. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@919 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-09 14:41:27 +00:00
Jens Ayton
7b56bbe554 Added GLSL uniforms to state dump. Made state dump show player if no target, and added player-specific stuff to state dump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@918 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-08 21:51:43 +00:00
Jens Ayton
15795b03f2 Simplified key loading code, added 'dump target state' key (not bound to anything by default). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@917 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-08 21:06:29 +00:00
Jens Ayton
6536932fbb More ship set-up cleaning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@916 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-08 16:51:10 +00:00
Jens Ayton
b06cee52f7 Clean-up of ship loading (not finished). Allow arbitraryish laser colours. Explosions toned down somewhat for really big ships. Fixed bug where ships which could have a shield enhancer, but don't, get some of the benefit of one. Increased intensity of exhaust plumes slightly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@915 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-08 14:31:35 +00:00
Jens Ayton
c4ca8c750d Fiddling with JavaScript (now have a test suite for all but one Vector method), fixed error message when failing to load saved game because it uses an unknown ship, fixed Dylan's Linux build problems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@914 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-07 23:00:36 +00:00
Jens Ayton
a86bb97788 Subentities now share properties with parent for purposes of shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@913 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-07 20:49:06 +00:00
Jens Ayton
c611e69a33 Implemented JavaScript quaternion. Much cleanup. Made various enumerations actual enum types. Made some other integer types dedicated types. Slightly reduced size of entity instances. Relatively high chance of breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@912 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-07 18:03:50 +00:00
Jens Ayton
ca593a0a1e Error reporting for JS Vector and Entity methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@911 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-06 17:35:42 +00:00
Jens Ayton
67138687af implemented JS Entity class (but not tested - there's no way to get an entity yet). Simplified JS Vector by removing the reference-to-object-property stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@910 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-06 15:09:19 +00:00
Jens Ayton
935e8be1bd Implemented Vector JavaScript class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@909 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-05 23:53:48 +00:00
Jens Ayton
568609c60b Attempt at updating SDL code for new universe convention. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@908 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-05 17:45:07 +00:00
Jens Ayton
99d78cafc3 Ooops, forgot a file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@907 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-05 17:02:10 +00:00
Jens Ayton
cc175c75b9 Changed references to PlayerEntityScripting to PlayerEntityLegacyScriptEngine. Cleanup of Entity.h led to making universe a global (UNIVERSE) because having lots of references to it and passing it around is silly, and it's used many thousand times per frame. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@906 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-05 16:46:46 +00:00
Jens Ayton
08d4119b0c Renamed PlayerEntityScripting to PlayerEntityLegacyScriptEngine; added PlayerEntityScriptMethods as a shared substrate for the script models. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@905 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-05 13:17:09 +00:00
Jens Ayton
0a828d664f Removed JS universe global, accidentally left in as a duplicate of system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@904 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-04 21:30:28 +00:00
Jens Ayton
64a9062d89 Fixed copy & paste error breaking GNUstep build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@903 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-04 13:29:52 +00:00
Jens Ayton
fb8a955819 Check for exceptions at startup even for non-Macs. Stop copying SoundInspector.nib on Macs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@901 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 21:08:34 +00:00
Jens Ayton
a2f6fea6a3 Removed a spurious error message. Removed debugOn/debugOff pairs from shipdata.plist and PlayerEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@900 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 18:43:53 +00:00
Jens Ayton
140a9c0cb9 Realized previous bug fix was brittle and silly, and did it properly instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@899 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 17:50:25 +00:00
Jens Ayton
8a55bc63a2 Xcode project tweak. Moved script out into Scripts folder (preparation for JavaScript translations). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@898 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 17:37:40 +00:00
Jens Ayton
aab442c1d3 Fixed crashes at startup due to stale references to system data. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@897 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 17:23:13 +00:00
Jens Ayton
0f356d5154 OOLogging now merges logcontrol.plist from the root search paths. This is hopefully the last touch on 1.68-mac. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@896 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 00:14:21 +00:00
Jens Ayton
e19a5a663f Attempt to make strict mode work, but it seems to be severely broken. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@895 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-02 23:31:12 +00:00