Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

Faster, no (unknown) problems

Faster, problematic

Same speed, no (unknown) problems

Same speed, problematic

Slower, no other (unknown) problems

Slower, problematic

Doesn't work at all

[Baughn]

This is not DF 2010. This is merely an update to 40d providing better performance and some other enhancements. It will be part of '10, however, it has no gameplay changes.

As you may be aware, Dwarf Fortress' approach to OpenGL leaves something to be desired. To the point of my writing terrible hacks like DF Accelerator, even..

At any rate, Toady has decided to do something about that, and did it by releasing the relevant source code so others could help.

This has been done: The code has been converted to use SDL by Bernard Helyer, and the output and input code was then optimized and enhanced by yours truly. It is almost complete. However, for Toady to accept the code into the next version of DF, your assistance is needed: It must be tested. This takes many dwarves.

Known bugs
- Adventure mode is pretty much broken, and going to stay that way until DF2010.
- Image export is generally broken; some don't work, some actually freeze the game. Don't try it.
- Graphical tilesets are discolored in 2D and shader mode, being slightly too dark. YMMV on whether this is bad or not. Cookie to whoever fixes data/shader.fs for me.
- Graphical tilesets flicker in shader mode. Epilepsy-inducingly so.
- Graphical tilesets are /incredibly slow/ in shader mode. But you wouldn't do that anyway, right? Think of the epileptics.
- Shader mode does not work on ATI cards. Can't really fix myself, but the shader source is in data/shader.fs/vs; it's loaded on startup (and when resizing the window).
- The game will crash doing certain actions on certain screens, unrelated to graphics. The full list is not known, but there are crashes at least on the farm plot seed selection screen.
- You may find that the game crashes when performing particular in-game actions on the DF user interface, such as viewing a dwarf's thoughts with a very large window, or switching between seasons on the farm-plot menu with the cursor in a particular position. Such bugs are not 40d# bugs, but are the result of somewhat haphazard adaption of core DF code to 40d# and will be fixed in the DF2010 integration phase.
- Bridge linking is broken.

Download links
Windows: http://www.bay12games.com/dwarves/df_28_181_40d19_2_win.zip (Updated Mar 6)
Linux: http://www.bay12games.com/dwarves/df_28_181_40d19_linux.tar.bz2
OS X: http://www.bay12games.com/dwarves/df_28_181_40d19_osx.tar.bz2
For linux users, the following link will contain a tarball with the newest fixes, which might be officially released in 40d20, assuming there is one. It must be unpacked on top of the 40d19 tarball.
Linux 40d19 HEAD: http://brage.info/~svein/df-40d19-head.tar.bz2 Updated Mar. 5

For users on Linux and OS X, run the df script, don't run the dwarfort.exe executable directly.

Please download it, run it, and test with all the different tilesets and grid sizes your hearts desire. Graphics sets, too.

New features in 40d19 (vs. 40d)
- Translucent tilesets are supported, using PNG.
- The DF window can be resized on the fly. This can be turned off in init.txt if you like.
- The grid size is autogenerated on startup; such init.txt settings are ignored.
- Current desktop size is used for fullscreen size if fullscreen resolution is set to 0x0.
- Window resolution is measured in tiles instead of pixels, if you use a size below 200x200.
- The DF window can be zoomed on the fly using the mouse wheel, though only in opengl mode.
- The keyboard input system has been totally rewritten:
* You can bind multiple keys to one command
* You can create keyboard macros
** Default keybindings:
** Ctrl-r to record (or stop recording) a macro
** Ctrl-p to play the currently active  macro
** Ctrl-s to save the active macro
** Ctrl-l to load a macro as the active one
* Input bindings are divided into sections
- A 2D mode has been added, for people with bad opengl drivers.
- A text mode has been added (Linux/OS X only), for SSH or console use.
- A shader mode has been added, for people with DX10-compatible GPUs. DX10 or windows are not required.
- Lots of bugfixes and performance improvements.
Upcoming features in 40d20/40d19-HEAD
* Quite honestly nothing.

Bug-tracker
There should be a list of known bugs at http://github.com/Baughn/Dwarf-Fortress--libgraphics-/issues. Feel free to add yours there when you report it.

Tips and tricks
- If the default settings don't work, 2D almost certainly will. Make sure to try it.
- Make sure you test all the combinations for buffers/partial printing that Toady suggests in init.txt. Read the comments in that file, too.
- If you're having problems on windows, if possible, try running it on linux; this will provide information on whether it's hardware-dependent or software. Vice versa, too.

Linux
- If double-clicking on the script doesn't work, make sure you try it from a terminal so you can read the error output
- Required libraries include SDL and SDL_image, mainly. Make sure you have a 32-bit version of these, if you're on a 64-bit linux.


Source code
For perennially curious programmers, the source code (that is still under active development) can be found at git://github.com/Baughn/Dwarf-Fortress--libgraphics-.git. It uses the git version-control system, and can also be seen in a browser at http://github.com/Baughn/Dwarf-Fortress--libgraphics-/tree/master.

Compiling this code gives a functional DF, but it can only be compiled on Linux.

[bombcar]

Yay!

[peterix]

Another hacking session ahead! 

[Sizik]

(note: this is a 20 y.o. fort with over 100 dwarves, tons of animals and stone, with a running water fountain and waterfall.)

40d:
PARTIAL_PRINT:NO: 5 FPS
PARTIAL_PRINT:YES:15: 7 FPS

40d19:
STANDARD: 7 (7) / 7
2D: 7 (7) / 7
2DSW: 7 (7) / 7
2DASYNC: 7 (7) / 7
PARTIAL:1: 7 (7) / 7
ACCUM_BUFFER: 7 (7) / 7, excessive flickering
FRAME_BUFFER: 7 (7) / 7
VBO: 7 (7) / 7
SHADER: error:

Spoiler (click to show/hide)

data/shader.vs preprocessed source:
#version 140 // -*- mode: C -*-
#define dimx  80
#define dimy  25
#define dispx 8
#define dispy 12
const vec4 colors[] = vec4[16](vec4(0,0,0,1.0), vec4(0,0,0.501961,1.0), vec4(0,0.501961,0,1.0), vec4(0,0.501961,0.501961,1.0), vec4(0.501961,0,0,1.0), vec4(0.501961,0,0.501961,1.0), vec4(0.501961,0.501961,0,1.0), vec4(0.752941,0.752941,0.752941,1.0), vec4(0.501961,0.501961,0.501961,1.0), vec4(0,0,1,1.0), vec4(0,1,0,1.0), vec4(0,1,1,1.0), vec4(1,0,0,1.0), vec4(1,0,1,1.0), vec4(1,1,0,1.0), vec4(1,1,1,1.0));
#line 1 0
// Defines emitted by gridrectst::init_gl at load:
// dimx, dimy:      Grid size of the screen array
// dispx, dispy:    Grid-cell (font) size
// vec4 colors[16]: Color palette; first non-bold, then bold
#ifdef GRAPHICS
// offset_texpos, offset_addcolor, offset_grayscale, offset_cf, offset_cbr:
//   offsets of the corresponding graphicst arrays in data
#endif

uniform usamplerBuffer data;
uniform samplerBuffer coords;
uniform isamplerBuffer fontmap;

uniform uint frame; // Counts up from 0

in vec4 gl_Vertex;
in int gl_VertexID;

flat out vec4 frontColor;
flat out vec4 backColor;
smooth out vec2 texCoords;

void main() {
  int tile = gl_VertexID / 6;
  int offset_tile = tile * 4;

  int ch   = int(texelFetch(data, offset_tile).a);
  int fg   = int(texelFetch(data, offset_tile+1).a);
  int bg   = int(texelFetch(data, offset_tile+2).a);
  int bold = clamp(int(texelFetch(data, offset_tile+3).a), 0, 1);

#ifdef GRAPHICS
  uint texpos = texelFetch(data, offset_texpos + offset_tile).a;
  texpos += texelFetch(data, offset_texpos + offset_tile + 1).a * 256u;
  texpos += texelFetch(data, offset_texpos + offset_tile + 2).a * 65536u;
  texpos += texelFetch(data, offset_texpos + offset_tile + 3).a * 16777216u;
  uint addcolor = texelFetch(data, offset_addcolor + offset_tile).a;
  uint grayscale = texelFetch(data, offset_grayscale + offset_tile).a;
  uint cf = texelFetch(data, offset_cf + offset_tile).a;
  uint cbr = texelFetch(data, offset_cbr + offset_tile).a;


  vec4 tex_square;
  if (texpos != 0u && ch != 0) {
    tex_square = texelFetch(coords, int(texpos));
    if (grayscale != 0u) {
      frontColor = colors[int(cf + cbr * 8u)];
    } else if (addcolor != 0u) {
      frontColor = colors[fg + bold * 8];
    } else {
      frontColor = vec4(1);
    }
  } else {
    tex_square = texelFetch(coords, texelFetch(fontmap, ch).a);
    frontColor  = colors[fg + bold * 8];
  }
#else
  vec4 tex_square = texelFetch(coords, texelFetch(fontmap, ch).a);
  frontColor  = colors[fg + bold * 8];
#endif

  vec2 coords[6] = vec2[](tex_square.sq, tex_square.tq, tex_square.tp,
                          tex_square.sq, tex_square.tp, tex_square.sp);
  texCoords = coords[gl_VertexID % 6];
 
  gl_Position = gl_Vertex;
  backColor   = colors[bg];
}

data/shader.vs shader compilation log (238):
Vertex shader failed to compile with the following errors:
ERROR: 2:16: error(#168) Reserved built-in name gl_Vertex
ERROR: 2:17: error(#168) Reserved built-in name gl_VertexID
ERROR: error(#273) 2 compilation errors.  No code generated

Computer Info:

Spoiler (click to show/hide)

OS: Windows 7 Professional
Processor: AMD Athlon(tm) 64 X2 Dual Core Processor 5200+  2.70GHz
RAM: 4.00 GB
Graphics card: ATI Radeon HD 3200

[Thndr]

Any chance of having a TEXT mode for windows, other than SSH/Telnet into a linux machine running DF?

[CobaltKobold]

mmm, terminal output. [fillerpost to put in new-replies]

In the future could you link to the new thread from the end of the old one or something? The future is now!

[Diablous]

mmm, terminal output. [fillerpost to put in new-replies]

Same here.

[Baughn]

Any chance of having a TEXT mode for windows, other than SSH/Telnet into a linux machine running DF?

It seems unlikely. What do you want it for?

[Footkerchief]

Have the crashes on various screens (farm plot, and I think there was another) been fixed?  If not, they should probably be listed among the known bugs.

[Andir]

subscribble

[Thndr]

Any chance of having a TEXT mode for windows, other than SSH/Telnet into a linux machine running DF?

It seems unlikely. What do you want it for?

No reason specifically. Just figured it'd be neat.

[FatedTemp]

Using d19 on Windows 7 the game freezes up if I try to resize the window, the game keeps running (in that it uses CPU/Mem) but the screen does not change and it doesn't respond to key presses. Resizing by dragging or pressing the "expand" caption button both cause this issue. d18 had no such issue with resizing. Screenshot:

Spoiler (click to show/hide)

[colorlessness]

Looks good, all the graphics modes work for me (except SHADER, but I knew that wouldn't).  Just FYI, libgraphics.so now breaks a default SELinux implementation (on Fedora 12) due to requiring text relocation.  Though this is easy enough to fix by changing the file context.

[Quietust]

It looks like you've finally hit the mark - this one's just as fast as 40d, if not faster in a few places.

System: Core 2 Quad 2.4GHz, 512MB Geforce 8800GT with v196.21 drivers, Windows XP 32-bit, 3GB RAM

40d, PARTIAL_PRINT:NO - 21fps (38 seconds)
40d, PARTIAL_PRINT:YES:0 - 23fps (36 seconds)

40d18, STANDARD - 14fps (57 seconds)
40d18, PARTIAL:0 - 15fps (51 seconds)
40d18, ACCUM_BUFFER - 15fps (50 seconds)
40d18, FRAME_BUFFER - 15fps (52 seconds)
40d18, VBO - instantly crashes on startup
40d18, 2D - 10fps (75 seconds)
40d18, 2DHW - 11fps (73 seconds)
40d18, 2DASYNC - 11fps (73 seconds)

40d19, STANDARD - 21fps (38 seconds)
40d19, PARTIAL:0 - 23fps (34 seconds)
40d19, SHADER - 22fps (37 seconds)
40d19, ACCUM_BUFFER - 23fps (36 seconds)
40d19, FRAME_BUFFER - 22fps (37 seconds)
40d19, VBO - 22fps (36 seconds)
40d19, 2D - 23fps (36 seconds)
40d19, 2DHW - 23fps (36 seconds)
40d19, 2DASYNC - 22fps (36 seconds)

In all (non-40d) cases, SINGLE_BUFFER was disabled - enabling it would always result in horrible flickering. FPS_CAP was set to 100 and G_FPS_CAP was set to 20. My window size is 1440x800 (desktop 1600x1200x32) using a 9x16 font, for an effective resolution of 160x50 characters. Also, ARB_SYNC was enabled, and my video card doesn't seem to mind it.

One other minor thing I've noticed is that, on startup, the window will occasionally be positioned partially off the right edge of the screen - straight 40d never seemed to do that.

[Xgamer4]

Not really a bug, per-say, but at the default windowed resolution with fps display on, the fps screen covers everything in the world name except for "the".