Commit Graph

3243 Commits

Author SHA1 Message Date
44901d38b9 # further documentation and improvements to lib/res/file code
FILE_CACHE_BLOCK flag used more safely (copied in afile_read)
add file_sector_size (set from sysdep code)
documented and organized FileFlags
moved publically visible file_buf* decls to file.h; add FileBufFlags
file_buf_get: moved to file_io and renamed because it is not a part of
the file_buf manager itself
FILE_BLOCK_SIZE no longer exposed to users - it's an implementation
detail. for alignment purposes, you should use file_sector_size (less
wasteful)
add page_aligned allocator (mmap)
write buffers now allocated via file_buf_alloc(FB_FROM_HEAP) (avoids
wasting cache space)
append trace runs into the trace file (-> better input data for archive
ordering)
document lib_errors.h
tex_load: add provision for file_flags, used by ogl_tex_load to prevent
caching file data

simulation, entitymanager: add perf measurements

This was SVN commit r3725.
2006-04-03 21:28:10 +00:00
0eff1cac9f #Completed first draft of the roman mill and fortress.
This was SVN commit r3724.
2006-04-03 10:25:34 +00:00
ef155571c0 # As requested by Jason, now only one tab list in the Status Pane will be open at any time (hovering one will close any others that are open).
(Probably. I couldn't test with units due to the ModelRenderer
javelinist crash, but it seems to have the desired effect for the Civ
Centre. Which isn't the most conclusive test since the research list is
empty anyway.)

# Implemented Andrew's formation functions in the formation "pick list".

(Again, probably. Since this is completely untestable without being able
to select units, I can only speculate that it might work. The game
didn't crash and burn on startup as a result of my meddling, which I
take as a good sign.)

(Andrew: The changed section is a formation case switch at line 376 of
functions_page_session_status_commands.js. I endeavoured to use all your
functions to try them out. Like I said, I'm not sure if any of this
works -- and being sick and feverish doesn't help -- but it might at
least give you somewhere to start.)

This was SVN commit r3723.
2006-04-03 04:54:43 +00:00
5738bd4820 # overhauled error handling; made sure all low-level function failures are caught at the source.
* replace all "return ERR_*" with WARN_RETURN(ERR_*) - makes sure
function failures are noticed *at the cause*, not later
* LibError_from_* now take bool warn_if_failed param
* replace more debug_warns with dedicated error codes (allows localized
error reports and doesn't spam the EXE with strings)

This was SVN commit r3722.
2006-04-03 01:00:45 +00:00
001e951066 Autobuilder: Notify autologger of commits.
Interact.cpp: Added category to LOG calls.
Atlas: Renamed all handler source files, so they won't conflict with
other files of the same name. (Fixes bug #77)

This was SVN commit r3721.
2006-04-03 21:08:58 +00:00
d9944f9524 # remove last occurrences of old ScEd-specific code
This was SVN commit r3719.
2006-04-02 16:27:34 +00:00
bd96a1ab7c # fix unit rank texture loading (was crashing when displaying log message)
problems: for a "vector<CStr>::iterator it", passing *it to a varargs
function taking const char* (baad because compiler cannot invoke the
operator const char* and therefore screws up the stack); incorrect
parameters to LOG().
thanks go to philip for diagnosing the problem!

This was SVN commit r3717.
2006-04-02 07:22:23 +00:00
b5ad9faf74 # fix STL complaint when running on VC8 and building archive
(STL implementation AFAICS incorrectly disallows taking &vector[0] if
empty but memory has been reserved)

This was SVN commit r3715.
2006-04-02 04:50:47 +00:00
31dd421c15 # Updated test actor and script for prop switch testing
This was SVN commit r3714.
2006-04-01 23:49:59 +00:00
Aeros
d17c57657f April fools celtic genetic engineering lab added - actor is under /temp
This was SVN commit r3712.
2006-04-01 19:37:21 +00:00
pyrolink
cf14a7bc15 -rank/formation stuff and fixes. To give a unit a rank texture, just set rank.name in the entity's XML to the filename of the texture e.g. elite.dds or advanced.dds
This was SVN commit r3711.
2006-03-31 03:37:36 +00:00
pyrolink
3408b078b7 #Unit formations and rank textures
-Added functionality for "casting" and creating net messages (without
JS)
-Rank textures-specified in XML
-Formations-currently don't attack correctly (i.e. travel like mobs) and
don't switch to their movement formations when tasked to go somewhere
(the pathfinder doesn't give any heads up about destination reached, so
there's no way to change back to the original).  Also, base switching is
untested so no garuntees for next and prior formation things.

This was SVN commit r3710.
2006-03-31 03:30:34 +00:00
87780e328a Potentially really fix that renderpath related crash.
This was SVN commit r3708.
2006-03-31 02:19:11 +00:00
66fa4f51f1 # Updating of some cursors to replace temporary artwork.
This was SVN commit r3707.
2006-03-30 09:41:09 +00:00
a201382bad Fixing the greek trireme
This was SVN commit r3706.
2006-03-30 07:03:14 +00:00
799d3f0fce #A well eye-candied map for testers and staff members to marvel at the new self-shadowing.
Task things around, guys, and check out how cool the shadows look. You
can even task the ships around. What's cool is that the bireme and
trireme use the "double-click" charge attack, just like the foot units.
This would be a very intuitive way to use the "ramming" ability of
ships.

This was SVN commit r3705.
2006-03-30 05:23:08 +00:00
083e495ecc #* Updated the forage and hoe animations for props
Moved some props around (moved out of temp, because they aren't temp)

This was SVN commit r3704.
2006-03-29 10:47:44 +00:00
b951eb5fd6 #Fix a potential crash in renderpath selection.
This was SVN commit r3702.
2006-03-28 19:45:44 +00:00
43ee589760 #* Updated the lumber and mining animations to work correctly with props
I can't see if they work though, because the prop switcher doesn't seem
to be working *looks at Philip*

This was SVN commit r3701.
2006-03-28 11:35:32 +00:00
5acfc87608 #Adjust the default Z bias for shadow rendering.
This was SVN commit r3699.
2006-03-27 19:00:04 +00:00
35e9a966dc #*Colorized teh command icon sheet
#*Updated all the formation icons

This was SVN commit r3698.
2006-03-27 11:12:20 +00:00
b57ccc0887 * Fix: Silly operator precedence problem
This was SVN commit r3696.
2006-03-26 22:18:35 +00:00
0d648b2df8 #More accurate bounds calculations to improve shadow resolution
and a fix for the auto-build: #define enums from EXT_framebuffer_object

* clip shadow bounds to frustum
* add CBrush, a class representing a convex object

This was SVN commit r3695.
2006-03-26 21:58:48 +00:00
73506eb076 #Code cleanups related to renderer
Remove the OPT_NOPBUFFER and OPT_SHADOWCOLOR options and related
variables
since they weren't really used.

This was SVN commit r3694.
2006-03-26 17:46:18 +00:00
8fd256c458 #Use EXT_framebuffer_object when available
* noframebufferobject configuration in system.cfg can be used to
  disable EXT_fbo (in case drivers are flaky etc.)
* shadow texture size now honours the OpenGL maximum texture size as
reported
  by the implementation

This was SVN commit r3693.
2006-03-26 17:36:33 +00:00
12b214bf27 #Tweak of some lighting settings on Ken's map
This was SVN commit r3692.
2006-03-26 11:12:11 +00:00
e2bbd9a654 #Models receive shadows now, including self-shadows.
This is a huge patch, including:
* add a LitRenderModifier abstract base class for RenderModifiers with
  shadow+light
* add LitRenderModifiers for all types of models
* add STREAM_TEXGENTOUV1 to request generation of shadow map texcoords
  for models
* create facilities to pass the texture matrix from the
  RenderModifier (fragment stage) to the ModelRenderer (vertex stage)
* split ambient and diffuse terms of lighting until further down in the
  pipeline; this is necessary since shadowed regions receive only
ambient light
* small improvement in how RenderPathVertexShader scales to a greater
  number of vertex shaders

This was SVN commit r3690.
2006-03-26 00:54:20 +00:00
0bd5778536 #Fix a crash in the heightfield tracer.
Apparently, nobody has ever managed to get a precise 0 into the camera's
direction vector before...

This was SVN commit r3688.
2006-03-25 22:13:28 +00:00
0e09451cfb # bugfix
avoid warning due to imbalanced buffer count

This was SVN commit r3687.
2006-03-25 21:44:25 +00:00
cc26968249 # IO thesis: add TSP measurement, lessons learned and bibliography (bibtex)
This was SVN commit r3686.
2006-03-25 20:57:16 +00:00
d6abc57868 # add instrumentation to file_cache; bugfixes
adts: whip together inefficient LRU cache manager (mostly for comparing
vs. Landlord)
file_cache: fix self-test (now correctly deals with small cache sizes)
file_stats: more stats for file cache
trace, vfs: bugfix: ignore writes recorded by the trace

This was SVN commit r3684.
2006-03-25 07:08:29 +00:00
dadd15ef00 # IO thesis: incorporate revisions from 2nd reviewer and add experimental results for cache
This was SVN commit r3683.
2006-03-25 07:05:04 +00:00
8371f42da9 # IO bugfixes and improvements; more support for cache/seek measurements
adts: slight improvements
allocators: change POOL_VARIABLE_ALLOCS to -1 for safety; fix invalid
assumptions of it being 0
lib: more expressive param names
file: add file_get_random_name for randomized trace generation; allow
file_cache.h to declare externally visible file_buf_alloc API

file_cache: zero-length file bugfix; also add several flags to the API
routines allowing statistics gathering to be disabled (avoids distorting
stats due to e.g. trace_entry_causes_io cache simulation)

file_stats: add archive builder info; separate IO timing and seek
accounting (-> correct results)

trace: add random generation capability
vfs: made responsible for cache hit/miss accounting (fixes cache miss
rate display)

This was SVN commit r3681.
2006-03-24 21:56:00 +00:00
34ff09529d # Implemented "pick list" selection code in UI. (Stances and formations can now be selected.)
# Added Explore tag for infantry units.
# Temporarily assigned a standard set of formations to all units for
testing purposes.
# Fixed pick list tab style.
* (Also updated traits.formation in Wiki to keep in sync.)
* Added "loose" formation -- is there a better name for that? -- since
presumably we'll need an option to disband the current formation.
* Pushed selection tab behind the pane as an easy alternative to
shifting it about.
* Started working on lists with "mixed" items (from different sheets,
like Allegiances), but decided halfway to commit the formation stuff for
Andrew.
* (Incidentally, as suspected, there isn't enough room for all these
items. All four horizontal tabs are now maxed out on a typical CS. Might
have to append the kill and player tribute items from Allegiance onto
Stance.)
* (Also, if we need more than 11 items in the list, that will also need
to be adapted sooner rather than later. The representative formation
list is maxed out.)

This was SVN commit r3680.
2006-03-24 20:59:09 +00:00
e72adfff5c # Two new updated animations for the chop and the mine actions. Updated test actor accordingly.
This was SVN commit r3679.
2006-03-24 12:11:46 +00:00
ad8c29a8c7 Just a test map to see how close I can get to an actual Mediterranean biomic map given our current art assets. It is currently unfinished, but will continuously update.
This was SVN commit r3678.
2006-03-24 05:24:46 +00:00
b431089ee7 # revisions to IO thesis suggested by adviser
This was SVN commit r3677.
2006-03-23 23:14:53 +00:00
eba3e5fdd6 setup new docs dir for thesis and maybe other files (as discussed with stuart, it doesn't fit in binaries or source)
commit rough draft

This was SVN commit r3676.
2006-03-23 18:17:13 +00:00
3efeeecb84 # Made two new animation files (gather, hoe) for testing animations. Also modified the hele_inf_jav_b to use the new actor format for testing purposes.
This was SVN commit r3675.
2006-03-23 10:50:45 +00:00
792c479165 * Fixed bug in command lists that was causing the first item in a production list to not be displayed.
* Got selection list (shows a list of portraits of the currently
selected units, with health bars) to work, including horizontally
expanding tab (using a helmet tab temporarily to get an idea of the icon
location).
* Todo: Dynamically adjust tab position when horizontal list (tabs need
more blending room); bleed portraits into additional rows above when the
number of entities in the selection exceeds the length of a list.

This was SVN commit r3674.
2006-03-23 07:45:52 +00:00
c802dc3152 * Fixed minor glitch which was causing the garrison icon to not appear. (Temporarily moved garrison value into command cell sheet, then changed mind and swapped it back to having its own sheet, since it'd probably need to be coloured to match the nearby supply icon.)
This was SVN commit r3673.
2006-03-22 18:21:27 +00:00
8dd3a61a3a * Took Philip's advice and made all local GUI variables actually local using var.
* Added a simple "Game is Paused" text message to the Pause hotkey.

This was SVN commit r3672.
2006-03-21 22:30:29 +00:00
f45c44ca09 Rotated various things (terrain texture UVs, default light and camera angles) by 45 degrees.
Map XML: Store camera position. Stopped using DTDs (because they make it
too hard to change the XML structure without breaking all the old XML
files).
Game.h: Include fewer files, to make compilation sometimes faster.
World: Changed some things to not be singletons, since they were
(ab)used as CWorld members.

This was SVN commit r3670.
2006-03-21 20:55:45 +00:00
ccc8055226 Fail more nicely with invalid actors
This was SVN commit r3669.
2006-03-19 22:37:56 +00:00
c29f4ca444 Minor alignment correction.
This was SVN commit r3668.
2006-03-19 06:38:24 +00:00
be382223f8 fixing the glossy buttons
This was SVN commit r3667.
2006-03-19 02:34:02 +00:00
f5f4670d7f tweaks for thesis and minor fixes.
file: change block size to 32kb (=> yields highest throughput)
archive, file_io: add additional block cache forwarding path when
reading uncompressed data from archive (avoids repetitive IOs)
file_io, file_stats: fix inaccurate and incorrect IO throughput
calculation
file_stats: refactor some calculations to avoid division by 0

This was SVN commit r3665.
2006-03-18 21:28:47 +00:00
2e0a312913 update load time estimates. CSimulation is quite high and in need of optimization!
This was SVN commit r3664.
2006-03-18 21:25:03 +00:00
28c6bc2fbb * Minimap buttons are in place and clickable (though not actually hooked up with any events yet). The arc buttons still don't look quite right, but artist intervention will no doubt set me right.
This was SVN commit r3663.
2006-03-18 17:42:37 +00:00
8315bcce96 * Fixed invalid name bug that slipped in when I did a blind commit. (Minimap buttons aren't positioned right, but at least I've got some of them up.)
* Split command backs into outer ring and inner bubble (so nested
add_color can be used to illuminate only the interior).
* Used nested add_color (when you have a new toy, you have to play with
it) to make only the icon of a tab illuminate, which looks a lot better.
* Removed garrison sprite definition, since that cell sheet is not long
for this world.

This was SVN commit r3662.
2006-03-18 06:58:16 +00:00