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]

Rafal99: The bugs are known, but just because they're late d#-specific doesn't mean I can do anything about them.

They're due to the input layer conversion being done a bit haphazardly on the DF side, and won't be around in DF2010.. that's about all I can say on the matter.

[Chrispy]

With windows 7x64, plenty of ram, an i7 and dual 4850's.  Reformated 30 hours ago, no video card drivers installed except the defaults.

My save folder is ~58Mb, which might account for some crashes while saving?
SINGLE_BUFFER:NO for all unless stated.
Using the 'shader' option.

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 (1319):
Vertex shader failed to compile with the following errors:
ERROR: 0:1: '' :  Version number not supported by GL2
ERROR: 2:16: 'gl_Vertex' : reserved built-in name
ERROR: 2:17: 'gl_VertexID' : reserved built-in name
ERROR: 2:27: 'texelFetch' : no matching overloaded function found
ERROR: 2:27: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:28: 'texelFetch' : no matching overloaded function found
ERROR: 2:28: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:29: 'texelFetch' : no matching overloaded function found
ERROR: 2:29: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:30: 'texelFetch' : no matching overloaded function found
ERROR: 2:30: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:58: 'texelFetch' : no matching overloaded function found
ERROR: 2:58: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:58: 'texelFetch' : no matching overloaded function found
ERROR: 2:58: '=' :  cannot convert from 'const float' to '4-component vector of float'
WARNING: 2:63: '' : Unsized array constructors is not allowed in implicit GLSL version number 110
ERROR:  compilation errors.  No code generated.

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 (1319):
Vertex shader failed to compile with the following errors:
ERROR: 0:1: '' :  Version number not supported by GL2
ERROR: 2:16: 'gl_Vertex' : reserved built-in name
ERROR: 2:17: 'gl_VertexID' : reserved built-in name
ERROR: 2:27: 'texelFetch' : no matching overloaded function found
ERROR: 2:27: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:28: 'texelFetch' : no matching overloaded function found
ERROR: 2:28: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:29: 'texelFetch' : no matching overloaded function found
ERROR: 2:29: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:30: 'texelFetch' : no matching overloaded function found
ERROR: 2:30: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:58: 'texelFetch' : no matching overloaded function found
ERROR: 2:58: 'a' :  field selection requires structure, vector, or matrix on left hand side
ERROR: 2:58: 'texelFetch' : no matching overloaded function found
ERROR: 2:58: '=' :  cannot convert from 'const float' to '4-component vector of float'
WARNING: 2:63: '' : Unsized array constructors is not allowed in implicit GLSL version number 110
ERROR:  compilation errors.  No code generated.

VBO:~93fps
FRAME_BUFFER: ~98fps
ACCUM_BUFFER: Blinks madly on the title screen, changes on resize, switching on-top-ness, locks up, ~110fps, (very hard to tell), massive flickering ingame, crashes on save
ACCUM_BUFFER and SINGLE_BUFFER:YES; ~100fps, crash on save again.
Partial and no causes flickering on the title screen
Partial:1 ~103 fps
Standard: ~97fps
2DASYNC:~102fps

[Tellemurius]

i think version 16 should be implemented, it seems every update now the game gets more buggy.

[Baughn]

Not on linux, I hope.. *sigh*

You might be right. This way of developing isn't working out.. okay. I'm going to try making battle champs work again. I have a much better chance at fixing the various bugs if I can actually debug the code.

[jaked122]

Honestly if there are those kinds of errors, i think we should find someone a little more competent to code the sdl/opengl part. Why the hell your even using opengl i dont know. Only need SDL. No reason to have opengl honestly.

You know, in FOSS world you either do it yourself or STFU.

If this guy knew what he was doing there would be no bugs right now

And i could easly setup SDL code, OpenGL no since df is never going to be 3d without a major rewrite. So theres no point in coding in opengl, sdl will work fine for graphics.

So yes i could easly teach toady how to use sdl, its not that hard to do

for the sake of god, if toady knew what he was doing, this entire branch wouldn't be necessary, there are multiple ways to do something, some are good for certain situations, some are good for others. some aren't good at all, but they all have merit, and a good fraction of them work, there is no way to 'know' how to do something until it has been done, the bugs have been revealed and understood. honestly I doubt that the best programmers could have done much better on this project, they didn't think of dwarf fortress, so they didn't do it.

that was a ramble.

[Keizo]

Did anyone get the shaders to work? If so, is it possible for one of you kind folks to post screenshots of this feature in action? I don't know what a shader is for in the context of DF and I'm curious if this is a new feature I should be possibly excited about... thanks!

[TheSpaceMan]

I have not replied for posts on the forum for ages. But seeing some of the lack of knowledge in the forum I just feel that I need to do a short post.

No excuse my language for a bit good folks.

First of all sdl is slow as FUCK, this is one of the main problems today, it's not about how big area you draw, if it's just "2d" etc. The costly part is the number of draw calls and what handles the actual drawing.

I am taking some of this data from my memory so stay with me. A non size changed Dwarf fortress screen is 80*25 units. Thats 2000 objects. In a simple SDL layout that would be roughly 2000 blit calls per frame with access to diffrent part of different textures containing the data needed. To keep a frame rate of 30 fps. thats 60 000 blits per second.

With sdl most of this is handled on cpu level, the logic is also handled on the cpu, if the rendering takes to long it will affect the logic and wise versa.

A modern computer in this day of age has a Graphical Processing Unit. This is called a GPU, in most cases it got it's own memory and this card is a master of floating point math operations. The card is built mostly for 3d operations, but it also got registers for 2d textures.

With something like OpenGL, you can transfer the workload of rendering, from the cpu to the gpu. We still need to know what we want to render where but the actual process of getting all our 2000 tiles on screen is now more of gpu issue.

I would like to try to do a full focused window version using the gpu as the workhorse as well. But i don't know if I have the time with current projects going on.

I am impressed and know the amount of work people have put in to this.

Quite simply, just doing it trough SDL won't cut it.

Sorry for my rambeling, and have a great weekend all you dwarf lovers out there.
By now someone have probably posted more things regarding this.

//TheSpaceMan

[Footkerchief]

Did anyone get the shaders to work? If so, is it possible for one of you kind folks to post screenshots of this feature in action? I don't know what a shader is for in the context of DF and I'm curious if this is a new feature I should be possibly excited about... thanks!

It doesn't make the game look different, it's just a different rendering path that should be faster for people with up-to-date video cards.

[Baughn]

Did anyone get the shaders to work? If so, is it possible for one of you kind folks to post screenshots of this feature in action? I don't know what a shader is for in the context of DF and I'm curious if this is a new feature I should be possibly excited about... thanks!

They look exactly the same as DF usually does. It's just faster, that's all. Well, when it works; the main reason for including them in this version was to see the errors when they don't.

[The-Moon]

Bug free version of drawing stuff with sdl, also included the text, but didnt bother with the audio, what was the big deal?

dont need much more then this code for dwarf fortress, no need for opengl

Linker : -lmingw32 -lSDLmain -lSDL -lSDL_ttf

Code: [Select]

#include <stdio.h>
#include <stdlib.h>
#include <string>
#include <iostream>
#include <cstdlib>

#include "SDL\SDL.h" // main SDL header
#include "SDL\SDL_ttf.h"
//#include "SDL_mixer.h"

#define SCREEN_WIDTH 640
#define SCREEN_HEIGHT 480

using namespace std;

int InitVideo();
void Draw_Surface(int locX, int locY, int surfX, int surfY, SDL_Surface *surface);
void Run_Game();
void Check_Keys();

FILE * ctt = fopen("CON", "w" ); //This is added in for rerouting the sdl log back to the console :)

SDL_Surface *screen; //This pointer will reference the backbuffer
SDL_Surface *tiles;
SDL_Event keyevent; //The SDL event that we will poll to get events.

struct Map_Data
{
    int Tile;
};

Map_Data Map[10][10];

int charX = 0, charY = 0, dir = 0;
int iCA = 0, iCB = 0;

int END_GAME = 0;

TTF_Font* font;

TTF_Font* loadfont(char* file, int ptsize)
{
  TTF_Font* tmpfont;
  tmpfont = TTF_OpenFont(file, ptsize);
  if (tmpfont == NULL){
    printf("Unable to load font: %s %s \n", file, TTF_GetError());
    // Handle the error here.
  }
  return tmpfont;
}

int main(int argc, char *argv[])
{
    if (InitVideo() == 0) {system("PAUSE"); return 0;}

    if (TTF_Init() == -1)
    {
        cout << "Cant init font\n";
        //printf("Unable to initialize SDL_ttf: %s \n", TTF_GetError());
    }

    font = loadfont("arial.ttf", 16);

    tiles = SDL_DisplayFormat(SDL_LoadBMP("tiles.bmp"));
    SDL_SetColorKey(tiles, SDL_SRCCOLORKEY, SDL_MapRGB(tiles->format, 255, 0, 255));

    if (tiles == NULL)
    {
        printf("Unable to load tiles: %s\n", SDL_GetError());
        return 0;
    }

    for (int iA = 0; iA < 10 ; iA++)
    {
        for (int iB = 0; iB < 10 ; iB++)
        {
            Map[iB][iA].Tile = 0;
        }
    }

    SDL_EnableKeyRepeat(1, 100);

    Run_Game();
    //ctt.close();

    SDL_FreeSurface(tiles);

    return 0;
}

void Run_Game()
{
    SDL_Color color = {150,150,150};
    SDL_Surface *text_surface;

    while (END_GAME == 0)
    {
        cout << "Loop\n";

        Check_Keys();

        for (int iY = 0;iY < 10;iY++)
        {
            for (int iX = 0;iX < 10;iX++)
            {
                if (Map[iX][iY].Tile == 0)
                {
                    Draw_Surface(200 + (iX * 16), 200 + (iY * 16), 0, 0, tiles);
                }
                else
                {
                    Draw_Surface(200 + iX * 16, 200 + iY * 16, 0, 16, tiles);
                }
            }
        }


        Draw_Surface(200 + (charX*16), 200 + (charY*16), 32, 0, tiles);


        if(!(text_surface=TTF_RenderText_Solid(font,"Hello World!",color)))
        {
        }
        else
        {
            SDL_BlitSurface(text_surface,NULL,screen,NULL);
            SDL_FreeSurface(text_surface);
        }

        SDL_Flip(screen);
        SDL_Delay(1);
    }

    return;
}

void Check_Keys()
{
    while (SDL_PollEvent(&keyevent))   //Poll our SDL key event for any keystrokes.
    {
        switch(keyevent.type)
        {
            case SDL_KEYDOWN:
                switch(keyevent.key.keysym.sym)
                {
                case SDLK_LEFT:
                    if (charX > 0 ) {charX--;}
                    break;
                case SDLK_RIGHT:
                    if (charX < 9 ) {charX++;}
                    break;
                case SDLK_UP:
                    if (charY > 0 ) {charY--;}
                    break;
                case SDLK_DOWN:
                    if (charY < 9 ) {charY++;}
                    break;
                case SDLK_ESCAPE:
                    END_GAME=1;
                    break;
                default:
                    break;
                }
//            case SDL_KEYUP:
//                switch(keyevent.key.keysym.sym)
//                {
//                    case SDLK_LEFT:
//                        break;
//                    case SDLK_RIGHT:
//                        break;
//                    case SDLK_UP:
//                        break;
//                    case SDLK_DOWN:
//                        break;
//                    default:
//                        break;
//                }

        }
    }
}

void Draw_Surface(int locX, int locY, int surfX, int surfY, SDL_Surface *surface)
{
    SDL_Rect src, dest;

    src.x = surfX;
    src.y = surfY;
    src.w = 16;
    src.h = 16;

    dest.x = locX;
    dest.y = locY;
    dest.w = locX + 16;
    dest.h = locY + 16;

    SDL_BlitSurface(surface, &src, screen, &dest);

    return;
}

int InitVideo()
{
    // Load SDL
    if (SDL_Init(SDL_INIT_VIDEO) != 0)
    {
        fprintf(stderr, "Unable to initialize SDL: %s\n", SDL_GetError());
        return 0;
    }

    freopen( "CON", "w", stdout ); //Set App back to using the console for text display

    atexit(SDL_Quit);

    screen = SDL_SetVideoMode(SCREEN_WIDTH, SCREEN_HEIGHT, 16, SDL_DOUBLEBUF);

    if (screen == NULL)
    {
        fprintf(stderr, "Unable to set video mode: %s\n", SDL_GetError());
        return 0;
    }

    return 1;
}


[Baughn]

Now do it with minimal CPU use, at 20 frames per second, with a 180x85 grid, and support non-QWERTY and non-US keyboards.

And when you're done with that, I've got a couple dozen other requirements before it's very useful.

Or better yet, download the source code from the first post, and fix that. It's right there. The link beckons. What's stopping you?

[The-Moon]

Now do it with minimal CPU use, at 20 frames per second, with a 180x85 grid, and support non-QWERTY and non-US keyboards.

And when you're done with that, I've got a couple dozen other requirements before it's very useful.

Or better yet, download the source code from the first post, and fix that. It's right there. The link beckons. What's stopping you?

Already practically at minimal cpu usage, code could be cleaned up more of course, i only posted that code to show how simple you could setup what was needed for df to draw graphics.

I have no knowledge of opengl

Wouldnt be much help there.

[Baughn]

Battlechamps is a bust. There's no way I can make that work with the current codebase now.

Hm. OKay, so am I correct in assuming that nobody's having serious issues on linux? It's all basically windows or OS X?

..I've got to figure out a way to develop/debug on those platforms too. :-/

[Baughn]

The-Moon: Believe it or not, I did something like that once too. Mine used opengl, mind you.

And then I tried to actually link it with DF, and discovered that things were not as simple as they seemed.

They possibly *should* be, but I'm laboring under the restriction that I must not change any interface severely, under pain of the compiled code no longer working with the binary-only DF executable. I can also only test it or debug on linux.

This is admittedly a great improvement on what I had before 40d12, when the only way to test anything at all was to send the code to Toady, and have him compile it. Sometimes there'd be compilation errors.

Please, don't assume I don't know what I'm doing on the programming side of things. It's the interface side of things - DF and windows' notion of opengl - that are giving me nightmares.

[darkrabite]

Have you tried a virtual machine? vmware or virtual pc work pretty well in general, tho i've never tried to use df in one.

wish i could help with your development code-wise, but maybe i can help on this part.

=)
edit:
if its a matter of having toady compile using code only he has access to, it might be possible to make a blind version compile with some trickery. i'd have to know more about the tools toady is using to do his development (not the code itself), but this might make development of your half easier.