lolengine
/
lol
mirror of https://github.com/lolengine/lol
1
0
Fork 0
Code Issues 0 Releases 0 Wiki Activity
Browse Source

Get rid of GtkVideo, it was pretty useless in the current shape.

legacy
Sam Hocevar sam 14 years ago
parent
adf78d0334
commit
298ba806bb
4 changed files with 104 additions and 212 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      src/Makefile.am
  2. +103
    -30
      src/gtk/editor.cpp
  3. +0
    -148
      src/gtk/gtkvideo.cpp
  4. +0
    -33
      src/gtk/gtkvideo.h

+ 1
- 1
src/Makefile.am View File

@@ -15,7 +15,7 @@ test_map_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
test_map_LDADD = libcommon.a test_map_LDADD = libcommon.a
test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image` test_map_LDFLAGS = `pkg-config --libs sdl gl SDL_image`


editor_SOURCES = gtk/editor.cpp gtk/gtkvideo.cpp gtk/gtkvideo.h
editor_SOURCES = gtk/editor.cpp
editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0` editor_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image gtk+-2.0 gtkgl-2.0`
editor_LDADD = libcommon.a editor_LDADD = libcommon.a
editor_LDFLAGS = `pkg-config --libs sdl gl gtk+-2.0 gtkgl-2.0 SDL_image` editor_LDFLAGS = `pkg-config --libs sdl gl gtk+-2.0 gtkgl-2.0 SDL_image`


+ 103
- 30
src/gtk/editor.cpp View File

@@ -8,32 +8,98 @@
#endif #endif


#include <cstdio> #include <cstdio>
#include <cstdlib>
#include <cmath> #include <cmath>


#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtkgl/gtkglarea.h> #include <gtkgl/gtkglarea.h>


#include "gtkvideo.h"
#include "ticker.h" #include "ticker.h"
#include "video.h"
#include "game.h" #include "game.h"


volatile int quit = 0; volatile int quit = 0;


static gint main_quit(GtkWidget *widget, GdkEventExpose *event) static gint main_quit(GtkWidget *widget, GdkEventExpose *event)
{ {
(void)widget;
(void)event;

quit = 1; quit = 1;
gtk_main_quit();
return FALSE; return FALSE;
} }


int main(int argc, char **argv)
static gboolean tick(void *widget)
{ {
GtkWidget *window, *glarea;
float const delta_time = 33.33333f;

// FIXME: do not do anything if the previous tick was too recent?

// FIXME: only quit if all assets have been cleaned
if (quit)
return FALSE;

/* Tick the game */
Ticker::TickGame(delta_time);

gtk_widget_draw(GTK_WIDGET(widget), NULL);


/* initialize gtk */
return TRUE;
}

static gint init(GtkWidget *widget)
{
/* OpenGL functions can be called only if make_current returns true */
if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
{
Video::Setup(widget->allocation.width,
widget->allocation.height);
}
return TRUE;
}

static gint draw(GtkWidget *widget, GdkEventExpose *event)
{
if (event->count == 0 && gtk_gl_area_make_current(GTK_GL_AREA(widget)))
{
// FIXME: do not do anything if the game tick wasn't called?
float const delta_time = 33.33333f;

/* Clear the screen, tick the renderer, and show the frame */
Video::Clear();
Ticker::TickRender(delta_time);
gtk_gl_area_swapbuffers(GTK_GL_AREA(widget));
}

return TRUE;
}

static gint reshape(GtkWidget *widget, GdkEventConfigure *event)
{
(void)event;

if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
{
Video::Setup(widget->allocation.width,
widget->allocation.height);
}
return TRUE;
}

int main(int argc, char **argv)
{
/* Initialize GTK */
gtk_init(&argc, &argv); gtk_init(&argc, &argv);


if (gdk_gl_query() == FALSE)
{
g_print("OpenGL not supported\n");
return EXIT_FAILURE;
}

/* Create new top level window. */ /* Create new top level window. */
window = gtk_window_new( GTK_WINDOW_TOPLEVEL);
GtkWidget *window = gtk_window_new( GTK_WINDOW_TOPLEVEL);
gtk_window_set_title(GTK_WINDOW(window), "Simple"); gtk_window_set_title(GTK_WINDOW(window), "Simple");
gtk_container_set_border_width(GTK_CONTAINER(window), 5); gtk_container_set_border_width(GTK_CONTAINER(window), 5);


@@ -41,7 +107,6 @@ int main(int argc, char **argv)
gtk_signal_connect(GTK_OBJECT(window), "delete_event", gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(main_quit), NULL); GTK_SIGNAL_FUNC(main_quit), NULL);



/* You should always delete gtk_gl_area widgets before exit or else /* You should always delete gtk_gl_area widgets before exit or else
GLX contexts are left undeleted, this may cause problems (=core dump) GLX contexts are left undeleted, this may cause problems (=core dump)
in some systems. in some systems.
@@ -52,35 +117,43 @@ int main(int argc, char **argv)
*/ */
gtk_quit_add_destroy(1, GTK_OBJECT(window)); gtk_quit_add_destroy(1, GTK_OBJECT(window));



/* Create new OpenGL widget. */ /* Create new OpenGL widget. */
GtkVideo *video = new GtkVideo("LOL", 640, 480);
glarea = GTK_WIDGET(video->GetWidget());

/* put glarea into window and show it all */
int attrlist[] =
{
GDK_GL_RGBA,
GDK_GL_RED_SIZE, 1,
GDK_GL_GREEN_SIZE, 1,
GDK_GL_BLUE_SIZE, 1,
GDK_GL_DOUBLEBUFFER,
GDK_GL_NONE
};

GtkWidget *glarea = gtk_gl_area_new(attrlist);

gtk_widget_set_events(GTK_WIDGET(glarea),
GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);

gtk_signal_connect(GTK_OBJECT(glarea), "expose_event",
GTK_SIGNAL_FUNC(draw), NULL);
gtk_signal_connect(GTK_OBJECT(glarea), "configure_event",
GTK_SIGNAL_FUNC(reshape), NULL);
gtk_signal_connect(GTK_OBJECT(glarea), "realize",
GTK_SIGNAL_FUNC(init), NULL);

// FIXME: is this needed?
gtk_widget_set_usize(GTK_WIDGET(glarea), 400, 300);

/* Put glarea into window and show it all */
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(glarea)); gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(glarea));
gtk_widget_show(GTK_WIDGET(glarea)); gtk_widget_show(GTK_WIDGET(glarea));
gtk_widget_show(GTK_WIDGET(window)); gtk_widget_show(GTK_WIDGET(window));


Game *game = new Game("maps/testmap.tmx");

for (;;)
{
// Do GTK stuff until the user wants to quit
while (g_main_context_iteration(NULL, FALSE));

if (quit)
break;

game->SetMouse(0, 0);
Ticker::TickGame(33.33333f);

video->PreRender();
Ticker::TickRender(33.33333f);
video->PostRender(33.33333f);
}
// FIXME: detect when the game is killed
new Game("maps/testmap.tmx");


delete video;
//gtk_idle_add(tick, glarea);
gtk_timeout_add(33, tick, glarea);
gtk_main();


return 0;
return EXIT_SUCCESS;
} }

+ 0
- 148
src/gtk/gtkvideo.cpp View File

@@ -1,148 +0,0 @@
//
// Deus Hax (working title)
// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
//

#if defined HAVE_CONFIG_H
# include "config.h"
#endif

#include <cstdlib>

#include <gtk/gtk.h>
#include <gtkgl/gtkglarea.h>

#include "gtkvideo.h"
#include "video.h"

/*
* Gtk Video implementation class
*/

class GtkVideoData
{
friend class GtkVideo;

private:
static gint init(GtkWidget *widget)
{
GtkVideoData *data = (GtkVideoData *)
gtk_object_get_data(GTK_OBJECT(widget), "data");

/* OpenGL functions can be called only if make_current returns true */
if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
{
Video::Setup(widget->allocation.width,
widget->allocation.height);
}
return TRUE;
}

static gint draw(GtkWidget *widget, GdkEventExpose *event)
{
GtkVideoData *data = (GtkVideoData *)
gtk_object_get_data(GTK_OBJECT(widget), "data");

if (event->count == 0 && data->drawing == 2
&& gtk_gl_area_make_current(GTK_GL_AREA(widget)))
{
data->drawing = 0;

/* Swap backbuffer to front */
gtk_gl_area_swapbuffers(GTK_GL_AREA(widget));
}

return TRUE;
}

static gint reshape(GtkWidget *widget, GdkEventConfigure *event)
{
GtkVideoData *data = (GtkVideoData *)
gtk_object_get_data(GTK_OBJECT(widget), "data");

if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
{
Video::Setup(widget->allocation.width,
widget->allocation.height);
}
return TRUE;
}

GtkWidget *widget;
int drawing;
};

/*
* Public GtkVideo class
*/

GtkVideo::GtkVideo(char const *title, int width, int height)
{
data = new GtkVideoData();

int attrlist[] =
{
GDK_GL_RGBA,
GDK_GL_RED_SIZE, 1,
GDK_GL_GREEN_SIZE, 1,
GDK_GL_BLUE_SIZE, 1,
GDK_GL_DOUBLEBUFFER,
GDK_GL_NONE
};

if (gdk_gl_query() == FALSE)
{
// FIXME: implement a panic() mode
g_print("OpenGL not supported\n");
exit(1);
}

data->widget = gtk_gl_area_new(attrlist);
data->drawing = 0;

gtk_object_set_data(GTK_OBJECT(data->widget), "data", data);
gtk_widget_set_events(GTK_WIDGET(data->widget),
GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);

gtk_signal_connect(GTK_OBJECT(data->widget), "expose_event",
GTK_SIGNAL_FUNC(GtkVideoData::draw), NULL);
gtk_signal_connect(GTK_OBJECT(data->widget), "configure_event",
GTK_SIGNAL_FUNC(GtkVideoData::reshape), NULL);
gtk_signal_connect(GTK_OBJECT(data->widget), "realize",
GTK_SIGNAL_FUNC(GtkVideoData::init), NULL);

// FIXME: is this needed?
gtk_widget_set_usize(GTK_WIDGET(data->widget), 400, 300);
}

void *GtkVideo::GetWidget()
{
return data->widget;
}

void GtkVideo::PreRender()
{
/// XXX: is this right?
gtk_gl_area_make_current(GTK_GL_AREA(data->widget));

Video::Clear();

data->drawing = 1;
}

void GtkVideo::PostRender(float milliseconds)
{
data->drawing = 2;

gtk_widget_draw(GTK_WIDGET(data->widget), NULL);
#if 0
if (milliseconds > 0.0f)
while (SDL_GetTicks() < data->ticks + (milliseconds - 0.5f))
SDL_Delay(1);
data->ticks = SDL_GetTicks();
data->frames++;

SDL_GL_SwapBuffers();
#endif
}


+ 0
- 33
src/gtk/gtkvideo.h View File

@@ -1,33 +0,0 @@
//
// Deus Hax (working title)
// Copyright (c) 2010 Sam Hocevar <sam@hocevar.net>
//

//
// The GtkVideo class
// ------------------
//

#if !defined __DH_GTKVIDEO_H__
#define __DH_GTKVIDEO_H__

class GtkVideoData;

class GtkVideo
{
public:
GtkVideo(char const *title, int width, int height);

// Inherited
void PreRender();
void PostRender(float milliseconds);

// New
void *GetWidget();

private:
GtkVideoData *data;
};

#endif // __DH_GTKVIDEO_H__


Write Preview
Loading…
Cancel
Save