Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1817 in orxonox.OLD for orxonox/branches


Ignore:
Timestamp:
Apr 14, 2004, 12:25:51 AM (21 years ago)
Author:
bensch
Message:

orxonox/branches/bensch: added default settings and video-init

Location:
orxonox/branches/bensch
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/bensch/Makefile

    r1816 r1817  
    6060PROGRAMS = $(bin_PROGRAMS)
    6161am_orxonox_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
    62         orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT)
     62        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
     63        orxonox_gui_file.$(OBJEXT)
    6364orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6465orxonox_LDADD = $(LDADD)
    … …  
    6970        ./$(DEPDIR)/orxonox_gui_audio.Po \
    7071        ./$(DEPDIR)/orxonox_gui_exec.Po \
     72        ./$(DEPDIR)/orxonox_gui_file.Po \
    7173        ./$(DEPDIR)/orxonox_gui_video.Po
    7274COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    … …  
    185187AM_CFLAGS = `pkg-config --cflags gtk+-2.0`
    186188AM_LDFLAGS = `pkg-config --libs  gtk+-2.0`
    187 orxonox_SOURCES = orxonox_gui.c orxonox_gui_video.c orxonox_gui_audio.c orxonox_gui_exec.c\
     189orxonox_SOURCES = orxonox_gui.c orxonox_gui_video.c orxonox_gui_audio.c orxonox_gui_exec.c orxonox_gui_file.c\
    188190        aclocal.m4
    189191
    … …  
    298300include ./$(DEPDIR)/orxonox_gui_audio.Po
    299301include ./$(DEPDIR)/orxonox_gui_exec.Po
     302include ./$(DEPDIR)/orxonox_gui_file.Po
    300303include ./$(DEPDIR)/orxonox_gui_video.Po
    301304

  • orxonox/branches/bensch/Makefile.am

    r1814 r1817  
    33
    44bin_PROGRAMS=orxonox
    5 orxonox_SOURCES=orxonox_gui.c orxonox_gui_video.c orxonox_gui_audio.c orxonox_gui_exec.c\
     5orxonox_SOURCES=orxonox_gui.c orxonox_gui_video.c orxonox_gui_audio.c orxonox_gui_exec.c orxonox_gui_file.c\
    66        aclocal.m4
    77

  • orxonox/branches/bensch/Makefile.in

    r1814 r1817  
    6060PROGRAMS = $(bin_PROGRAMS)
    6161am_orxonox_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
    62         orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT)
     62        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
     63        orxonox_gui_file.$(OBJEXT)
    6364orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6465orxonox_LDADD = $(LDADD)
    … …  
    6970@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
    7071@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
     72@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_file.Po \
    7173@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
    7274COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    … …  
    185187AM_CFLAGS = `pkg-config --cflags gtk+-2.0`
    186188AM_LDFLAGS = `pkg-config --libs  gtk+-2.0`
    187 orxonox_SOURCES = orxonox_gui.c orxonox_gui_video.c orxonox_gui_audio.c orxonox_gui_exec.c\
     189orxonox_SOURCES = orxonox_gui.c orxonox_gui_video.c orxonox_gui_audio.c orxonox_gui_exec.c orxonox_gui_file.c\
    188190        aclocal.m4
    189191
    … …  
    298300@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
    299301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
     302@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_file.Po@am__quote@
    300303@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
    301304

  • orxonox/branches/bensch/config.log

    r1816 r1817  
    10691069config.status:800: creating config.h
    10701070config.status:944: config.h is unchanged
     1071
     1072## ---------------------- ##
     1073## Running config.status. ##
     1074## ---------------------- ##
     1075
     1076This file was extended by config.status, which was
     1077generated by GNU Autoconf 2.58.  Invocation command line was
     1078
     1079  CONFIG_FILES    =
     1080  CONFIG_HEADERS  =
     1081  CONFIG_LINKS    =
     1082  CONFIG_COMMANDS =
     1083  $ ./config.status Makefile depfiles
     1084
     1085on iasius
     1086
     1087config.status:696: creating Makefile
     1088config.status:1121: executing depfiles commands
     1089
     1090## ---------------------- ##
     1091## Running config.status. ##
     1092## ---------------------- ##
     1093
     1094This file was extended by config.status, which was
     1095generated by GNU Autoconf 2.58.  Invocation command line was
     1096
     1097  CONFIG_FILES    =
     1098  CONFIG_HEADERS  =
     1099  CONFIG_LINKS    =
     1100  CONFIG_COMMANDS =
     1101  $ ./config.status Makefile depfiles
     1102
     1103on iasius
     1104
     1105config.status:696: creating Makefile
     1106config.status:1121: executing depfiles commands

  • orxonox/branches/bensch/orxonox_gui.c

    r1816 r1817  
    33#include "orxonox_gui_audio.h"
    44#include "orxonox_gui_exec.h"
    5 int verbose;
    6 int close_window = 0;
    7 int app_drawed = 0;
     5int verbose = 1;
    86
    97
    … …  
    1614int main( int argc, char *argv[] )
    1715  {
    18 
    1916    GtkWidget *window;
    2017    GtkWidget *vbox_main;
    2118    GtkWidget *hbox_video_audio;
    2219    GtkWidget *hbox_view_exec;
     20    struct settings *orxonox_settings;
     21    int option_count = 7; /* important: look that this is greater than options in 'struct settings' */
     22
     23    /* Initialize all settings */
     24   
     25    orxonox_settings = malloc (option_count*sizeof (int));
     26
     27    orxonox_gui_file_default (orxonox_settings);
     28
    2329
    2430    gtk_init (&argc, &argv);
    … …  
    3642     
    3743      {
    38         gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(), TRUE, TRUE, 0);       
     44        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_video_frame(orxonox_settings), TRUE, TRUE, 0);       
    3945       
    4046        gtk_box_pack_start(GTK_BOX(hbox_video_audio), orxonox_gui_audio_frame(), TRUE, TRUE, 0);       
    … …  
    6066    gtk_widget_show_all  (window);
    6167   
    62     app_drawed =1;
    6368    gtk_main ();
    6469   

  • orxonox/branches/bensch/orxonox_gui.h

    r1809 r1817  
    88#include <gtk/gtk.h>
    99
     10struct settings
     11{
     12  int video_fullscreen;
     13  int video_wireframe;
     14 
     15  int audio_enable_sound;
     16  int audio_music_volume;
     17  int audio_effects_volume;
     18 
     19  int exec_save_settings;
     20  int exec_show_menu;
     21};
     22extern verbose;
     23
    1024#endif /* _ORXONOX_GUI_H */

  • orxonox/branches/bensch/orxonox_gui_video.c

    r1816 r1817  
    1 #include "orxonox_gui.h"
     1#include "orxonox_gui_video.h"
    22
    3 GtkWidget *orxonox_gui_video_frame (void)
     3
     4
     5
     6
     7/* Drawing The VIDEO_FRAME */
     8GtkWidget *orxonox_gui_video_frame (struct settings *orxonox_settings)
    49{
    510  GtkWidget *frame;
    6   GtkWidget *button;
    7 
     11  GtkWidget *fullscreen_button;
     12  GtkWidget *wireframe_button;
     13 
    814  frame = gtk_frame_new ( "Video-Options:");
    915  {
    … …  
    1117    orxonox_gui_video_vbox = gtk_vbox_new (FALSE, 0);
    1218    {
    13         button = gtk_check_button_new_with_label ("Fullscreen-mode");
     19        fullscreen_button = gtk_check_button_new_with_label ("Fullscreen-mode");
     20        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fullscreen_button), orxonox_settings->video_fullscreen);
     21
    1422        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_video_fullscreen);
    1523         */
    16         gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), button, TRUE, TRUE, 0);
     24        gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), fullscreen_button, TRUE, TRUE, 0);
    1725
    18         button = gtk_check_button_new_with_label ("Wireframe-mode");
     26        wireframe_button = gtk_check_button_new_with_label ("Wireframe-mode");
     27        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wireframe_button), orxonox_settings->video_wireframe);
    1928        /*      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), orxonox_gui_video_Wireframe);
    2029         */
    21         gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), button, TRUE, TRUE, 0);
     30        gtk_box_pack_start(GTK_BOX (orxonox_gui_video_vbox), wireframe_button, TRUE, TRUE, 0);
    2231       
    2332    }

  • orxonox/branches/bensch/orxonox_gui_video.h

    r1816 r1817  
    22#define _ORXONOX_GUI_VIDEO_H
    33
    4 GtkWidget *orxonox_gui_video_frame (void);
     4#include "orxonox_gui.h"
     5
     6GtkWidget *orxonox_gui_video_frame (struct settings *orxonox_settings);
    57
    68#endif /* _ORXONOX_GUI_VIDEO_H */
Note: See TracChangeset for help on using the changeset viewer.