Nikos Barkas
|
0a3c5fcf79
|
Fixed damaged equipment displayin incorrectly on non 4:3 screen resolutions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@977 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-21 07:41:18 +00:00 |
|
Jens Ayton
|
55f832da66
|
Moved some OpenGL utilities into OOOpenGL.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@976 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 15:13:22 +00:00 |
|
Jens Ayton
|
97f91f6a18
|
Two potential crashing bugs, two potential graphical glitches, and one actual crashing bug.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@975 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 14:38:13 +00:00 |
|
Jens Ayton
|
269a68f56d
|
Oops, forgot to add planetinfo.plist (needed for data-driven witchspace).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@974 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 13:44:00 +00:00 |
|
Jens Ayton
|
d4c648d4dd
|
Made SkyEntity a subclass of Entity rather than OOSelfDrawingEntity, thus removing a bunch of mesh stuff it wasn't actually using. Researched GL_APPLE_vertex_array_object, worked out that it wasn't doing anything useful in Oolite, stripped it out, and saw a frame rate increase of 2/3.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@973 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 13:36:03 +00:00 |
|
Jens Ayton
|
4bf02adaf9
|
Reinstated caching of ship meshes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@972 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 23:19:45 +00:00 |
|
Jens Ayton
|
41399eeec4
|
Typo.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@971 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 22:25:53 +00:00 |
|
Jens Ayton
|
0de5f00261
|
Changed internal structure of OOMesh to simplify caching. Raised vertex and face limits. Deprecated front_metal.png texture.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@970 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 22:18:22 +00:00 |
|
Jens Ayton
|
53b4821191
|
Trimmed another unused SkyEntity method.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@969 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 15:10:38 +00:00 |
|
Jens Ayton
|
17e40ba6c7
|
Lots of fiddling around, most of it reverted. Meh. New shinier (and simpler) sky.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@968 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 15:09:05 +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
|
6643d24da1
|
Implemented garish placeholder texture for meshes with no TEXTURES section. Fixed bug where StationEntites were not being initialized fully. Made tharglets unpiloted.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@966 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-14 15:54:13 +00:00 |
|
Jens Ayton
|
a1597b4e6b
|
Changed sky to use additive blending; converted galaxy and star textures to one channel and adjusted black points.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@965 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 15:29:13 +00:00 |
|
Jens Ayton
|
dfbaee641c
|
Removed code to use mipmap scalers when rescaling arbitrarily, because a) it's not very useful since I went with box filtering and b) it didn't work.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@964 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 14:14:38 +00:00 |
|
Jens Ayton
|
25a46d911b
|
Texture scaling library complete.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@963 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 14:06:49 +00:00 |
|
Jens Ayton
|
6701857ef9
|
Fixed some texture scaler bugs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@962 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 01:55:58 +00:00 |
|
Jens Ayton
|
30b2407603
|
Implemented horizontal squeeze scalers (box filter).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@961 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 01:02:33 +00:00 |
|
Jens Ayton
|
ed3e07ac24
|
Better horizontal stretch scalers (now work by rows instead of by columns for cache coherency)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@960 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-12 21:24:57 +00:00 |
|
Jens Ayton
|
b06e89d5e9
|
All texture loading now goes through OOTexture (although still in some cases indirectly via TextureStore). SDLImage is thus obsolete. Removed obsolete bits of OpenGLSprite. Fixed cache pruning logic. blur256.png is now the actual texture used, rather than a placeholder. Black point adjustment for galaxy256.png's alpha channel. Fixed high-level logic in texture scaler.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@959 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-12 13:43:08 +00:00 |
|
Jens Ayton
|
380d7cfe6d
|
Implemented horizontal stretch scalers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@958 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-12 10:22:00 +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
|
64005866ab
|
Turned Matrix into a struct for reasons of Hygiene and identification. Implemented bound matrix shader uniform support. Recognize binding types the right way (using @encode). Default bindings (time, laser_heat_level etc.) now work again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@956 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-11 10:07:48 +00:00 |
|
Jens Ayton
|
e79535a9f4
|
Added support for vector, quaternion, matrix, NSNumber and OOColor shader uniforms.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@955 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-11 08:33:01 +00:00 |
|
Jens Ayton
|
076bf6c4fa
|
Lots of stuff I've been working on over the last few weeks - mainly moving ShipEntity rendering into new class (OOMesh); also work on robustness of plist handling and stuff. Texture caching management is currently buggy.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@954 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-08 15:24:13 +00:00 |
|
Jens Ayton
|
c96837389c
|
Fixed uninitialized variable warnings.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@953 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-08 13:57:01 +00:00 |
|
Nikos Barkas
|
eb272a8ae7
|
Damaged equipment displayed on commander status screen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@952 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-08 06:36:07 +00:00 |
|
Jens Ayton
|
c634cc193a
|
Fixed greyscale mipmap generation on little-endian systems. Various material-related fixes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@951 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-05 23:11:32 +00:00 |
|
Jens Ayton
|
e768efde76
|
Removed unused files.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@950 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-05 12:16:51 +00:00 |
|
Jens Ayton
|
0e59c00408
|
Changed Advanced Nav Array key to &.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@949 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-04 09:46:48 +00:00 |
|
Nikos Barkas
|
b8c20d549a
|
Fixed saving game on Windows build. Added location, galaxy number and game timestamp in save/load screens.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@948 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-02 14:15:32 +00:00 |
|
Jens Ayton
|
d6efcc1187
|
Fixed crashing inconsistency bug when inserting an already-existing object into cache, not that anything's supposed to do that. Other work in progress, but breaks sub-entities and thus not checked in.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@947 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-01 21:39:49 +00:00 |
|
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 |
|