Menu
▾
▴
opengate-svn — List for Subversion commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
| 2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
| 2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <eg...@us...> - 2006-07-30 19:25:22
|
Revision: 135 Author: egore Date: 2006-07-30 12:25:16 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=135&view=rev Log Message: ----------- dtd update Modified Paths: -------------- data/Weapons/Liar/liar.xml Modified: data/Weapons/Liar/liar.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:24:58
|
Revision: 134 Author: egore Date: 2006-07-30 12:24:52 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=134&view=rev Log Message: ----------- dtd update Modified Paths: -------------- data/Makefile.am data/opengate.dtd Modified: data/Makefile.am =================================================================== --- data/Makefile.am 2006-07-30 19:24:04 UTC (rev 133) +++ data/Makefile.am 2006-07-30 19:24:52 UTC (rev 134) @@ -1,4 +1,6 @@ -INCLUDES = -METASOURCES = AUTO +SUBDIRS = Ships Rankings -SUBDIRS = Ships +pkgdatadir = $(datadir)/games/@PACKAGE@ + +pkgdata_DATA = ogre_menu.zip \ +opengate.dtd Modified: data/opengate.dtd =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:24:10
|
Revision: 133 Author: egore Date: 2006-07-30 12:24:04 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=133&view=rev Log Message: ----------- dtd update Modified Paths: -------------- data/Ships/Solrain/Premia/solrain_premia.xml Modified: data/Ships/Solrain/Premia/solrain_premia.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:23:35
|
Revision: 132 Author: egore Date: 2006-07-30 12:23:31 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=132&view=rev Log Message: ----------- mask autogenerated files Property Changed: ---------------- data/Rankings/ Property changes on: data/Rankings ___________________________________________________________________ Name: svn:ignore + Makefile.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:22:35
|
Revision: 131 Author: egore Date: 2006-07-30 12:22:31 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=131&view=rev Log Message: ----------- dtd update Modified Paths: -------------- data/Engines/Money/money.xml Modified: data/Engines/Money/money.xml =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:22:19
|
Revision: 130 Author: egore Date: 2006-07-30 12:21:38 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=130&view=rev Log Message: ----------- add necessary menu stuff copied from OIS Added Paths: ----------- data/Gui/ data/Gui/ActionMapping.layout data/Gui/Falagard.xsd data/Gui/Font.xsd data/Gui/ForceFeedback.layout data/Gui/GUILayout.xsd data/Gui/GUIScheme.xsd data/Gui/Imageset.xsd data/Gui/WindowsLook.imageset data/Gui/WindowsLook.looknfeel data/Gui/WindowsLook.scheme data/Gui/WindowsLook.tga data/Gui/WindowsLookSkin.scheme data/Gui/WindowsLookWidgets.scheme data/Gui/tahoma-12.font data/Gui/tahoma.ttf Added: data/Gui/ActionMapping.layout =================================================================== (Binary files differ) Property changes on: data/Gui/ActionMapping.layout ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/Falagard.xsd =================================================================== (Binary files differ) Property changes on: data/Gui/Falagard.xsd ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/Font.xsd =================================================================== (Binary files differ) Property changes on: data/Gui/Font.xsd ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/ForceFeedback.layout =================================================================== (Binary files differ) Property changes on: data/Gui/ForceFeedback.layout ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/GUILayout.xsd =================================================================== (Binary files differ) Property changes on: data/Gui/GUILayout.xsd ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/GUIScheme.xsd =================================================================== (Binary files differ) Property changes on: data/Gui/GUIScheme.xsd ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/Imageset.xsd =================================================================== (Binary files differ) Property changes on: data/Gui/Imageset.xsd ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/WindowsLook.imageset =================================================================== (Binary files differ) Property changes on: data/Gui/WindowsLook.imageset ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/WindowsLook.looknfeel =================================================================== (Binary files differ) Property changes on: data/Gui/WindowsLook.looknfeel ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/WindowsLook.scheme =================================================================== (Binary files differ) Property changes on: data/Gui/WindowsLook.scheme ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/WindowsLook.tga =================================================================== (Binary files differ) Property changes on: data/Gui/WindowsLook.tga ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: data/Gui/WindowsLookSkin.scheme =================================================================== (Binary files differ) Property changes on: data/Gui/WindowsLookSkin.scheme ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/WindowsLookWidgets.scheme =================================================================== (Binary files differ) Property changes on: data/Gui/WindowsLookWidgets.scheme ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/tahoma-12.font =================================================================== (Binary files differ) Property changes on: data/Gui/tahoma-12.font ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Gui/tahoma.ttf =================================================================== (Binary files differ) Property changes on: data/Gui/tahoma.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:16:17
|
Revision: 129 Author: egore Date: 2006-07-30 12:16:10 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=129&view=rev Log Message: ----------- Modified Paths: -------------- ChangeLog Modified: ChangeLog =================================================================== --- ChangeLog 2006-07-30 19:14:48 UTC (rev 128) +++ ChangeLog 2006-07-30 19:16:10 UTC (rev 129) @@ -1,3 +1,9 @@ +2006-07-30 Christoph Brill <eg...@us...> + + * src/client/input: drop old handmade inputsystem + + * src/client/ui: add new OIS based input system + 2006-07-17 Christoph Brill <eg...@us...> * data/opengate.dtd: extend for ship validation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 19:14:54
|
Revision: 128 Author: egore Date: 2006-07-30 12:14:48 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=128&view=rev Log Message: ----------- OIS support Modified Paths: -------------- configure.in opengate.kdevelop Removed Paths: ------------- Makefile.in configure Deleted: Makefile.in =================================================================== --- Makefile.in 2006-07-30 19:14:10 UTC (rev 127) +++ Makefile.in 2006-07-30 19:14:48 UTC (rev 128) @@ -1,626 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO config.guess config.sub depcomp install-sh ltmain.sh \ - missing mkinstalldirs -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AM_CXXFLAGS = @AM_CXXFLAGS@ -AM_LDFLAGS = @AM_LDFLAGS@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CEGUI_CFLAGS = @CEGUI_CFLAGS@ -CEGUI_LIBS = @CEGUI_LIBS@ -CEGUI_OGRE_CFLAGS = @CEGUI_OGRE_CFLAGS@ -CEGUI_OGRE_LIBS = @CEGUI_OGRE_LIBS@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GREP = @GREP@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -OGRE_CFLAGS = @OGRE_CFLAGS@ -OGRE_LIBS = @OGRE_LIBS@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ - -# not a GNU package. You can remove this line, if -# have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign 1.4 -SUBDIRS = src doc data -all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -.SUFFIXES: -am--refresh: - @: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ - cd $(srcdir) && $(AUTOMAKE) --foreign \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - echo ' $(SHELL) ./config.status'; \ - $(SHELL) ./config.status;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ - else :; fi - -stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ - -distclean-hdr: - -rm -f config.h stamp-h1 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(am__remove_distdir) - mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) -dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - -dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) - -dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) - -dist-zip: distdir - -rm -f $(distdir).zip - zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) - -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst - chmod a-w $(distdir) - dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ - && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ - $(DISTCHECK_CONFIGURE_FLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ - distuninstallcheck \ - && chmod -R a-w "$$dc_install_base" \ - && ({ \ - (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ - && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ - distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ - } || { rm -rf "$$dc_destdir"; exit 1; }) \ - && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist \ - && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck - $(am__remove_distdir) - @(echo "$(distdir) archives ready for distribution: "; \ - list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' -distuninstallcheck: - @cd $(distuninstallcheck_dir) \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ - || { echo "ERROR: files left after uninstall:" ; \ - if test -n "$(DESTDIR)"; then \ - echo " (check DESTDIR support)"; \ - fi ; \ - $(distuninstallcheck_listfiles) ; \ - exit 1; } >&2 -distcleancheck: distclean - @if test '$(srcdir)' = . ; then \ - echo "ERROR: distcleancheck can only run from a VPATH build" ; \ - exit 1 ; \ - fi - @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -check-am: all-am -check: check-recursive -all-am: Makefile config.h -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr \ - distclean-libtool distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf $(top_srcdir)/autom4te.cache - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Deleted: configure =================================================================== --- configure 2006-07-30 19:14:10 UTC (rev 127) +++ configure 2006-07-30 19:14:48 UTC (rev 128) @@ -1,21795 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for opengate 0.0.1. -# -# Report bugs to <eg...@us...>. -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell aut...@gn... about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" -else - as_executable_p=: -fi -rm -f conf$$.file - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <<EOF -$* -EOF - exit 0 -fi - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test -z "$ECHO"; then -if test "X${echo_test_string+set}" != Xset; then -# find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string=`eval $cmd`) 2>/dev/null && - echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -tagnames=${tagnames+${tagnames},}CXX - -tagnames=${tagnames+${tagnames},}F77 - -exec 7<&0 </dev/null 6>&1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME='opengate' -PACKAGE_TARNAME='opengate' -PACKAGE_VERSION='0.0.1' -PACKAGE_STRING='opengate 0.0.1' -PACKAGE_BUGREPORT='eg...@us...' - -# Factoring default headers for most tests. -ac_includes_default="\ -#include <stdio.h> -#if HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#if HAVE_SYS_STAT_H -# include <sys/stat.h> -#endif -#if STDC_HEADERS -# include <stdlib.h> -# include <stddef.h> -#else -# if HAVE_STDLIB_H -# include <stdlib.h> -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include <memory.h> -# endif -# include <string.h> -#endif -#if HAVE_STRINGS_H -# include <strings.h> -#endif -#if HAVE_INTTYPES_H -# include <inttypes.h> -#endif -#if HAVE_STDINT_H -# include <stdint.h> -#endif -#if HAVE_UNISTD_H -# include <unistd.h> -#endif" - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar -CXX -CXXFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CXX -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -CC -CFLAGS -ac_ct_CC -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -GREP -EGREP -LN_S -ECHO -AR -RANLIB -CPP -CXXCPP -F77 -FFLAGS -ac_ct_F77 -LIBTOOL -PKG_CONFIG -OGRE_CFLAGS -OGRE_LIBS -AM_CXXFLAGS -AM_LDFLAGS -CEGUI_CFLAGS -CEGUI_LIBS -CEGUI_OGRE_CFLAGS -CEGUI_OGRE_LIBS -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CXX -CXXFLAGS -LDFLAGS -CPPFLAGS -CCC -CC -CFLAGS -CPP -CXXCPP -F77 -FFLAGS -PKG_CONFIG -OGRE_CFLAGS -OGRE_LIBS -CEGUI_CFLAGS -CEGUI_LIBS -CEGUI_OGRE_CFLAGS -CEGUI_OGRE_LIBS' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures opengate 0.0.1 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR ... [truncated message content] |
|
From: <eg...@us...> - 2006-07-30 19:14:32
|
Revision: 127 Author: egore Date: 2006-07-30 12:14:10 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=127&view=rev Log Message: ----------- Completely rework input system Add working CEGUI menu Note: You will not see anything in the game! Modified Paths: -------------- src/client/ui/Makefile.am src/client/ui/application.cpp src/client/ui/application.h src/client/ui/framelistener.cpp src/client/ui/framelistener.h src/ogre.cfg src/opengate_client.cpp src/resources.cfg Added Paths: ----------- src/client/ui/ActionConfig.cpp src/client/ui/ActionConfig.h src/client/ui/ActionMap.cpp src/client/ui/ActionMap.h Removed Paths: ------------- src/client/ui/avatar.cpp src/client/ui/avatar.h src/client/ui/camera.cpp src/client/ui/camera.h Added: src/client/ui/ActionConfig.cpp =================================================================== --- src/client/ui/ActionConfig.cpp (rev 0) +++ src/client/ui/ActionConfig.cpp 2006-07-30 19:14:10 UTC (rev 127) @@ -0,0 +1,770 @@ +/* +The zlib/libpng License + +Copyright (c) 2005 Phillip Castaneda (pjcast -- www.wreckedgames.com) + +This software is provided 'as-is', without any express or implied warranty. In no event will +the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial +applications, and to alter it and redistribute it freely, subject to the following +restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim that + you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ +#include <CEGUI/CEGUIImageset.h> +#include <CEGUI/CEGUISystem.h> +#include <CEGUI/CEGUILogger.h> +#include <CEGUI/CEGUISchemeManager.h> +#include <CEGUI/CEGUIWindowManager.h> +#include <CEGUI/CEGUIWindow.h> +#include <CEGUI/elements/CEGUIMultiColumnList.h> +#include <CEGUI/elements/CEGUIListboxTextItem.h> + +#include "OgreSceneManager.h" +#include "OgreCamera.h" +#include "OgreRoot.h" + +#include "ActionConfig.h" +#include "OISMouse.h" +#include "OISKeyboard.h" +#include "OISJoyStick.h" + +//Some Simple Configurable Action IDs +const int A_JUMP = 1; //All +const int A_FIRE = 2; //All +const int A_MOVE = 3; //Only used for mouse and joy Move +const int A_MOVE_FORWARD = 4; //Keyboard only setting +const int A_MOVE_BACKWARD = 5; //Keyboard only setting +const int A_MOVE_LEFT = 6; //Keyboard only setting +const int A_MOVE_RIGHT = 7; //Keyboard only setting +const int A_LOOK = 8; //Only used for mouse and joy move +const int A_LOOK_UP = 9; //Keyboard only setting +const int A_LOOK_DOWN = 10; //Keyboard only setting +const int A_LOOK_LEFT = 11; //Keyboard only setting +const int A_LOOK_RIGHT = 12; //Keyboard only setting +const int A_CENTER_VIEW = 13; //All + +const int A_TEST_DONE = 14; //Action that happens when Escape Pushed + + +//--------------------------------------------------------------------------------// +ActionConfig::ActionConfig( OIS::Mouse *mouse, OIS::Keyboard *key, OIS::JoyStick *joy, + Ogre::SceneManager* scnMgr ) : + mMouse(mouse), mKey(key), mJoy(joy), mSceneMgr(scnMgr) +{ + //Create an ActionMap instance + actionMap = new OIS::ActionMap(mKey, mMouse, mJoy); + + using namespace CEGUI; + WindowManager& wmgr = WindowManager::getSingleton(); + + oldKeyListener = mKey->getEventCallback(); + oldMouseListener = mMouse->getEventCallback(); + + //One time MultiList Setup + MultiColumnList *listBox; + + //Keyboard list + listBox = (MultiColumnList*)wmgr.getWindow((utf8*)"Keyboard"); + listBox->setSelectionMode(MultiColumnList::RowSingle); + listBox->addColumn("Action", 0, 0.5f); + listBox->addColumn("Trigger", 1, 0.5f); + listBox->subscribeEvent(MultiColumnList::EventSelectionChanged, + Event::Subscriber(&ActionConfig::handleKeyboardSetup, this)); + //Mouse list + listBox = (MultiColumnList*)wmgr.getWindow((utf8*)"Mouse"); + listBox->setSelectionMode(MultiColumnList::RowSingle); + listBox->addColumn("Action", 0, 0.5f); + listBox->addColumn("Trigger", 1, 0.5f); + listBox->subscribeEvent(MultiColumnList::EventSelectionChanged, + Event::Subscriber(&ActionConfig::handleMouseSetup, this)); + //Joystick list + listBox = (MultiColumnList*)wmgr.getWindow((utf8*)"Joystick"); + listBox->setSelectionMode(MultiColumnList::RowSingle); + listBox->addColumn("Action", 0, 0.5f); + listBox->addColumn("Trigger", 1, 0.5f); + listBox->subscribeEvent(MultiColumnList::EventSelectionChanged, + Event::Subscriber(&ActionConfig::handleJoystickSetup, this)); + + //Create some functors for registering with ActionMap + fireBind = new OIS::ActionBind(&ActionConfig::handleFire,this); + jumpBind = new OIS::ActionBind(&ActionConfig::handleJump,this); + moveBind = new OIS::ActionBind(&ActionConfig::handleMove,this); + lookBind = new OIS::ActionBind(&ActionConfig::handleLook,this); + doneBind = new OIS::ActionBind(&ActionConfig::handleDone,this); + + //Reset everything + createScene(); + reset(); +} + +//--------------------------------------------------------------------------------// +ActionConfig::~ActionConfig() +{ + delete fireBind; + delete jumpBind; + delete moveBind; + delete lookBind; + delete doneBind; + + delete actionMap; +} + +//--------------------------------------------------------------------------------// +void ActionConfig::createScene() +{ + //Situate Camera, place guy, etc etc +} + +//--------------------------------------------------------------------------------// +void ActionConfig::reset() +{ + using namespace OIS; + + keyEvents.clear(); + mouseEvents.clear(); + joyEvents.clear(); + + currentAction = ""; + + //This should be saved/loaded from a file.. but, we will just set it up in code + + //Jumping + keyEvents.push_back(DemoActionEventInfo(A_JUMP,KC_SPACE,OIS_Button,jumpBind,"Jump")); + mouseEvents.push_back(DemoActionEventInfo(A_JUMP,MB_Right,OIS_Button,jumpBind,"Jump")); + joyEvents.push_back(DemoActionEventInfo(A_JUMP,1,OIS_Button,jumpBind,"Jump")); + + //Firing + keyEvents.push_back(DemoActionEventInfo(A_FIRE,KC_LCONTROL,OIS_Button,fireBind,"Fire")); + mouseEvents.push_back(DemoActionEventInfo(A_FIRE,MB_Left,OIS_Button,fireBind,"Fire")); + joyEvents.push_back(DemoActionEventInfo(A_FIRE,0,OIS_Button,fireBind,"Fire")); + + //Center View + keyEvents.push_back(DemoActionEventInfo(A_CENTER_VIEW,KC_INSERT,OIS_Button,lookBind,"Center View")); + mouseEvents.push_back(DemoActionEventInfo(A_CENTER_VIEW,MB_Middle,OIS_Button,lookBind,"Center View")); + joyEvents.push_back(DemoActionEventInfo(A_CENTER_VIEW,2,OIS_Button,lookBind,"Center View")); + + //Move - joyStick & Mouse Only + mouseEvents.push_back(DemoActionEventInfo(A_MOVE,-1,OIS_Axis,moveBind,"Move")); + joyEvents.push_back(DemoActionEventInfo(A_MOVE,0,OIS_Axis,moveBind,"Move")); + + //Look - joyStick & Mouse Only + mouseEvents.push_back(DemoActionEventInfo(A_LOOK,0,OIS_Axis,lookBind,"Look")); + joyEvents.push_back(DemoActionEventInfo(A_LOOK,1,OIS_Axis,lookBind,"Look")); + + //Keyboard only movement actions + keyEvents.push_back(DemoActionEventInfo(A_MOVE_FORWARD,KC_W,OIS_Button,moveBind,"Move Forward")); + keyEvents.push_back(DemoActionEventInfo(A_MOVE_BACKWARD,KC_S,OIS_Button,moveBind,"Move Backward")); + keyEvents.push_back(DemoActionEventInfo(A_MOVE_LEFT,KC_A,OIS_Button,moveBind,"Move Left")); + keyEvents.push_back(DemoActionEventInfo(A_MOVE_RIGHT,KC_D,OIS_Button,moveBind,"Move Right")); + + //Keyboard only looking actions + keyEvents.push_back(DemoActionEventInfo(A_LOOK_UP,KC_UP,OIS_Button,lookBind,"Look Up")); + keyEvents.push_back(DemoActionEventInfo(A_LOOK_DOWN,KC_DOWN,OIS_Button,lookBind,"Look Down")); + keyEvents.push_back(DemoActionEventInfo(A_LOOK_LEFT,KC_LEFT,OIS_Button,lookBind,"Look Left")); + keyEvents.push_back(DemoActionEventInfo(A_LOOK_RIGHT,KC_RIGHT,OIS_Button,lookBind,"Look Right")); + + //Setup CEGUI stuff + fillList(); +} + +//--------------------------------------------------------------------------------// +void ActionConfig::fillList() +{ + using namespace CEGUI; + WindowManager& wmgr = WindowManager::getSingleton(); + + //--------- KEYBOARD ACTION LIST --------------// + MultiColumnList *listBox = (MultiColumnList*)wmgr.getWindow((utf8*)"Keyboard"); + listBox->resetList(); + + std::vector<DemoActionEventInfo>::iterator i = keyEvents.begin(), e = keyEvents.end(); + ListboxTextItem* item = 0; + + for( ; i != e; ++i ) + { + int row = listBox->addRow(); + //Action ID Name + item = new ListboxTextItem( i->name.c_str(), 0); + item->setTextColours(ColourRect(colour(.5, 0, .3))); + listBox->setItem(item, MCLGridRef( row, 0 )); + + //Mapped Column + if( i->trigger != -1 ) + i->li = new ListboxTextItem(mKey->getAsString((OIS::KeyCode)i->trigger), 0); + else + i->li = new ListboxTextItem(" ", 0); + i->li->setTextColours(ColourRect(colour(.5, 0, .3))); + listBox->setItem(i->li, MCLGridRef( row, 1 )); + } + + //--------- MOUSE ACTION LIST --------------// + listBox = (MultiColumnList*)wmgr.getWindow((utf8*)"Mouse"); + listBox->resetList(); + + i = mouseEvents.begin(); e = mouseEvents.end(); + for( ; i != e; ++i ) + { + int row = listBox->addRow(); + //Action ID Name + item = new ListboxTextItem( i->name.c_str(), 0); + item->setTextColours(ColourRect(colour(.5, 0, .3))); + listBox->setItem(item, MCLGridRef( row, 0 )); + + //Command Column + i->li = new ListboxTextItem(getAxisButtonName(i->cType, i->trigger), 0); + i->li->setTextColours(ColourRect(colour(.5, 0, .3))); + listBox->setItem(i->li, MCLGridRef( row, 1 )); + } + + //--------- JOYSTICK ACTION LIST --------------// + listBox = (MultiColumnList *)wmgr.getWindow((utf8*)"Joystick"); + listBox->resetList(); //Clear any old values + + i = joyEvents.begin(); e = joyEvents.end(); + for( ; i != e; ++i ) + { + int row = listBox->addRow(); + //Action ID Name + item = new ListboxTextItem( i->name.c_str(), 0); + item->setTextColours(ColourRect(colour(.5, 0, .3))); + listBox->setItem(item, MCLGridRef( row, 0 )); + + //Command Column + i->li = new ListboxTextItem(getAxisButtonName(i->cType, i->trigger), 0); + i->li->setTextColours(ColourRect(colour(.5, 0, .3))); + listBox->setItem(i->li, MCLGridRef( row, 1 )); + } + + //Hide for controls that do not exist + if( !mKey ) wmgr.getWindow((utf8*)"Keyboard")->setVisible(false); + if( !mMouse ) wmgr.getWindow((utf8*)"Mouse")->setVisible(false); + if( !mJoy ) wmgr.getWindow((utf8*)"Joystick")->setVisible(false); +} + +//----------------------------------------------------------------// +bool ActionConfig::handleKeyboardSetup(const CEGUI::EventArgs& e) +{ + + using namespace CEGUI; + + MultiColumnList *listBox = (MultiColumnList*)WindowManager::getSingleton().getWindow((utf8*)"Keyboard"); + ListboxItem* item = listBox->getFirstSelectedItem(); + if( !item ) return false; + + //Disable main window.. Start handling Key Events.. Display window prompt + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(false); + mKey->setEventCallback(this); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(true); + + std::ostringstream ss; + ss << "Push key for for \""; + //CEGUI::String op << is unresolved ??? oh well, this works for now + ss << "Push key for for \"" << item->getText().c_str() << "\" Action..." + << "\n\n Push ESCAPE to cancel"; + + WindowManager::getSingleton().getWindow((utf8*)"ActionPromptLable")->setText(ss.str()); + + currentAction = item->getText().c_str(); + + //Then, in our KeyListener.. the next keyevent we have, we assign that as the + //input. Close the window prompt. And update the MultiColumnList + return true; +} + +//----------------------------------------------------------------// +bool ActionConfig::handleMouseSetup(const CEGUI::EventArgs& e) +{ + using namespace CEGUI; + + MultiColumnList *listBox = (MultiColumnList*)WindowManager::getSingleton().getWindow((utf8*)"Mouse"); + ListboxItem* item = listBox->getFirstSelectedItem(); + if( !item ) return false; + + //Disable main window.. Start handling mouse & key Events.. Display window prompt + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(false); + mMouse->setEventCallback(this); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(true); + + std::ostringstream ss; + ss << "Click or move mouse for \"" << item->getText().c_str() << "\" Action..."; + WindowManager::getSingleton().getWindow((utf8*)"ActionPromptLable")->setText(ss.str()); + + currentAction = item->getText().c_str(); + + return true; +} + +//----------------------------------------------------------------// +bool ActionConfig::handleJoystickSetup(const CEGUI::EventArgs& e) +{ + using namespace CEGUI; + + MultiColumnList *listBox = (MultiColumnList*)WindowManager::getSingleton().getWindow((utf8*)"Joystick"); + ListboxItem* item = listBox->getFirstSelectedItem(); + if( !item ) return false; + + //Disable main window.. Start handling mouse & key Events.. Display window prompt + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(false); + mJoy->setEventCallback(this); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(true); + + std::ostringstream ss; + ss << "Click or move joystick for \"" << item->getText().c_str() << "\" Action..."; + WindowManager::getSingleton().getWindow((utf8*)"ActionPromptLable")->setText(ss.str()); + + currentAction = item->getText().c_str(); + + return true; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::keyPressed(const OIS::KeyEvent& arg) +{ + using namespace CEGUI; + // check for ESCAPE - cancel + if( arg.key != OIS::KC_ESCAPE ) + { + //Store Key press and update listbox + DemoActionEventInfo *act = getAction(keyEvents, currentAction); + if(act) + { + act->trigger = arg.key; + act->li->setText(mKey->getAsString((OIS::KeyCode)arg.key)); + ensureNoDuplicate(keyEvents, act); + } + } + + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(true); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(false); + + //Set back old listener + mKey->setEventCallback(oldKeyListener); + + //We return false, because we care not for any more events + return false; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::mouseMoved(const OIS::MouseEvent& arg) +{ + using namespace CEGUI; + //Store Mouse Axis and update listbox + DemoActionEventInfo *act = getAction( mouseEvents, currentAction ); + if( act ) + { + act->cType = OIS::OIS_Axis; + if( arg.state.relZ != 0 ) + act->trigger = 1; //This is the mouse wheel + else + act->trigger = 0; //Normal XY mouse axis + + act->li->setText(getAxisButtonName(act->cType, act->trigger)); + ensureNoDuplicate(mouseEvents, act); + } + + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(true); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(false); + + //Set back old listener + mMouse->setEventCallback(oldMouseListener); + + //We return false, because we care not for any more events + return false; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::mousePressed(const OIS::MouseEvent& arg, OIS::MouseButtonID id) +{ + using namespace CEGUI; + //Store Mouse Button and update listbox + DemoActionEventInfo *act = getAction( mouseEvents, currentAction ); + if( act ) + { + act->trigger = id; + act->cType = OIS::OIS_Button; + act->li->setText(getAxisButtonName(act->cType, act->trigger)); + ensureNoDuplicate(mouseEvents, act); + } + + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(true); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(false); + + //Set back old listener + mMouse->setEventCallback(oldMouseListener); + + //We return false, because we care not for any more events + return false; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::buttonPressed(const OIS::JoyStickEvent &arg, int button) +{ + using namespace CEGUI; + //Store Mouse Button and update listbox + DemoActionEventInfo *act = getAction( joyEvents, currentAction ); + if( act ) + { + act->trigger = button; + act->cType = OIS::OIS_Button; + act->li->setText(getAxisButtonName(act->cType, act->trigger)); + ensureNoDuplicate(joyEvents, act); + } + + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(true); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(false); + + //We return false, because we care not for any more events + return false; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::axisMoved(const OIS::JoyStickEvent &arg, int axis) +{ + using namespace CEGUI; + + DemoActionEventInfo *act = getAction( joyEvents, currentAction ); + if( act ) + { + act->cType = OIS::OIS_Axis; + act->trigger = axis; + act->li->setText(getAxisButtonName(act->cType, act->trigger)); + ensureNoDuplicate(joyEvents, act); + } + + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(true); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(false); + + //We return false, because we care not for any more events + return false; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::povMoved(const OIS::JoyStickEvent &arg, int pov) +{ + using namespace CEGUI; + //Store Mouse Button and update listbox + DemoActionEventInfo *act = getAction( joyEvents, currentAction ); + if( act ) + { + act->cType = OIS::OIS_POV; + act->trigger = pov; + act->li->setText(getAxisButtonName(act->cType, act->trigger)); + ensureNoDuplicate(joyEvents, act); + } + + WindowManager::getSingleton().getWindow((utf8*)"Main")->setEnabled(true); + WindowManager::getSingleton().getWindow((utf8*)"ActionPrompt")->setVisible(false); + + //We return false, because we care not for any more events + return false; +} + +//--------------------------------------------------------------------------------// +DemoActionEventInfo* ActionConfig::getAction( std::vector<DemoActionEventInfo>& list, std::string name ) +{ + std::vector<DemoActionEventInfo>::iterator i = list.begin(), e = list.end(); + for(; i != e; ++i) + if( i->name == name ) return &(*i); + return 0; +} + +//--------------------------------------------------------------------------------// +void ActionConfig::ensureNoDuplicate( std::vector<DemoActionEventInfo>& list, DemoActionEventInfo* act ) +{ + std::vector<DemoActionEventInfo>::iterator i = list.begin(), e = list.end(); + for(; i != e; ++i) + { + if( i->trigger == act->trigger && + i->cType == act->cType && + i->name != act->name ) + { + //Opps.. one dup existed.. clear it + i->trigger = -1; + i->li->setText(""); + } + } +} + +//--------------------------------------------------------------------------------// +std::string ActionConfig::getAxisButtonName( OIS::ComponentType type, int trigger ) +{ + std::ostringstream ss; + + if( trigger != -1 ) + { + if( type == OIS::OIS_Button ) + ss << "Button "; + else if( type == OIS::OIS_Axis ) + ss << "Axis "; + else if( type == OIS::OIS_POV ) + ss << "POV "; + ss << trigger; + return ss.str(); + } + + return " "; +} + +//--------------------------------------------------------------------------------// +void ActionConfig::startTest() +{ + actionMap->reset(); + + //Configure the action map for each device + std::vector<DemoActionEventInfo>::iterator i = keyEvents.begin(), e = keyEvents.end(); + for( ; i != e; ++i ) + actionMap->addKeyboardAction( i->id, i->trigger, i->bound ); + + i = mouseEvents.begin(); e = mouseEvents.end(); + for( ; i != e; ++i ) + actionMap->addMouseAction( i->id, i->trigger, i->cType, i->bound ); + + i = joyEvents.begin(); e = joyEvents.end(); + for( ; i != e; ++i ) + actionMap->addJoyStickAction( i->id, i->trigger, i->cType, i->bound); + + //Setup a Key Event for exiting test - Escape Key + actionMap->addKeyboardAction( A_TEST_DONE, OIS::KC_ESCAPE, doneBind ); + + //Enable it.. this disables any registered buffered callbacks + actionMap->setEnabled(true); + + //Hide CEGUI Window + CEGUI::WindowManager::getSingleton().getWindow((CEGUI::utf8*)"Main")->setVisible(false); + CEGUI::System::getSingleton().setDefaultMouseCursor(0); + + Ogre::Root::getSingleton().addFrameListener(this); + + mMoveScale = 1.0f; + mRotXScale = 0.0f; + mRotYScale = 0.0f; +} + +//--------------------------------------------------------------------------------// +bool ActionConfig::frameStarted(const Ogre::FrameEvent& evt) +{ + Ogre::Camera *cam = mSceneMgr->getCamera("PlayerCam"); + + // Move about 100 units per second, + mMoveScale = 100 * evt.timeSinceLastFrame; + + cam->yaw(Ogre::Degree(mRotXScale)); + cam->pitch(Ogre::Degree(mRotYScale)); + cam->moveRelative(mTranslateVector); + return true; +} + +//--------------------------------------------------------------------------------// +void ActionConfig::handleJump( const OIS::ActionMapArg& arg ) +{ + //Don't really care if axis or not. we only want to do this on keydown & not on keyup + //if( arg.flags & OIS::OIS::ActionMapArg::AM_Button ) + //{ + // if( arg.flags & OIS::OIS::ActionMapArg::AM_ButtonDown ) + // do fire + // return; + //} + + //do Fire +} + +//--------------------------------------------------------------------------------// +void ActionConfig::handleFire( const OIS::ActionMapArg& arg ) +{ + //Don't really care if axis or not.. but, we only want to do this once + //if( arg.flags & OIS::OIS::ActionMapArg::AM_Button ) + //{ + // if( arg.flags & OIS::ActionMapArg::AM_ButtonDown ) + // do fire + // return; + //} + + //do Fire +} + +//--------------------------------------------------------------------------------// +void ActionConfig::handleMove( const OIS::ActionMapArg& arg ) +{ + switch( arg.ActionID ) + { + //Axis Event + case A_MOVE: + { + //User set button as move event - just ignore + if( arg.component->cType == OIS::OIS_Button ) + { + break; + } + else if( arg.component->cType == OIS::OIS_Axis ) + { + const OIS::Axis* axis = static_cast<const OIS::Axis*>(arg.component); + if( axis->absOnly == false ) + { + //Not an absolute only axis + mSceneMgr->getCamera("PlayerCam")->moveRelative( + Ogre::Vector3( axis->relX * 0.13f, //Move left/right + axis->relZ * 0.1f, //Up/Down + axis->relY * 0.13f ) ); //F/B + } + else + { + //Is an absolute only axis + //Up/Down + mTranslateVector.y = mMoveScale * axis->abZ/(float)OIS::JoyStick::MAX_AXIS; + //Move left/right + mTranslateVector.x = mMoveScale * axis->abX/(float)OIS::JoyStick::MAX_AXIS; + //Move forward/back + mTranslateVector.z = -mMoveScale * axis->abY/(float)OIS::JoyStick::MAX_AXIS; + } + } + else if( arg.component->cType == OIS::OIS_POV ) + { + using namespace OIS; + const Pov* pov = static_cast<const Pov*>(arg.component); + + if( pov->direction & Pov::North ) //Going up + mTranslateVector.z = -mMoveScale; + else if( pov->direction & Pov::South ) //Going down + mTranslateVector.z = mMoveScale; + + if( pov->direction & Pov::East ) //Going right + mTranslateVector.x = mMoveScale; + else if( pov->direction & Pov::West ) //Going left + mTranslateVector.x = -mMoveScale; + + if( pov->direction == Pov::Centered ) //stopped/centered out + mTranslateVector.x = mTranslateVector.z = 0; + } + break; + } + //Moves forward - Key event only + case A_MOVE_FORWARD: + if( arg.component->cType == OIS::OIS_Button ) + { + if( static_cast<const OIS::Button*>(arg.component)->pushed ) + mTranslateVector.z = -mMoveScale; + else + mTranslateVector.z = 0; + } + break; + //Moves Backwards - Key event only + case A_MOVE_BACKWARD: + if( arg.component->cType == OIS::OIS_Button ) + { + if( static_cast<const OIS::Button*>(arg.component)->pushed ) + mTranslateVector.z = mMoveScale; + else + mTranslateVector.z = 0; + } + break; + //Strafe Left - Key event only + case A_MOVE_LEFT: + if( arg.component->cType == OIS::OIS_Button ) + { + if( static_cast<const OIS::Button*>(arg.component)->pushed ) + mTranslateVector.x = -mMoveScale; + else + mTranslateVector.x = 0; + } + break; + //Strafe Right - Key event only + case A_MOVE_RIGHT: + if( arg.component->cType == OIS::OIS_Button ) + { + if( static_cast<const OIS::Button*>(arg.component)->pushed ) + mTranslateVector.x = mMoveScale; + else + mTranslateVector.x = 0; + } + break; + default: + break; + } +} + +//--------------------------------------------------------------------------------// +void ActionConfig::handleLook( const OIS::ActionMapArg& arg ) +{ + //Look - handles the camera looking.. Could just as well control + //the players view instead + switch( arg.ActionID ) + { + //Axis Event - hopefully + case A_LOOK: + { + //User set button as look axis - just ignore + if( arg.component->cType == OIS::OIS_Button ) + { + break; + } + else if( arg.component->cType == OIS::OIS_Axis ) + { + const OIS::Axis* axis = static_cast<const OIS::Axis*>(arg.component); + if( axis->absOnly == false ) + { + //Move using relative Axis + Ogre::Camera *cam = mSceneMgr->getCamera("PlayerCam"); + + cam->yaw(Ogre::Radian(Ogre::Degree(-axis->relX * 0.13f))); + cam->pitch(Ogre::Radian(Ogre::Degree(-axis->relY * 0.13f))); + } + else + { + //absolute only axis + mRotXScale = -axis->abX/OIS::JoyStick::MAX_AXIS * 0.05; + mRotYScale = -axis->abY/OIS::JoyStick::MAX_AXIS * 0.01; + } + } + break; + } + //Tilt View Up - Key Event only + case A_LOOK_UP: + break; + //Tilt view Down - Key Event only + case A_LOOK_DOWN: + break; + //Turn Left - Key Event only + case A_LOOK_LEFT: + break; + //Turn Right - Key Event only + case A_LOOK_RIGHT: + break; + //Centers/levels out - Don't care if button or axes + case A_CENTER_VIEW: + break; + default: break; + } +} + +//--------------------------------------------------------------------------------// +void ActionConfig::handleDone( const OIS::ActionMapArg& arg ) +{ + //ESCAPE Key event - only do once, though, they keyup should never reach us + //anyway + if( static_cast<const OIS::Button*>(arg.component)->pushed ) + { + //Stop the test, and reset listeners + actionMap->setEnabled(false); + + //Restore the old listeners.. which were replaced with the ActionMap + mKey->setEventCallback(oldKeyListener); + mMouse->setEventCallback(oldMouseListener); + + //Show CEGUI Window + CEGUI::WindowManager::getSingleton().getWindow((CEGUI::utf8*)"Main")->setVisible(true); + CEGUI::System::getSingleton().setDefaultMouseCursor((CEGUI::utf8*)"WindowsLook", + (CEGUI::utf8*)"MouseArrow"); + + Ogre::Root::getSingleton().removeFrameListener(this); + } +} Property changes on: src/client/ui/ActionConfig.cpp ___________________________________________________________________ Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native Added: src/client/ui/ActionConfig.h =================================================================== --- src/client/ui/ActionConfig.h (rev 0) +++ src/client/ui/ActionConfig.h 2006-07-30 19:14:10 UTC (rev 127) @@ -0,0 +1,162 @@ +/* +The zlib/libpng License + +Copyright (c) 2005 Phillip Castaneda (pjcast -- www.wreckedgames.com) + +This software is provided 'as-is', without any express or implied warranty. In no event will +the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial +applications, and to alter it and redistribute it freely, subject to the following +restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim that + you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ +#ifndef ActionConfig_Header +#define ActionConfig_Header +#include <CEGUI/CEGUIForwardRefs.h> + +#include "OISPrereqs.h" +#include "OISEvents.h" + +#include "OgrePrerequisites.h" +#include "OgreFrameListener.h" +#include "OgreVector3.h" + +#include "ActionMap.h" + +//Simple utility structure that extends the one from ActionMap.. As we want to store +//some additional info for configuring things +struct DemoActionEventInfo : public OIS::ActionEventInfo +{ + //! Constructor + DemoActionEventInfo(int iID,int iTrigger,OIS::ComponentType type,OIS::ActionBind* pBind,const std::string& sName ) : + ActionEventInfo(iID,iTrigger,type,pBind), name(sName), + li(0) {}; + + //! Friendly text name of the Action + std::string name; + //! The listboxitem that the Mapped Action will be displayed in + CEGUI::ListboxTextItem* li; +}; + +/** + This class is kinda a one stop class right now. This class handles setup, config, + and testing of ActionMap. Ideally, the actionmap should be loaded from a file. But, + for clarity, and less parsing code, it is setup via code. And also, the ActionMap class + could be configured from here, but should be passed back to wherever you want to + implement it at. + + This class inheirits from The three listeners for setting up the ActionMap + action triggers. + + And the framelistener is used for actionmap testing.. for movements +*/ +class ActionConfig : public OIS::KeyListener, public OIS::MouseListener, + public OIS::JoyStickListener, public Ogre::FrameListener +{ +public: + ActionConfig( OIS::Mouse *mouse, OIS::Keyboard *key, OIS::JoyStick *joy, + Ogre::SceneManager* scnMgr ); + ~ActionConfig(); + + //Resets everything back to default - lists, actions, scene + void reset(); + + //Go into test mode + void startTest(); + + //cegui event handlers + bool handleKeyboardSetup(const CEGUI::EventArgs& e); + bool handleMouseSetup(const CEGUI::EventArgs& e); + bool handleJoystickSetup(const CEGUI::EventArgs& e); + + //Example Methods used for recieveing Action Events + void handleJump( const OIS::ActionMapArg& ); + void handleFire( const OIS::ActionMapArg& ); + void handleMove( const OIS::ActionMapArg& ); + void handleLook( const OIS::ActionMapArg& ); //Handle Look and Center Actions + void handleDone( const OIS::ActionMapArg& ); + + //We only listen when we are configuring an action, and restore old listener + bool keyPressed(const OIS::KeyEvent& arg); + bool mouseMoved(const OIS::MouseEvent& arg); + bool mousePressed(const OIS::MouseEvent& arg, OIS::MouseButtonID); + bool buttonPressed(const OIS::JoyStickEvent &arg, int button); + bool axisMoved(const OIS::JoyStickEvent &arg, int axis ); + bool povMoved( const OIS::JoyStickEvent &arg, int pov ); + + //We ignore these + bool keyReleased(const OIS::KeyEvent&) {return false;} + bool mouseReleased(const OIS::MouseEvent&, OIS::MouseButtonID) {return false;} + bool buttonReleased(const OIS::JoyStickEvent &, int) {return false;} + + //Process frame events + bool frameStarted(const Ogre::FrameEvent& evt); + +protected: + //Internal helper methods + void fillList(); + void createScene(); + + //Returns a pointer to an actionevent based on the sent name + DemoActionEventInfo* getAction( std::vector<DemoActionEventInfo>& list, + std::string name ); + + //If an input event exists than remove that one + void ensureNoDuplicate( std::vector<DemoActionEventInfo>& list, + DemoActionEventInfo* act ); + + //Convert params into a string representing a button/axes number or " " + std::string getAxisButtonName( OIS::ComponentType type, int trigger ); + + //Keep a hold of some devices + OIS::Mouse *mMouse; + OIS::Keyboard *mKey; + OIS::JoyStick *mJoy; + + //Keep old listeners stored when we start messing with the current one + OIS::KeyListener* oldKeyListener; + OIS::MouseListener* oldMouseListener; + + //We keep seperate lists for each tyoe of device we want to support.. + //We then assign a default button, or -1 if it will be blank - to allow + //for assignment later, for each action + std::vector<DemoActionEventInfo> keyEvents; + std::vector<DemoActionEventInfo> mouseEvents; + std::vector<DemoActionEventInfo> joyEvents; + + //Use this to ensure that the same joystick type that was used previously, + //is still the one connected here + std::string joyName; + + //Represents the row (Action) that the user clicked.. and is configuring + std::string currentAction; + + //Our ActionMap instance + OIS::ActionMap* actionMap; + + //Functors for registering with ActionMap + OIS::ActionBind* fireBind; + OIS::ActionBind* jumpBind; + OIS::ActionBind* moveBind; + OIS::ActionBind* lookBind; + OIS::ActionBind* doneBind; + + //Ogre Scene Stuff - For testing the controls + Ogre::SceneManager* mSceneMgr; + Ogre::Vector3 mTranslateVector; + float mMoveScale; + float mRotXScale; + float mRotYScale; +}; + +#endif Property changes on: src/client/ui/ActionConfig.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Added: src/client/ui/ActionMap.cpp =================================================================== --- src/client/ui/ActionMap.cpp (rev 0) +++ src/client/ui/ActionMap.cpp 2006-07-30 19:14:10 UTC (rev 127) @@ -0,0 +1,200 @@ +#include "ActionMap.h" +#include "OISMouse.h" +#include "OISKeyboard.h" +#include "OISJoyStick.h" + +using namespace OIS; + +//---------------------------------------------------------------------------// +ActionMap::~ActionMap() +{ + setEnabled(false); +} + +//---------------------------------------------------------------------------// +void ActionMap::setCallbacks( KeyListener* kl, MouseListener* ml ) +{ + keyCallback = kl; + mouseCallback = ml; +} + +//---------------------------------------------------------------------------// +void ActionMap::setEnabled( bool enabled ) +{ + if( enabled ) + { + if( mKey ) mKey->setEventCallback( this ); + if( mMouse ) mMouse->setEventCallback( this ); + if( mJoy ) mJoy->setEventCallback( this ); + } + else + { + if( mKey ) mKey->setEventCallback(0); + if( mMouse ) mMouse->setEventCallback(0); + if( mJoy ) mJoy->setEventCallback(0); + } +} + +//---------------------------------------------------------------------------// +void ActionMap::reset() +{ + mouseButtonEvents.clear(); + mouseXY.setProperties(-1, -1, OIS_Button, 0); + mouseZ.setProperties(-1, -1, OIS_Button, 0); + + joyButtonEvents.clear(); + joyAxisEvents.clear(); +} + +//---------------------------------------------------------------------------// +void ActionMap::addKeyboardAction(int iID, int iTrigger, ActionBind *pBind) +{ + keyEvents[iTrigger] = ActionEventInfo(iID, iTrigger, OIS_Button, pBind); +} + +//---------------------------------------------------------------------------// +void ActionMap::addMouseAction(int iID, int iTrigger, ComponentType type, ActionBind *pBind) +{ + if( type == OIS_Axis ) + { + if( iTrigger == 0 ) //XY Axis + mouseXY.setProperties( iID, iTrigger, type, pBind ); + else //Z Axis + mouseZ.setProperties( iID, iTrigger, type, pBind ); + } + else + mouseButtonEvents[iTrigger] = ActionEventInfo(iID, iTrigger, type, pBind); +} + +//---------------------------------------------------------------------------// +void ActionMap::addJoyStickAction(int iID, int iTrigger, ComponentType type, ActionBind *pBind) +{ + if( type == OIS_Button ) + joyButtonEvents[iTrigger] = ActionEventInfo(iID, iTrigger, type, pBind); + else if( type == OIS_Axis ) + joyAxisEvents[iTrigger] = ActionEventInfo(iID, iTrigger, type, pBind); + else if( type == OIS_POV ) + joyPovEvents[iTrigger] = ActionEventInfo(iID, iTrigger, type, pBind); +} + +//---------------------------------------------------------------------------// +bool ActionMap::keyPressed(const KeyEvent& arg) +{ + ActionList::iterator i = keyEvents.find(arg.key); + if( i != keyEvents.end() ) + i->second.bound->callMethod( ActionMapArg(i->second.id,&Button(true)) ); + + if( keyCallback ) + return keyCallback->keyPressed(arg); + else + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::keyReleased(const KeyEvent& arg) +{ + ActionList::iterator i = keyEvents.find(arg.key); + if( i != keyEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id,&Button(false))); + + if( keyCallback ) + return keyCallback->keyReleased(arg); + else + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::mouseMoved(const MouseEvent& arg) +{ + if( arg.state.relZ == 0 ) //XY Axis + { + if( mouseXY.trigger != -1 ) + { + Axis axis(arg.state); + axis.abZ = axis.relZ = 0; //Zero out Z axis, as that is seperate + mouseXY.bound->callMethod(ActionMapArg(mouseXY.id,&axis)); + } + } + else //Z Axis + { + if( mouseZ.trigger != -1 ) + { + Axis axis; + axis.abZ = arg.state.abZ; + axis.relZ = arg.state.relZ; + mouseZ.bound->callMethod(ActionMapArg(mouseZ.id,&axis)); + } + } + + if( mouseCallback ) + return mouseCallback->mouseMoved(arg); + else + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::mousePressed(const MouseEvent& arg, MouseButtonID button) +{ + ActionList::iterator i = mouseButtonEvents.find(button); + if( i != mouseButtonEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id,&Button(true))); + + if( mouseCallback ) + return mouseCallback->mousePressed(arg, button); + else + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::mouseReleased(const MouseEvent& arg, MouseButtonID button) +{ + ActionList::iterator i = mouseButtonEvents.find(button); + if( i != mouseButtonEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id,&Button(false))); + + if( mouseCallback ) + return mouseCallback->mouseReleased(arg, button); + else + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::axisMoved(const JoyStickEvent &arg, int axis) +{ + ActionList::iterator i = joyAxisEvents.find(axis); + if( i != joyAxisEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id, + &arg.state.mAxes[axis])); + + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::povMoved(const JoyStickEvent &arg, int pov) +{ + ActionList::iterator i = joyPovEvents.find(pov); + if( i != joyPovEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id,&Pov(arg.state.mPOV[pov]))); + + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::buttonPressed(const JoyStickEvent &arg, int button) +{ + ActionList::iterator i = joyButtonEvents.find(button); + if( i != joyButtonEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id,&Button(true))); + + return true; +} + +//---------------------------------------------------------------------------// +bool ActionMap::buttonReleased(const JoyStickEvent& arg, int button) +{ + ActionList::iterator i = joyButtonEvents.find(button); + if( i != joyButtonEvents.end() ) + i->second.bound->callMethod(ActionMapArg(i->second.id,&Button(false))); + + return true; +} Property changes on: src/client/ui/ActionMap.cpp ___________________________________________________________________ Name: svn:mime-type + text/x-c++src Name: svn:eol-style + native Added: src/client/ui/ActionMap.h =================================================================== --- src/client/ui/ActionMap.h (rev 0) +++ src/client/ui/ActionMap.h 2006-07-30 19:14:10 UTC (rev 127) @@ -0,0 +1,281 @@ +/* +The zlib/libpng License + +Copyright (c) 2005 Phillip Castaneda (pjcast -- www.wreckedgames.com) + +This software is provided 'as-is', without any express or implied warranty. In no event will +the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial +applications, and to alter it and redistribute it freely, subject to the following +restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim that + you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source distribution. +*/ +#ifndef _OIS_ACTIONMAPHEADERS_ +#define _OIS_ACTIONMAPHEADERS_ +#include "OISPrereqs.h" +#include "OISJoyStick.h" +#include "OISMouse.h" +#include "OISKeyboard.h" + +namespace OIS +{ + //*********** Base binding class ***************** + template <typename returnT, typename args> + class IBind + { + public: + virtual returnT operator()(args) const = 0; + virtual ~IBind() {} + }; + + //******** Implement of binding for member funtions + template <class T, typename returnT, typename Args> + class memberBind : public IBind<returnT, Args> + { + public: + typedef returnT(T::*F)(Args); + memberBind(F function, T* object) : + mFunction(function), mObject(object) {} + + virtual returnT operator()(Args args) const {return (mObject->*mFunction)(args);} + protected: + F mFunction; + T* mObject; + }; + + //***** Generic Binder (WIP) ************** + template <typename returnT, typename Args> + class Binder + { + Binder() : mObject(0) {} + public: + ~Binder() { delete mObject; } + + //Member Binding + template <class T> + Binder(returnT (T::*function)(Args), T* object) { + mObject = new memberBind<T, returnT, Args>(function, object); + } + //Todo regular function binding + + returnT callMethod(Args args) const { return (*mObject)(args); } + + protected: + IBind<returnT, Args>* mObject; + }; + + /** + Class used as parameter for handing out ActionMap Events + */ + class ActionMapArg + { + public: + ActionMapArg(int id, const Component* comp) : + ActionID(id), component(comp) {}; + + //! The ActionID + int ActionID; + + //! The component (button, Axis, POV, etc) + const Component* component; + }; + + //! function pointer that returns void and takes 'const ActionMapArg&' param + typedef Binder<void, const ActionMapArg&> ActionBind; + + /** + Utility structure used for storing event info + */ + struct ActionEventInfo + { + //! Default constructor + ActionEventInfo() : id(0), trigger(-1), cType(OIS_Button), bound(0) {}; + + /** + @remarks + Constructor + @param iID + ActionID + @param iTrigger + Trigger - KeyCode, Axis num, etc + @param bButton + True - button; false - other (axis) + @param pBind + Function pointer + */ + ActionEventInfo( int iID, int iTrigger, ComponentType type, ActionBind* pBind ) : + id(iID), trigger(iTrigger), cType(type), bound(pBind) {}; + + //! Utility method for setting up members + void setProperties( int iID, int iTrigger, ComponentType type, ActionBind* pBind ) + { + id = iID; + trigger = iTrigger; + cType = type; + bound = pBind; + } + + //! Action ID Numbercd + int id; + //! KeyCode/Axis number/Button number/etc + int trigger; + //! Type of component + ComponentType cType; + //! A function pointer for event callback + ActionBind* bound; + }; + + /** + Utility class for dispatching events based on Actions. + @Note Buttons get two events for pushed/released. + @See ActionMapArg for info on whether or not the button is pushed or not + */ + class ActionMap : public KeyListener, public MouseListener, public JoyStickListener + { + ActionMap() {}; + public: + /** + @remarks + Constructs ActionMap class + @param kb + Pointer to a keyboard device for events. Or null for no key device + @param mouse + Pointer to a mouse device for events. Or null for no mouse device + @param joy + Pointer to a joystick device for events. Or null for no joy device + */ + ActionMap( Keyboard* kb, Mouse* mouse, JoyStick* joy ) : + mKey(kb), mMouse(mouse), mJoy(joy), + keyCallback(0), mouseCallback(0) {}; + + virtual ~ActionMap(); + + /** + @remarks + If you want key and/or mouse events to also 'pass' through back to + your listener, pass in your listeners here + @param kl + KeyListener + @param ml + MouseListener + */ + void setCallbacks( KeyListener* kl, MouseListener* ml ); + + /** + @remarks + If you want key and/or mouse events to also 'pass' through back to + your listener, pass in your listeners here. Setting this true + will replace your listeners (of the valid devices you passed in earlier). + If you want to continue getting your own events too, refer to setCallbacks + @param enabled + true - start recieving/passing events. False - stop + */ + void setEnabled( bool enabled ); + + /** + @remarks + Clears out all event lists + */ + void reset(); + + /** + @remarks + Add an event for keyboard device + @param iID + ActionID number you want to pass through + @param iTrigger + The actual trigger value (KeyCode, Button number, Axis number). Must be unique for each button/axis of the same device (i.e. cannot register + two events for key '2'). + @param pBind + A valid function pointer used to call for event + */ + void addKeyboardAction(int iID, int iTrigger, ActionBind *pBind); + + /** + @remarks + Add an event for mouse device + @param iID + ActionID number you want to pass through + @param iTrigger + The actual trigger value (KeyCode, Button number, Axis number). Must be unique for each button/axis of the same device (i.e. cannot register + two events for button '0' left mouse). + @param type + type of component + @param pBind + A valid function pointer used to call for event + */ + void addMouseAction(int iID, int iTrigger, ComponentType type, ActionBind *pBind); + + /** + @remarks + Add an event for joystick device + @param iID + ActionID number you want to pass through + @param iTrigger + The actual trigger value (KeyCode, Button number, Axis number). Must be unique for each button/axis of the same device (i.e. cannot register + two events for button '0'). + @param type + type of component + @param pBind + A valid function pointer used to call for event + */ + void addJoyStickAction(int iID, int iTrigger, ComponentType type, ActionBind *pBind); + + protected: + //------ Buffered Device events ------------------------ + bool keyPressed(const KeyEvent& arg); + bool keyReleased(const KeyEvent&); + + bool mouseMoved(const MouseEvent& arg); + bool mousePressed(const MouseEvent& arg, MouseButtonID); + bool mouseReleased(const MouseEvent&, MouseButtonID); + + bool axisMoved(const JoyStickEvent &arg, int axis); + bool povMoved(const JoyStickEvent &arg, int pov); + bool buttonPressed(const JoyStickEvent &arg, int button); + bool buttonReleased(const JoyStickEvent&, int); + + //! Typedef for easy iteration int = Trigger number + typedef std::map<int, ActionEventInfo> ActionList; + + //! Keyboard events + ActionList keyEvents; + + //! Mouse button events + ActionList mouseButtonEvents; + //! Mouse XY axes events + ActionEventInfo mouseXY; + //! Mouse Z (wheel) axis events + ActionEventInfo mouseZ; + + //! Joy button events + ActionList joyButtonEvents; + //! Joy axes events + ActionList joyAxisEvents; + //! Joy POV events + ActionList joyPovEvents; + + //! Keyboard device + Keyboard* mKey; + //! Mouse device + Mouse* mMouse; + //! JoyStick device + JoyStick* mJoy; + + //! Keyboard callback pointer used to pass through events + KeyListener* keyCallback; + //! Mouse callback pointer used to pass through events + MouseListener* mouseCallback; + }; +} +#endif Property changes on: src/client/ui/ActionMap.h ___________________________________________________________________ Name: svn:mime-type + text/x-c++hdr Name: svn:eol-style + native Modified: src/client/ui/Makefile.am =================================================================== --- src/client/ui/Makefile.am 2006-07-30 18:46:33 UTC (rev 126) +++ src/client/ui/Makefile.am 2006-07-30 19:14:10 UTC (rev 127) @@ -1,6 +1,6 @@ INCLUDES = $(all_includes) METASOURCES = AUTO noinst_LTLIBRARIES = libopengate-ui.la -libopengate_ui_la_SOURCES = application.cpp camera.cpp framelistener.cpp \ - avatar.cpp -noinst_HEADERS = application.h camera.h framelistener.h avatar.h +libopengate_ui_la_SOURCES = application.cpp framelistener.cpp ActionConfig.cpp \ + ActionMap.cpp +noinst_HEADERS = application.h framelistener.h ActionConfig.h ActionMap.h Modified: src/client/ui/application.cpp =================================================================== --- src/client/ui/application.cpp 2006-07-30 18:46:33 UTC (rev 126) +++ src/client/ui/application.cpp 2006-07-30 19:14:10 UTC (rev 127) @@ -22,40 +22,26 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <OgreNode.h> -#include <OgreEntity.h> -#include <OgreTextureManager.h> -#include <OgreViewport.h> -#include <CEGUI/elements/CEGUIPushButton.h> #include "application.h" -OpengateApp::OpengateApp() : mGUIRenderer(NULL), mGUISystem(NULL), mEditorGuiSheet(NULL){ - mFrameListener = NULL; - mRoot = NULL; +#include <CEGUI/CEGUISystem.h> +#include <CEGUI/CEGUILogger.h> +#include <CEGUI/CEGUISchemeManager.h> +#include <CEGUI/CEGUIWindowManager.h> +#include <CEGUI/CEGUIWindow.h> +#include <CEGUI/elements/CEGUIPushButton.h> + +OpengateApp::OpengateApp() : mGUIRenderer(0), mGUISystem(0), actionConfig(0) { + mFrameListener = 0; + mRoot = 0; } OpengateApp::~OpengateApp() { - if (mGamestate) { - delete mGamestate; - } - if (mEditorGuiSheet) { - CEGUI::WindowManager::getSingleton().destroyWindow(mEditorGuiSheet); - } - if (mGUISystem) { - delete mGUISystem; - } - if (mGUIRenderer) { - delete mGUIRenderer; - } - if (mFrameListener) { - delete mFrameListener; - } - if (mCamera) { - delete mCamera; - } - if (mRoot) { - delete mRoot; - } + delete actionConfig; + delete mGUISystem; + delete mGUIRenderer; + delete mFrameListener; + delete mRoot; } void OpengateApp::go(void) { @@ -70,13 +56,15 @@ bool OpengateApp::setup(void) { mRoot = new Ogre::Root(); - + setupResources(); if (!configure()) return false; chooseSceneManager(); + createCamera(); + createViewports(); // Set default mipmap level (NB some APIs ignore this) Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5); @@ -85,26 +73,18 @@ createResourceListener(); // Load resources loadResources(); - // Create the scene createScene(); - - mCamera = new Camera(mSceneMgr, mWindow, mAvatarNode, true); - mGamestate = new Gamestate(); - setupEventHandlers(); - createFrameListener(); - setupEventHandlers(); - return true; - } bool OpengateApp::configure(void) { // Show the configuration dialog and initialise the system // You can skip this and use root.restoreConfig() to load configuration // settings if you were sure there are valid ones saved in ogre.cfg - if(mRoot->restoreConfig()) { + //mRoot->showConfigDialog() + if (mRoot->restoreConfig()) { // If returned true, user clicked OK so initialise // Here we choose to let the system create a default rendering window by passing 'true' mWindow = mRoot->initialise(true); @@ -115,52 +95,57 @@ } void OpengateApp::chooseSceneManager(void) { - // Get the SceneManager, in this case a generic one + // Create the SceneManager, in this case a generic one mSceneMgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "ExampleSMInstance"); } -void OpengateApp::createScene() { +void OpengateApp::createScene(void) { // create an ambient light for the scene mSceneMgr->setAmbientLight(Ogre::ColourValue( 1, 1, 1 )); mSceneMgr->setShadowTechnique(Ogre::SHADOWTYPE_STENCIL_ADDITIVE); mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox"); - // setup GUI system - mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, mSceneMgr); + Ogre::Light* l = mSceneMgr->createLight("MainLight"); + l->setPosition(20,80,50); + + Ogre::Entity* ent = mSceneMgr->createEntity( "Octavius Apteryx", "Ships/Octavius/Apteryx/octavius_apteryx.mesh" ); + mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(ent); + + //--------------- setup GUI system ---------------------// + mGUIRenderer = new CEGUI::OgreCEGUIRenderer(mWindow, Ogre::RENDER_QUEUE_OVERLAY, + false, 3000, mSceneMgr); mGUISystem = new CEGUI::System(mGUIRenderer); - CEGUI::SchemeManager::getSingleton().loadScheme((CEGUI::utf8*)"TaharezLook.scheme"); - mGUISystem->setDefaultMouseCursor((CEGUI::utf8*)"TaharezLook", (CEGUI::utf8*)"MouseArrow"); + CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Informative); + CEGUI::SchemeManager::getSingleton().loadScheme((CEGUI::utf8*) + "WindowsLook.scheme"); + mGUISystem->setDefaultMouseCursor((CEGUI::utf8*)"WindowsLook",(CEGUI::utf8*) + "MouseArrow"); + mGUISystem->injectMousePosition(0,0); mGUISystem->setDefaultFont((CEGUI::utf8*)"Tahoma-12"); - mEditorGuiSheet= CEGUI::WindowManager::getSingleton().createWindow((CEGUI::utf8*)"DefaultWindow", (CEGUI::utf8*)"Sheet"); - mGUISystem->setGUISheet(mEditorGuiSheet); CEGUI::Logger::getSingleton().setLoggingLevel(CEGUI::Informative); - CEGUI::PushButton* quitButton = (CEGUI::PushButton*)CEGUI::WindowManager::getSingleton().createWindow("TaharezLook/Button", (CEGUI::utf8*)"Quit"); - mEditorGuiSheet->addChildWindow(quitButton); - quitButton->setPosition(CEGUI::Point(0.35f, 0.45f)); - quitButton->setSize(CEGUI::Size(0.3f, 0.1f)); - quitButton->setText("Quit"); - - // Create an entity - Ogre::Entity* ent = mSceneMgr->createEntity( "Octavius Apteryx", "Ships/Octavius/Apteryx/octavius_apteryx.mesh" ); - mAvatarNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(); - mAvatarNode->attachObject(ent); - mAvatarNode->setPosition(Ogre::Vector3(0,0,30)); - mAvatarNode->rotate(Ogre::Vector3(0.,1.,0.), Ogre::Degree(-90)); - mAvatar = new Avatar(mAvatarNode); - - //ent = mSceneMgr->createEntity( "Quantar Storm", "Ships/Quantar/Storm/quantar_storm.mesh" ); - //Ogre::SceneNode* node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode(); - //node2->attachObject(ent); + CEGUI::Window* sheet = CEGUI::WindowManager::getSingleton().loadWindowLayout + ((CEGUI::utf8*)"ActionMapping.layout"); + mGUISystem->setGUISheet(sheet); + //Register our handlers for the three bottom buttons + setupEventHandlers(); } void OpengateApp::destroyScene(void) { - + } - + void OpengateApp::createFrameListener(void) { - mFrameListener = new OpengateListener(mWindow, mCamera, mAvatar, mGUIRenderer, mGamestate); - mFrameListener->showDebugOverlay(true); + mFrameListener= new OpengateListener(mWindow, mCamera, mGUIRenderer); mRoot->addFrameListener(mFrameListener); + + //Get Mouse & Keyboard, and create joystick if present + OpengateListener* gUI = static_cast<OpengateListener*>(mFrameListener); + OIS::Mouse* mouse = gUI->getMouse(); + OIS::Keyboard* kb = gUI->getKeyboard(); + OIS::JoyStick* joy = gUI->getJoyStick(); + + //Utility class for configuring, & testing ActionMap + actionConfig = new ActionConfig( mouse, kb, joy, mSceneMgr ); } void OpengateApp::setupResources(void) { @@ -187,8 +172,7 @@ } } -void OpengateApp::createResourceListener(void) -{ +void OpengateApp::createResourceListener(void) { } @@ -199,10 +183,50 @@ void OpengateApp::setupEventHandlers(void) { CEGUI::WindowManager& wmgr = CEGUI::WindowManager::getSingleton(); - wmgr.getWindow((CEGUI::utf8*)"Quit")->subscribeEvent(CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&OpengateApp::handleQuit, this)); + wmgr.getWindow((CEGUI::utf8*)"Test")->subscribeEvent( + CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&OpengateApp::handleTest, this)); + wmgr.getWindow((CEGUI::utf8*)"Reset")->subscribeEvent( + CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&OpengateApp::handleReset, this)); + wmgr.getWindow((CEGUI::utf8*)"Quit")->subscribeEvent( + CEGUI::PushButton::EventClicked, + CEGUI::Event::Subscriber(&OpengateApp::handleQuit, this)); } +bool OpengateApp::handleTest(const CEGUI::EventArgs& e) { + actionConfig->startTest(); + return true; +} + +bool OpengateApp::handleReset(const CEGUI::EventArgs& e) { + actionConfig->reset(); + return true; +} + bool OpengateApp::handleQuit(const CEGUI::EventArgs& e) { static_cast<OpengateListener*>(mFrameListener)->requestShutdown(); return true; } + +void OpengateApp::createCamera(void) { + // Create the camera + mCamera = mSceneMgr->createCamera("PlayerCam"); + + // Position it at 500 in Z direction + mCamera->setPosition(Ogre::Vector3(0,0,500)); + // Look back along -Z + mCamera->lookAt(Ogre::Vector3(0,0,-300)); + mCamera->setNearClipDistance(5); +} + +void OpengateApp::createViewports(void) { + // Create one viewport, entire window + Ogre::Viewport* vp = mWindow->addViewport(mCamera); + vp->setBackgroundColour(Ogre::ColourValue(0,0,0)); + + // Alter the camera aspect ratio to match the viewport + mCamera->setAspectRatio(Ogre::Real(vp->getActualWidth()) / Ogre::Real(vp->getActualHeight())); +} + + Modified: src/client/ui/application.h =================================================================== --- src/client/ui/application.h 2006-07-30 18:46:33 UTC (rev 126) +++ src/client/ui/application.h 2006-07-30 19:14:10 UTC (rev 127) @@ -22,118 +22,68 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _APPLICATION_H -#define _APPLICATION_H +#ifndef _OPENGATE_APPLICATION_ +#define _OPENGATE_APPLICATION_ -#include <OgreConfigFile.h> -#include <OgreRoot.h> -#include <OgreCamera.h> -#include <OgreRenderWindow.h> +#include <OGRE/Ogre.h> + +#include "ActionConfig.h" #include "framelistener.h" -#include "avatar.h" -#include "camera.h" -#include "../../common/gamestate.h" #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -/*! - * - */ class OpengateApp { -public: - /*! \brief This default constructor instantiates an Application - * - * The default constructor is used to instantiates the Application. The - * Application can be considered as the object, that holds references to - * everything within the game. So here you can find the Scene, the Viewport - * to the scene, the camera(s) and the FrameListener. - */ +public: OpengateApp(); - - /*! \brief This destructor closes the application - * - * When this destructor is called, the game is done and will quit. - */ ~OpengateApp(); + void go(void); - /*! \brief The main "loop" of the game - * - * This method is running while the game is running. When this method is - * done, we are completely done. - */ - void go(); - -protected: - +private: CEGUI::OgreCEGUIRenderer* mGUIRenderer; CEGUI::System* mGUISystem; - CEGUI::Window* mEditorGuiSheet; - Gamestate* mGamestate; + ActionConfig *actionConfig; - Avatar* mAvatar; - Ogre::SceneNode* mAvatarNode; + Ogre::Root *mRoot; + Ogre::Camera* mCamera; + Ogre::SceneManager* mSceneMgr; + OpengateListener* mFrameListener; + Ogre::RenderWindow* mWindow; - Ogre::Root* mRoot; - Camera* mCamera; - Ogre::SceneManager* mSceneMgr; + void createScene(void); - OpengateListener* mFrameListener; - Ogre::RenderWindow* mWindow; + void createFrameListener(void); - Ogre::SceneManager* mGuiSceneMgr; + void setupEventHandlers(void); - /** Sets up the application - returns false if the user chooses to abandon configuration. */ - bool setup(void); + bool handleTest(const CEGUI::EventArgs& e); - /** Configures the application - returns false if the user chooses to abandon c... [truncated message content] |
|
From: <eg...@us...> - 2006-07-30 18:46:40
|
Revision: 126 Author: egore Date: 2006-07-30 11:46:33 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=126&view=rev Log Message: ----------- drop selfmade input handling in favour of OIS Modified Paths: -------------- src/client/Makefile.am Modified: src/client/Makefile.am =================================================================== --- src/client/Makefile.am 2006-07-30 18:46:09 UTC (rev 125) +++ src/client/Makefile.am 2006-07-30 18:46:33 UTC (rev 126) @@ -3,6 +3,5 @@ noinst_LTLIBRARIES = libopengate-client.la noinst_HEADERS = network.h libopengate_client_la_SOURCES = network.cpp -SUBDIRS = input ui -libopengate_client_la_LIBADD = $(top_builddir)/src/client/ui/libopengate-ui.la\ - $(top_builddir)/src/client/input/libopengate-input.la +SUBDIRS = ui +libopengate_client_la_LIBADD = $(top_builddir)/src/client/ui/libopengate-ui.la This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 18:46:14
|
Revision: 125 Author: egore Date: 2006-07-30 11:46:09 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=125&view=rev Log Message: ----------- drop selfmade input handling in favour of OIS Removed Paths: ------------- src/client/input/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 18:45:39
|
Revision: 124 Author: egore Date: 2006-07-30 11:45:34 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=124&view=rev Log Message: ----------- Remove setters for unsetable values Add implementation for array-values Modified Paths: -------------- src/common/objects/ship.cpp src/common/objects/ship.h Modified: src/common/objects/ship.cpp =================================================================== --- src/common/objects/ship.cpp 2006-07-30 18:44:33 UTC (rev 123) +++ src/common/objects/ship.cpp 2006-07-30 18:45:34 UTC (rev 124) @@ -61,6 +61,7 @@ _size = atoi(loader->get_option("/ship/size")); _mass = atoi(loader->get_option("/ship/mass")); + // Specific Data _capacitorsize = atoi(loader->get_option("/ship/capacitorsize")); _ecmsize = atoi(loader->get_option("/ship/ecmsize")); _enginecount = atoi(loader->get_option("/ship/enginecount")); @@ -87,26 +88,14 @@ return _name; } -void Ship::set_name(std::string name) { - _name = name; -} - std::string Ship::get_class() { return _class; } -void Ship::set_class(std::string newclass) { - _class = newclass; -} - Faction* Ship::get_faction() { return _faction; } -void Ship::set_faction(Faction* faction) { - _faction = faction; -} - Capacitor* Ship::get_capacitor() { return _capacitor; } @@ -121,10 +110,6 @@ _capacitor = capacitor; } -short Ship::get_capacitor_size() { - return _capacitorsize; -} - short Ship::get_guncount() { return _guncount; } Modified: src/common/objects/ship.h =================================================================== --- src/common/objects/ship.h 2006-07-30 18:44:33 UTC (rev 123) +++ src/common/objects/ship.h 2006-07-30 18:45:34 UTC (rev 124) @@ -46,16 +46,11 @@ // Naming std::string get_name(); - void set_name(std::string name); std::string get_class(); - void set_class(std::string newclass); Faction* get_faction(); - void set_faction(Faction* faction); std::string get_description(); - void set_description(std::string description); Capacitor* get_capacitor(); - void set_capacitor(Capacitor* capacitor); short get_capacitor_size(); short get_guncount(); std::vector<char*> get_productioncenters(); @@ -65,6 +60,17 @@ virtual bool rotate(int direction, Ogre::Degree scale); virtual void performMove(); +protected: + + void set_capacitor(Capacitor* capacitor); + void set_ecm(ECM* _ecm); + + // Movement + double _dragfactor; + double _pitch; + double _roll; + double _yaw; + private: virtual void initialize(); @@ -108,11 +114,6 @@ long _armor; short _cargocapacity; - // Movement - double _dragfactor; - double _pitch; - double _roll; - double _yaw; }; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 18:44:39
|
Revision: 123 Author: egore Date: 2006-07-30 11:44:33 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=123&view=rev Log Message: ----------- include ogre config files Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am =================================================================== --- src/Makefile.am 2006-07-30 18:43:24 UTC (rev 122) +++ src/Makefile.am 2006-07-30 18:44:33 UTC (rev 123) @@ -16,3 +16,8 @@ opengate_client_LDADD = $(top_builddir)/src/client/libopengate-client.la \ $(top_builddir)/src/common/libopengate-common.la $(top_builddir)/src/common/equipment/libopengate-equipment.la +pkgdatadir = $(datadir)/games/@PACKAGE@ + +pkgdata_DATA = ogre.cfg \ +plugins.cfg \ +resources.cfg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 18:43:29
|
Revision: 122 Author: egore Date: 2006-07-30 11:43:24 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=122&view=rev Log Message: ----------- Remove setters for unsetable values Add implementation for array-values Modified Paths: -------------- src/common/equipment/equipment.cpp src/common/equipment/equipment.h Modified: src/common/equipment/equipment.cpp =================================================================== --- src/common/equipment/equipment.cpp 2006-07-30 18:37:14 UTC (rev 121) +++ src/common/equipment/equipment.cpp 2006-07-30 18:43:24 UTC (rev 122) @@ -69,14 +69,20 @@ return _faction; } +std::string Equipment::get_description() { + return _description; +} + + Company* Equipment::get_manufacturer() { return _manufacturer; } -std::string Equipment::get_description() { - return _description; +std::vector<char*> Equipment::get_productioncenters() { + return _productioncenter; } + int Equipment::get_size() { return _size; } Modified: src/common/equipment/equipment.h =================================================================== --- src/common/equipment/equipment.h 2006-07-30 18:37:14 UTC (rev 121) +++ src/common/equipment/equipment.h 2006-07-30 18:43:24 UTC (rev 122) @@ -48,9 +48,8 @@ // Production Company* get_manufacturer(); + std::vector<char*> get_productioncenters(); - long get_price(); - void set_price(long price); int get_size(); protected: @@ -59,13 +58,15 @@ virtual void initialize(); std::string _filename; + // Naming std::string _name; std::string _class; Faction* _faction; std::string _description; + // Production Data Company* _manufacturer; - std::string _productioncenter[]; + std::vector<char*> _productioncenter; short _techlevel; int _size; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 18:37:20
|
Revision: 121 Author: egore Date: 2006-07-30 11:37:14 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=121&view=rev Log Message: ----------- Component implementation including loader Modified Paths: -------------- src/common/components/component.cpp src/common/components/component.h Modified: src/common/components/component.cpp =================================================================== --- src/common/components/component.cpp 2006-07-30 17:26:36 UTC (rev 120) +++ src/common/components/component.cpp 2006-07-30 18:37:14 UTC (rev 121) @@ -23,11 +23,72 @@ */ #include "component.h" +#include "../loader.h" -Component::Component() { - +Component::Component(std::string filename) { + _filename = filename; + initialize(); } Component::~Component() { } + +void Component::initialize() { + Loader* loader = Loader::get_instance(); + loader->parse_file(_filename); + + // Naming + _name = loader->get_option("/component/name"); + _class = loader->get_option("/component/class"); + _description = loader->get_option("/component/description"); + + // Production Data + _productioncenter = loader->get_option_array("/ship/production-center"); + + // Generic Data + _techlevel = atoi(loader->get_option("/component/techlevel")); + _id = atoi(loader->get_option("/component/id")); + _mass = atoi(loader->get_option("/component/mass")); + + // Specific Data + _melting_point = atoi(loader->get_option("/component/melting-point")); + _gravitic_sig = atof(loader->get_option("/component/gravitic-sig")); + +} + +std::string Component::get_name() { + return _name; +} + +std::string Component::get_class() { + return _class; +} + + +std::vector<char*> Component::get_productioncenters() { + return _productioncenter; +} + + +short Component::get_techlevel() { + return _techlevel; +} + +std::string Component::get_id() { + return _id; +} + +long Component::get_mass() { + return _mass; +} + + +int Component::get_melting_point() { + return _melting_point; +} + +double Component::get_gravitic_sig() { + return _gravitic_sig; +} + Modified: src/common/components/component.h =================================================================== --- src/common/components/component.h 2006-07-30 17:26:36 UTC (rev 120) +++ src/common/components/component.h 2006-07-30 18:37:14 UTC (rev 121) @@ -25,10 +25,47 @@ #ifndef _OPENGATE_COMPONENT_ #define _OPENGATE_COMPONENT_ +#include <vector> +#include <string> + class Component { public: - Component(); + Component(std::string filename); ~Component(); + + // Naming + std::string get_name(); + std::string get_class(); + std::string get_description(); + + // Production Data + std::vector<char*> get_productioncenters(); + + // Generic Data + short get_techlevel(); + std::string get_id(); + long get_mass(); + + int get_melting_point(); + double get_gravitic_sig(); + +private: + std::string _filename; + void initialize(); + + std::string _name; + std::string _class; + std::string _description; + + std::vector<char*> _productioncenter; + + short _techlevel; + std::string _id; + long _mass; + + int _melting_point; + double _gravitic_sig; + }; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-30 17:26:41
|
Revision: 120 Author: egore Date: 2006-07-30 10:26:36 -0700 (Sun, 30 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=120&view=rev Log Message: ----------- we are fully gnu, so remove non-gnu stuff Modified Paths: -------------- Makefile.am Modified: Makefile.am =================================================================== --- Makefile.am 2006-07-23 20:58:18 UTC (rev 119) +++ Makefile.am 2006-07-30 17:26:36 UTC (rev 120) @@ -1,5 +1 @@ -# not a GNU package. You can remove this line, if -# have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign 1.4 - SUBDIRS = src doc data This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-23 20:58:24
|
Revision: 119 Author: egore Date: 2006-07-23 13:58:18 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=119&view=rev Log Message: ----------- Added Paths: ----------- data/Rankings/Makefile.am Added: data/Rankings/Makefile.am =================================================================== --- data/Rankings/Makefile.am (rev 0) +++ data/Rankings/Makefile.am 2006-07-23 20:58:18 UTC (rev 119) @@ -0,0 +1,53 @@ +pkgdatadir = $(datadir)/games/@PACKAGE@ + +pkgdata_DATA = 00.png \ +01.png \ +02.png \ +03.png \ +04.png \ +05.png \ +06.png \ +07.png \ +08.png \ +09.png \ +10.png \ +11.png \ +12.png \ +13.png \ +14.png \ +15.png \ +16.png \ +17.png \ +18.png \ +19.png \ +20.png \ +21.png \ +22.png \ +23.png \ +24.png \ +25.png \ +26.png \ +27.png \ +28.png \ +29.png \ +30.png \ +31.png \ +32.png \ +33.png \ +34.png \ +35.png \ +36.png \ +37.png \ +38.png \ +39.png \ +40.png \ +41.png \ +42.png \ +43.png \ +44.png \ +45.png \ +46.png \ +47.png \ +48.png \ +49.png \ +50.png Property changes on: data/Rankings/Makefile.am ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-23 20:53:05
|
Revision: 118 Author: egore Date: 2006-07-23 13:52:58 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=118&view=rev Log Message: ----------- fix duplicate material Modified Paths: -------------- data/Materials/common.material Modified: data/Materials/common.material =================================================================== --- data/Materials/common.material 2006-07-23 20:52:30 UTC (rev 117) +++ data/Materials/common.material 2006-07-23 20:52:58 UTC (rev 118) @@ -1,4 +1,4 @@ -material Examples/SpaceSkyBox +material Examples/SpaceySkyBox { technique { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-23 20:52:36
|
Revision: 117 Author: egore Date: 2006-07-23 13:52:30 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=117&view=rev Log Message: ----------- flatten directory structure Added Paths: ----------- data/Capacitors/s_c_15.xml Removed Paths: ------------- data/Capacitors/S-C-15/ Added: data/Capacitors/s_c_15.xml =================================================================== (Binary files differ) Property changes on: data/Capacitors/s_c_15.xml ___________________________________________________________________ Name: svn:mime-type + application/xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-23 20:52:05
|
Revision: 116 Author: egore Date: 2006-07-23 13:51:26 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=116&view=rev Log Message: ----------- add components with images Added Paths: ----------- data/Components/ data/Components/aluminium.blend data/Components/aluminium.jpg data/Components/aluminium.xml data/Components/antimony.xml data/Components/copper.blend data/Components/copper.jpg data/Components/copper.xml data/Components/cpu.xml data/Components/gold.blend data/Components/gold.jpg data/Components/gold.xml data/Components/laser_components.xml data/Components/ram.xml data/Components/steel.blend Added: data/Components/aluminium.blend =================================================================== (Binary files differ) Property changes on: data/Components/aluminium.blend ___________________________________________________________________ Name: svn:mime-type + application/x-blender Added: data/Components/aluminium.jpg =================================================================== (Binary files differ) Property changes on: data/Components/aluminium.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: data/Components/aluminium.xml =================================================================== (Binary files differ) Property changes on: data/Components/aluminium.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/antimony.xml =================================================================== (Binary files differ) Property changes on: data/Components/antimony.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/copper.blend =================================================================== (Binary files differ) Property changes on: data/Components/copper.blend ___________________________________________________________________ Name: svn:mime-type + application/x-blender Added: data/Components/copper.jpg =================================================================== (Binary files differ) Property changes on: data/Components/copper.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: data/Components/copper.xml =================================================================== (Binary files differ) Property changes on: data/Components/copper.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/cpu.xml =================================================================== (Binary files differ) Property changes on: data/Components/cpu.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/gold.blend =================================================================== (Binary files differ) Property changes on: data/Components/gold.blend ___________________________________________________________________ Name: svn:mime-type + application/x-blender Added: data/Components/gold.jpg =================================================================== (Binary files differ) Property changes on: data/Components/gold.jpg ___________________________________________________________________ Name: svn:mime-type + image/jpeg Added: data/Components/gold.xml =================================================================== (Binary files differ) Property changes on: data/Components/gold.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/laser_components.xml =================================================================== (Binary files differ) Property changes on: data/Components/laser_components.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/ram.xml =================================================================== (Binary files differ) Property changes on: data/Components/ram.xml ___________________________________________________________________ Name: svn:mime-type + application/xml Added: data/Components/steel.blend =================================================================== (Binary files differ) Property changes on: data/Components/steel.blend ___________________________________________________________________ Name: svn:mime-type + application/x-blender This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-20 19:38:31
|
Revision: 115 Author: egore Date: 2006-07-20 12:38:21 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=115&view=rev Log Message: ----------- more work Modified Paths: -------------- website/game/account.php website/game/database.php website/game/include/login_check.php.inc website/game/index.php website/game/login.php website/game/opengate.sql.bz2 website/game/stats.php Modified: website/game/account.php =================================================================== (Binary files differ) Modified: website/game/database.php =================================================================== (Binary files differ) Modified: website/game/include/login_check.php.inc =================================================================== (Binary files differ) Modified: website/game/index.php =================================================================== (Binary files differ) Modified: website/game/login.php =================================================================== (Binary files differ) Modified: website/game/opengate.sql.bz2 =================================================================== (Binary files differ) Modified: website/game/stats.php =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-20 14:55:15
|
Revision: 114 Author: egore Date: 2006-07-20 07:54:28 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=114&view=rev Log Message: ----------- add statistics about registered players and details about the players ship Modified Paths: -------------- website/game/account.php website/game/database.php website/game/index.php website/game/opengate.sql.bz2 Added Paths: ----------- website/game/stats.php Modified: website/game/account.php =================================================================== (Binary files differ) Modified: website/game/database.php =================================================================== (Binary files differ) Modified: website/game/index.php =================================================================== (Binary files differ) Modified: website/game/opengate.sql.bz2 =================================================================== (Binary files differ) Added: website/game/stats.php =================================================================== (Binary files differ) Property changes on: website/game/stats.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-20 14:13:17
|
Revision: 113 Author: egore Date: 2006-07-20 07:12:28 -0700 (Thu, 20 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=113&view=rev Log Message: ----------- some more work on the account management Modified Paths: -------------- website/game/game_login.php website/game/include/login_check.php.inc website/game/index.php website/game/login.php website/game/opengate.css website/game/opengate.sql.bz2 website/game/register.php Added Paths: ----------- website/game/account.php website/game/admin.php website/game/database.php website/game/download.php website/game/news.php Added: website/game/account.php =================================================================== (Binary files differ) Property changes on: website/game/account.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php Added: website/game/admin.php =================================================================== (Binary files differ) Property changes on: website/game/admin.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php Added: website/game/database.php =================================================================== (Binary files differ) Property changes on: website/game/database.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php Added: website/game/download.php =================================================================== (Binary files differ) Property changes on: website/game/download.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php Modified: website/game/game_login.php =================================================================== (Binary files differ) Modified: website/game/include/login_check.php.inc =================================================================== (Binary files differ) Modified: website/game/index.php =================================================================== (Binary files differ) Modified: website/game/login.php =================================================================== (Binary files differ) Added: website/game/news.php =================================================================== (Binary files differ) Property changes on: website/game/news.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php Modified: website/game/opengate.css =================================================================== --- website/game/opengate.css 2006-07-19 12:04:05 UTC (rev 112) +++ website/game/opengate.css 2006-07-20 14:12:28 UTC (rev 113) @@ -145,7 +145,7 @@ #content{ float:left; -width:530px; +width:958px; font-size:0.9em; padding:20px 0 0 20px; } @@ -264,8 +264,8 @@ /**************** Misc classes and styles ****************/ -.splitcontentleft{float:left; width:48%;} -.splitcontentright{float:right; width:48%;} +.splitcontentleft{float:left; width:28%;} +.splitcontentright{float:right; width:68%;} .clear{clear:both;} .small{font-size:0.8em;} .hide{display:none;} Modified: website/game/opengate.sql.bz2 =================================================================== (Binary files differ) Modified: website/game/register.php =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-19 12:04:23
|
Revision: 112 Author: egore Date: 2006-07-19 05:04:05 -0700 (Wed, 19 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=112&view=rev Log Message: ----------- start account manager with design Modified Paths: -------------- website/game/include/login_check.php.inc website/game/login.php website/game/register.php Added Paths: ----------- website/game/images/ website/game/images/logo.png website/game/images/logo.svg website/game/index.php website/game/opengate.css Added: website/game/images/logo.png =================================================================== (Binary files differ) Property changes on: website/game/images/logo.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: website/game/images/logo.svg =================================================================== (Binary files differ) Property changes on: website/game/images/logo.svg ___________________________________________________________________ Name: svn:mime-type + image/svg Modified: website/game/include/login_check.php.inc =================================================================== (Binary files differ) Added: website/game/index.php =================================================================== (Binary files differ) Property changes on: website/game/index.php ___________________________________________________________________ Name: svn:mime-type + application/x-httpd-php Modified: website/game/login.php =================================================================== (Binary files differ) Added: website/game/opengate.css =================================================================== --- website/game/opengate.css (rev 0) +++ website/game/opengate.css 2006-07-19 12:04:05 UTC (rev 112) @@ -0,0 +1,283 @@ +/* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */ + +/**************** Body and tag styles ****************/ + +*{margin:0; padding:0;} + +body{ +font:76% Verdana,Tahoma,Arial,sans-serif; +line-height:1.4em; +text-align:center; +color:#303030; +background:#e8eaec; +} + +pre { + padding-top: 1.5em; + padding-bottom: 0em; + padding-left: 2em; + margin: 0.4em 0 0.4em 0; + font-size: medium; + font-family: monospace; + border: 1px solid #c0c0c0; + background-color: #fafbfc; +} + +code { + font-size: medium; + font-family: monospace; +} + +a{ +color:#467aa7; +font-weight:bold; +text-decoration:none; +background-color:inherit; +} + +a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;} +a img{border:none;} + +p{padding:0 0 1.6em 0;} +p form{margin-top:0; margin-bottom:20px;} + +img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;} +img.left{float:left; margin:0 12px 5px 0;} +img.center{display:block; margin:0 auto 5px auto;} +img.right{float:right; margin:0 0 5px 12px;} + + + +h1,h2 { + margin-top: 10px; + margin-bottom: 15px; +} + +h3,h4,h5,h6 { + margin-top: 10px; + margin-bottom: 10px; +} + +/**************** Header and navigation styles ****************/ + +#container{ +width:1000px; +margin:20px auto; +padding:1px 0; +text-align:left; +background:#ffffff; +color:#303030; +border:2px solid #a0a0a0; +} + +#header{ +height:60px; +width:998px; +margin:0 1px 1px 1px; +background:#467aa7 url(images/logo.png) no-repeat left; +color:#ffffff; +} + +#header h1{ +padding:35px 0 0 20px; +font-size:2.4em; +background-color:inherit; +color:#ffffff; +letter-spacing:-2px; +font-weight:normal; +} + +#header h2{ +margin:10px 0 0 40px; +font-size:1.4em; +background-color:inherit; +color:#f0f2f4; +letter-spacing:-1px; +font-weight:normal; +} + +#navigation{ +height:2.2em; +line-height:2.2em; +width:998px; +margin:0 1px; +background:#578bb8; +color:#ffffff; +} + +#navigation li{ + float:left; + list-style-type:none; + border-right:1px solid #ffffff; + white-space:nowrap; +} + +#navigation li.selected{ + padding:0 10px; + display:block; + font-size:0.8em; + font-weight:normal; + text-transform:uppercase; + text-decoration:none; + color: #ffffff; +} + +#navigation li a{ +padding:0 10px; +display:block; +font-size:0.8em; +font-weight:normal; +text-transform:uppercase; +text-decoration:none; +background-color:inherit; +color: #ffffff; +} + +* html #navigation a {width:1%;} + +#navigation .selected,#navigation a:hover{ +background:#80b0da; +color:#ffffff; +text-decoration:none; +} + +/**************** Content styles ****************/ + +#content{ +float:left; +width:530px; +font-size:0.9em; +padding:20px 0 0 20px; +} + +#content h2{ +display:block; +margin:0 0 16px 0; +font-size:1.7em; +font-weight:normal; +letter-spacing:-1px; +color:#505050; +background-color:inherit; +} + +#content h2 a{font-weight:normal;} +#content h3{margin:0 0 5px 0; font-size:1.4em; letter-spacing:-1px;} +#content a:hover,#subcontent a:hover{text-decoration:underline;} +#content ul,#content ol{margin:0 5px 16px 35px;} +#content dl{margin:0 5px 10px 25px;} +#content dt{font-weight:bold; margin-bottom:5px;} +#content dd{margin:0 0 10px 15px;} + +/**************** Full-content styles ****************/ + +#fullcontent{ +font-size:0.9em; +padding:20px 20px 0 20px; +} + +#fullcontent h2{ +display:block; +margin:0 0 16px 0; +font-size:1.7em; +font-weight:normal; +letter-spacing:-1px; +color:#505050; +background-color:inherit; +} + +#fullcontent h2 a{font-weight:normal;} +#fullcontent h3{margin:0 0 5px 0; font-size:1.4em; letter-spacing:-1px;} +#fullcontent a:hover{text-decoration:underline;} +#fullcontent ul, +#fullcontent ol{margin:0 5px 16px 35px;} +#fullcontent dl{margin:0 5px 10px 25px;} +#fullcontent dt{font-weight:bold; margin-bottom:5px;} +#fullcontent dd{margin:0 0 10px 15px;} + +/**************** Sidebar styles ****************/ + +#subcontent{ +float:right; +width:170px; +padding:20px 20px 10px 0; +line-height:1.4em; +} + +#subcontent h2{ +display:block; +margin:0 0 15px 0; +font-size:1.6em; +font-weight:normal; +text-align:left; +letter-spacing:-1px; +color:#505050; +background-color:inherit; +} + +#subcontent p{margin:0 0 16px 0; font-size:0.9em;} + +/**************** Menublock styles ****************/ + +.menublock{margin:0 0 20px 8px; font-size:0.9em;} +.menublock li{list-style:none; display:block; padding:2px; margin-bottom:2px;} +.menublock li a{font-weight:bold; text-decoration:none;} +.menublock li a:hover{text-decoration:none;} +.menublock li ul{margin:3px 0 3px 15px; font-size:1em; font-weight:normal;} +.menublock li ul li{margin-bottom:0;} +.menublock li ul a{font-weight:normal;} + +/**************** Searchbar styles ****************/ + +#searchbar{margin:0 0 20px 0;} +#searchbar form fieldset{margin-left:10px; border:0 solid;} + +#searchbar #s{ +height:1.2em; +width:110px; +margin:0 5px 0 0; +border:1px solid #a0a0a0; +} + +#searchbar #searchbutton{ +width:auto; +padding:0 1px; +border:1px solid #808080; +font-size:0.9em; +text-align:center; +} + +/**************** Footer styles ****************/ + +#footer{ +clear:both; +width:998px; +padding:5px 0; +margin:0 1px; +font-size:0.9em; +color:#f0f0f0; +background:#467aa7; +} + +#footer p{padding:0; margin:0; text-align:center;} +#footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;} +#footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;} + +/**************** Misc classes and styles ****************/ + +.splitcontentleft{float:left; width:48%;} +.splitcontentright{float:right; width:48%;} +.clear{clear:both;} +.small{font-size:0.8em;} +.hide{display:none;} +.textcenter{text-align:center;} +.textright{text-align:right;} +.important{color:#f02025; background-color:inherit; font-weight:bold;} + +.box{ +margin:0 0 20px 0; +padding:10px; +border:1px solid #c0c0c0; +background-color:#fafbfc; +color:#505050; +line-height:1.5em; +} Property changes on: website/game/opengate.css ___________________________________________________________________ Name: svn:mime-type + text/css Name: svn:eol-style + native Modified: website/game/register.php =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <eg...@us...> - 2006-07-18 21:25:21
|
Revision: 111 Author: egore Date: 2006-07-18 14:25:16 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/opengate/?rev=111&view=rev Log Message: ----------- ignore Makefile.in's Property Changed: ---------------- doc/ Property changes on: doc ___________________________________________________________________ Name: svn:ignore + Makefile.in This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
1 message has been excluded from this view by a project administrator.
