zoomedit:
* TexCoords saves number of used coordinates now. * All data classes save changes in the XML tree now.
This commit is contained in:
neoraider
parent
84780a8c1d
commit
7db6adf7e9
15 changed files with 433 additions and 742 deletions
|
|
@ -89,7 +89,6 @@ CXXFLAGS = @CXXFLAGS@
|
|||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
|
|
@ -115,7 +114,6 @@ LTLIBOBJS = @LTLIBOBJS@
|
|||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
|
|
|||
213
aclocal.m4
vendored
213
aclocal.m4
vendored
|
|
@ -252,7 +252,7 @@ AC_DEFUN([AC_GTKGLEXT_SUPPORTS_MULTIHEAD],
|
|||
|
||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||
|
||||
# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
|
||||
# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
|
||||
|
||||
|
||||
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
|
||||
|
|
@ -340,6 +340,7 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
|
|||
AC_REQUIRE([AC_OBJEXT])dnl
|
||||
AC_REQUIRE([AC_EXEEXT])dnl
|
||||
dnl
|
||||
|
||||
AC_LIBTOOL_SYS_MAX_CMD_LEN
|
||||
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
|
||||
AC_LIBTOOL_OBJDIR
|
||||
|
|
@ -441,8 +442,6 @@ file_magic*)
|
|||
;;
|
||||
esac
|
||||
|
||||
_LT_REQUIRED_DARWIN_CHECKS
|
||||
|
||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
|
||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
|
||||
enable_win32_dll=yes, enable_win32_dll=no)
|
||||
|
|
@ -522,80 +521,9 @@ ac_outfile=conftest.$ac_objext
|
|||
echo "$lt_simple_link_test_code" >conftest.$ac_ext
|
||||
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
|
||||
_lt_linker_boilerplate=`cat conftest.err`
|
||||
$rm -r conftest*
|
||||
$rm conftest*
|
||||
])# _LT_LINKER_BOILERPLATE
|
||||
|
||||
# _LT_REQUIRED_DARWIN_CHECKS
|
||||
# --------------------------
|
||||
# Check for some things on darwin
|
||||
AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
|
||||
case $host_os in
|
||||
rhapsody* | darwin*)
|
||||
AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
|
||||
AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
|
||||
|
||||
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
|
||||
[lt_cv_apple_cc_single_mod=no
|
||||
if test -z "${LT_MULTI_MODULE}"; then
|
||||
# By default we will add the -single_module flag. You can override
|
||||
# by either setting the environment variable LT_MULTI_MODULE
|
||||
# non-empty at configure time, or by adding -multi_module to the
|
||||
# link flags.
|
||||
echo "int foo(void){return 1;}" > conftest.c
|
||||
$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
|
||||
-dynamiclib ${wl}-single_module conftest.c
|
||||
if test -f libconftest.dylib; then
|
||||
lt_cv_apple_cc_single_mod=yes
|
||||
rm -rf libconftest.dylib*
|
||||
fi
|
||||
rm conftest.c
|
||||
fi])
|
||||
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
||||
[lt_cv_ld_exported_symbols_list],
|
||||
[lt_cv_ld_exported_symbols_list=no
|
||||
save_LDFLAGS=$LDFLAGS
|
||||
echo "_main" > conftest.sym
|
||||
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
|
||||
[lt_cv_ld_exported_symbols_list=yes],
|
||||
[lt_cv_ld_exported_symbols_list=no])
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
])
|
||||
case $host_os in
|
||||
rhapsody* | darwin1.[[0123]])
|
||||
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
|
||||
darwin1.*)
|
||||
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
||||
darwin*)
|
||||
# if running on 10.5 or later, the deployment target defaults
|
||||
# to the OS version, if on x86, and 10.4, the deployment
|
||||
# target defaults to 10.4. Don't you love it?
|
||||
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
||||
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
|
||||
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
||||
10.[[012]]*)
|
||||
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
|
||||
10.*)
|
||||
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
if test "$lt_cv_apple_cc_single_mod" = "yes"; then
|
||||
_lt_dar_single_mod='$single_module'
|
||||
fi
|
||||
if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
|
||||
_lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
|
||||
else
|
||||
_lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
|
||||
fi
|
||||
if test "$DSYMUTIL" != ":"; then
|
||||
_lt_dsymutil="~$DSYMUTIL \$lib || :"
|
||||
else
|
||||
_lt_dsymutil=
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
# _LT_AC_SYS_LIBPATH_AIX
|
||||
# ----------------------
|
||||
|
|
@ -920,11 +848,7 @@ sparc*-*solaris*)
|
|||
*64-bit*)
|
||||
case $lt_cv_prog_gnu_ld in
|
||||
yes*) LD="${LD-ld} -m elf64_sparc" ;;
|
||||
*)
|
||||
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
|
||||
LD="${LD-ld} -64"
|
||||
fi
|
||||
;;
|
||||
*) LD="${LD-ld} -64" ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1017,7 +941,7 @@ AC_CACHE_CHECK([$1], [$2],
|
|||
$2=yes
|
||||
fi
|
||||
fi
|
||||
$rm -r conftest*
|
||||
$rm conftest*
|
||||
LDFLAGS="$save_LDFLAGS"
|
||||
])
|
||||
|
||||
|
|
@ -1288,7 +1212,7 @@ else
|
|||
AC_CHECK_FUNC([shl_load],
|
||||
[lt_cv_dlopen="shl_load"],
|
||||
[AC_CHECK_LIB([dld], [shl_load],
|
||||
[lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
|
||||
[lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
|
||||
[AC_CHECK_FUNC([dlopen],
|
||||
[lt_cv_dlopen="dlopen"],
|
||||
[AC_CHECK_LIB([dl], [dlopen],
|
||||
|
|
@ -1296,7 +1220,7 @@ else
|
|||
[AC_CHECK_LIB([svld], [dlopen],
|
||||
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
|
||||
[AC_CHECK_LIB([dld], [dld_link],
|
||||
[lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
|
||||
[lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
|
@ -1613,7 +1537,7 @@ aix3*)
|
|||
soname_spec='${libname}${release}${shared_ext}$major'
|
||||
;;
|
||||
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
version_type=linux
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
|
|
@ -2146,13 +2070,6 @@ esac
|
|||
AC_MSG_RESULT([$dynamic_linker])
|
||||
test "$dynamic_linker" = no && can_build_shared=no
|
||||
|
||||
AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
|
||||
[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
|
||||
sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
|
||||
AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
|
||||
[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
|
||||
sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
|
||||
|
||||
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
|
||||
if test "$GCC" = yes; then
|
||||
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
|
||||
|
|
@ -2652,7 +2569,7 @@ lt_cv_deplibs_check_method='unknown'
|
|||
# whether `pass_all' will *always* work, you probably want this one.
|
||||
|
||||
case $host_os in
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
|
|
@ -3088,7 +3005,7 @@ aix3*)
|
|||
fi
|
||||
;;
|
||||
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
fi
|
||||
|
|
@ -3145,7 +3062,6 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
|
|||
_LT_AC_TAGVAR(predeps, $1)=
|
||||
_LT_AC_TAGVAR(postdeps, $1)=
|
||||
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
|
||||
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
|
||||
|
||||
# Source file extension for C++ test sources.
|
||||
ac_ext=cpp
|
||||
|
|
@ -3255,7 +3171,7 @@ case $host_os in
|
|||
# FIXME: insert proper C++ library support
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
;;
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
if test "$host_cpu" = ia64; then
|
||||
# On IA64, the linker does run time linking by default, so we don't
|
||||
# have to do anything special.
|
||||
|
|
@ -3268,7 +3184,7 @@ case $host_os in
|
|||
# Test if we are trying to use run time linking or normal
|
||||
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
||||
# need to do runtime linking.
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
case $ld_flag in
|
||||
*-brtl*)
|
||||
|
|
@ -3414,23 +3330,51 @@ case $host_os in
|
|||
fi
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
case $host_os in
|
||||
rhapsody* | darwin1.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
|
||||
;;
|
||||
*) # Darwin 1.3 on
|
||||
if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
|
||||
else
|
||||
case ${MACOSX_DEPLOYMENT_TARGET} in
|
||||
10.[[012]])
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
|
||||
;;
|
||||
10.*)
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
|
||||
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
|
||||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
|
||||
|
||||
if test "$GXX" = yes ; then
|
||||
lt_int_apple_cc_single_mod=no
|
||||
output_verbose_link_cmd='echo'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||
if test "$lt_cv_apple_cc_single_mod" != "yes"; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||
if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
|
||||
lt_int_apple_cc_single_mod=yes
|
||||
fi
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
|
||||
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
fi
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
case $cc_basename in
|
||||
xlc*)
|
||||
|
|
@ -3681,7 +3625,7 @@ case $host_os in
|
|||
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
|
||||
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
|
||||
;;
|
||||
pgCC* | pgcpp*)
|
||||
pgCC*)
|
||||
# Portland Group C++ compiler
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
|
||||
|
|
@ -4116,8 +4060,7 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
|
|||
# compiler output when linking a shared library.
|
||||
# Parse the compiler output and extract the necessary
|
||||
# objects, libraries and library flags.
|
||||
AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
|
||||
[AC_REQUIRE([LT_AC_PROG_SED])dnl
|
||||
AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
|
||||
dnl we can't use the lt_simple_compile_test_code here,
|
||||
dnl because it contains code intended for an executable,
|
||||
dnl not a library. It's possible we should let each
|
||||
|
|
@ -4242,11 +4185,6 @@ fi
|
|||
|
||||
$rm -f confest.$objext
|
||||
|
||||
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
|
||||
if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
|
||||
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
|
||||
fi
|
||||
|
||||
# PORTME: override above test on systems where it is broken
|
||||
ifelse([$1],[CXX],
|
||||
[case $host_os in
|
||||
|
|
@ -4303,6 +4241,7 @@ solaris*)
|
|||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
case " $_LT_AC_TAGVAR(postdeps, $1) " in
|
||||
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
|
||||
esac
|
||||
|
|
@ -4387,7 +4326,7 @@ aix3*)
|
|||
postinstall_cmds='$RANLIB $lib'
|
||||
fi
|
||||
;;
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
|
||||
test "$enable_shared" = yes && enable_static=no
|
||||
fi
|
||||
|
|
@ -4564,7 +4503,6 @@ if test -f "$ltmain"; then
|
|||
_LT_AC_TAGVAR(predeps, $1) \
|
||||
_LT_AC_TAGVAR(postdeps, $1) \
|
||||
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
|
||||
_LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
|
||||
_LT_AC_TAGVAR(archive_cmds, $1) \
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
|
||||
_LT_AC_TAGVAR(postinstall_cmds, $1) \
|
||||
|
|
@ -4627,7 +4565,7 @@ ifelse([$1], [],
|
|||
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
|
||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GNU Libtool:
|
||||
|
|
@ -4864,10 +4802,6 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
|
|||
# shared library.
|
||||
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
|
||||
|
||||
# The directories searched by this compiler when creating a shared
|
||||
# library
|
||||
compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
|
||||
|
||||
# The library search path used internally by the compiler when linking
|
||||
# a shared library.
|
||||
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
|
||||
|
|
@ -5217,7 +5151,7 @@ EOF
|
|||
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
|
||||
cat conftest.$ac_ext >&5
|
||||
fi
|
||||
rm -rf conftest* conftst*
|
||||
rm -f conftest* conftst*
|
||||
|
||||
# Do not use the global_symbol_pipe unless it works.
|
||||
if test "$pipe_works" = yes; then
|
||||
|
|
@ -5274,8 +5208,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
# (--disable-auto-import) libraries
|
||||
m4_if([$1], [GCJ], [],
|
||||
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
# PIC is the default on this platform
|
||||
|
|
@ -5312,7 +5245,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
esac
|
||||
else
|
||||
case $host_os in
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
# All AIX code is PIC.
|
||||
if test "$host_cpu" = ia64; then
|
||||
# AIX 5 now supports IA64 processor
|
||||
|
|
@ -5408,7 +5341,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
;;
|
||||
pgCC* | pgcpp*)
|
||||
pgCC*)
|
||||
# Portland Group C++ compiler.
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
|
||||
|
|
@ -5559,8 +5492,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
# (--disable-auto-import) libraries
|
||||
m4_if([$1], [GCJ], [],
|
||||
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
||||
;;
|
||||
|
||||
darwin* | rhapsody*)
|
||||
|
|
@ -5630,8 +5562,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
|
|||
mingw* | cygwin* | pw32* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
m4_if([$1], [GCJ], [],
|
||||
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
||||
;;
|
||||
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
|
|
@ -5768,7 +5699,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
|
|||
#
|
||||
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
|
||||
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
|
||||
_LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
|
||||
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
|
||||
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
|
||||
"" | " "*) ;;
|
||||
|
|
@ -5792,7 +5723,7 @@ esac
|
|||
#
|
||||
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
|
||||
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
|
||||
_LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
|
||||
_LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
|
||||
$lt_tmp_static_flag,
|
||||
[],
|
||||
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
|
||||
|
|
@ -5808,7 +5739,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
|||
ifelse([$1],[CXX],[
|
||||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
case $host_os in
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
# If we're using GNU nm, then we don't want the "-C" option.
|
||||
# -C means demangle to AIX nm, but means don't demangle with GNU nm
|
||||
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
|
||||
|
|
@ -5830,7 +5761,6 @@ ifelse([$1],[CXX],[
|
|||
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
;;
|
||||
esac
|
||||
_LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
||||
],[
|
||||
runpath_var=
|
||||
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
|
||||
|
|
@ -5861,14 +5791,12 @@ ifelse([$1],[CXX],[
|
|||
# it will be wrapped by ` (' and `)$', so one must not match beginning or
|
||||
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
|
||||
# as well as any symbol that contains `d'.
|
||||
_LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
|
||||
_LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
|
||||
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
|
||||
# platforms (ab)use it in PIC code, but their linkers get confused if
|
||||
# the symbol is explicitly referenced. Since portable code cannot
|
||||
# rely on this symbol name, it's probably fine to never include it in
|
||||
# preloaded symbol tables.
|
||||
# Exclude shared library initialization/finalization symbols.
|
||||
dnl Note also adjust exclude_expsyms for C++ above.
|
||||
extract_expsyms_cmds=
|
||||
# Just being paranoid about ensuring that cc_basename is set.
|
||||
_LT_CC_BASENAME([$compiler])
|
||||
|
|
@ -5918,7 +5846,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
|
|||
|
||||
# See if GNU ld supports shared libraries.
|
||||
case $host_os in
|
||||
aix[[3-9]]*)
|
||||
aix3* | aix4* | aix5*)
|
||||
# On AIX/PPC, the GNU linker is very broken
|
||||
if test "$host_cpu" != ia64; then
|
||||
_LT_AC_TAGVAR(ld_shlibs, $1)=no
|
||||
|
|
@ -6138,7 +6066,7 @@ _LT_EOF
|
|||
fi
|
||||
;;
|
||||
|
||||
aix[[4-9]]*)
|
||||
aix4* | aix5*)
|
||||
if test "$host_cpu" = ia64; then
|
||||
# On IA64, the linker does run time linking by default, so we don't
|
||||
# have to do anything special.
|
||||
|
|
@ -6158,7 +6086,7 @@ _LT_EOF
|
|||
# Test if we are trying to use run time linking or normal
|
||||
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
||||
# need to do runtime linking.
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
|
||||
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
|
|
@ -6318,10 +6246,11 @@ _LT_EOF
|
|||
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
|
||||
if test "$GCC" = yes ; then
|
||||
output_verbose_link_cmd='echo'
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
|
||||
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
|
||||
_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
|
||||
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
|
||||
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
|
||||
else
|
||||
case $cc_basename in
|
||||
xlc*)
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ AC_PROG_LIBTOOL
|
|||
|
||||
# Checks for libraries.
|
||||
#AC_CHECK_LIB(m, [sqrt])
|
||||
PKG_CHECK_MODULES(glademm, libglademm-2.4, , AC_MSG_ERROR(Test for libglademm-2.4 failed.))
|
||||
PKG_CHECK_MODULES(glademm, glibmm-2.4 >= 2.16 libglademm-2.4, , AC_MSG_ERROR(Test for glibmm-2.4 >= 2.16 and libglademm-2.4 failed.))
|
||||
AM_PATH_GTKGLEXT_1_0(1.0.0,,AC_MSG_ERROR(Test for GtkGLExt failed.))
|
||||
PKG_CHECK_MODULES(libxml, libxml++-2.6, , AC_MSG_ERROR(Test for libxml++-2.6 failed.))
|
||||
PKG_CHECK_MODULES(libxml, libxml++-2.6 >= 2.24, , AC_MSG_ERROR(Test for libxml++-2.6 failed.))
|
||||
|
||||
|
||||
# Checks for header files.
|
||||
|
|
|
|||
|
|
@ -35,6 +35,28 @@ class Gate {
|
|||
|
||||
public:
|
||||
Gate(xmlpp::Element *node);
|
||||
|
||||
const std::list<Triangle>& getTriangles() {
|
||||
return triangles;
|
||||
}
|
||||
|
||||
const Glib::ustring& getRoom1() const {
|
||||
return room1;
|
||||
}
|
||||
|
||||
void setRoom1(const Glib::ustring &room) {
|
||||
room1 = room;
|
||||
gateNode->set_attribute("room1", room);
|
||||
}
|
||||
|
||||
const Glib::ustring& getRoom2() const {
|
||||
return room2;
|
||||
}
|
||||
|
||||
void setRoom2(const Glib::ustring &room) {
|
||||
room2 = room;
|
||||
gateNode->set_attribute("room2", room);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
*/
|
||||
|
||||
#include "Info.h"
|
||||
#include <libxml++/nodes/textnode.h>
|
||||
|
||||
namespace ZoomEdit {
|
||||
namespace Data {
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#define ZOOMEDIT_DATA_INFO_H_
|
||||
|
||||
#include <libxml++/nodes/element.h>
|
||||
#include <libxml++/nodes/textnode.h>
|
||||
|
||||
namespace ZoomEdit {
|
||||
namespace Data {
|
||||
|
|
@ -35,6 +36,24 @@ class Info {
|
|||
|
||||
public:
|
||||
Info(xmlpp::Element *node);
|
||||
|
||||
const Glib::ustring& getName() const {
|
||||
return name;
|
||||
}
|
||||
|
||||
void setName(const Glib::ustring &n) {
|
||||
name = n;
|
||||
nameNode->get_child_text()->set_content(n);
|
||||
}
|
||||
|
||||
const Glib::ustring& getDescription() const {
|
||||
return desc;
|
||||
}
|
||||
|
||||
void setDescription(const Glib::ustring &d) {
|
||||
desc = d;
|
||||
descNode->get_child_text()->set_content(d);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ CXXFLAGS = @CXXFLAGS@
|
|||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
|
|
@ -110,7 +109,6 @@ LTLIBOBJS = @LTLIBOBJS@
|
|||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
|
|
|||
|
|
@ -35,6 +35,19 @@ class Room {
|
|||
|
||||
public:
|
||||
Room(xmlpp::Element *node);
|
||||
|
||||
const std::list<Triangle>& getTriangles() {
|
||||
return triangles;
|
||||
}
|
||||
|
||||
const Glib::ustring& getId() const {
|
||||
return id;
|
||||
}
|
||||
|
||||
void setId(const Glib::ustring &nid) {
|
||||
id = nid;
|
||||
roomNode->set_attribute("id", nid);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,10 +25,15 @@ namespace Data {
|
|||
|
||||
class TexCoords {
|
||||
private:
|
||||
unsigned int coordCount;
|
||||
float s, t, r, q;
|
||||
|
||||
public:
|
||||
TexCoords(float s0 = 0, float t0 = 0, float r0 = 0, float q0 = 0) : s(s0), t(t0), r(r0), q(q0) {}
|
||||
TexCoords(unsigned int c = 2, float s0 = 0, float t0 = 0, float r0 = 0, float q0 = 0)
|
||||
: coordCount(c), s(s0), t(t0), r(r0), q(q0) {}
|
||||
|
||||
unsigned int getCoordCount() const {return coordCount;}
|
||||
void setCoordCount(unsigned int c) {coordCount = c;}
|
||||
|
||||
float getS() const {return s;}
|
||||
void setS(float s0) {s = s0;}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,24 @@ class Texture {
|
|||
|
||||
public:
|
||||
Texture(xmlpp::Element *node);
|
||||
|
||||
const Glib::ustring& getId() const {
|
||||
return id;
|
||||
}
|
||||
|
||||
void setId(const Glib::ustring &nid) {
|
||||
id = nid;
|
||||
texNode->set_attribute("id", nid);
|
||||
}
|
||||
|
||||
const Glib::ustring& getName() const {
|
||||
return name;
|
||||
}
|
||||
|
||||
void setName(const Glib::ustring &nname) {
|
||||
name = nname;
|
||||
texNode->set_attribute("name", nname);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,12 +44,28 @@ Vector Triangle::loadVector(xmlpp::Element *node) const {
|
|||
}
|
||||
|
||||
TexCoords Triangle::loadTexCoords(xmlpp::Element *node) const {
|
||||
TexCoords t;
|
||||
TexCoords t(1);
|
||||
xmlpp::Attribute *attr;
|
||||
|
||||
t.setS(std::atof(node->get_attribute_value("s").c_str()));
|
||||
t.setT(std::atof(node->get_attribute_value("t").c_str()));
|
||||
t.setR(std::atof(node->get_attribute_value("r").c_str()));
|
||||
t.setQ(std::atof(node->get_attribute_value("q").c_str()));
|
||||
|
||||
attr = node->get_attribute("t");
|
||||
if(attr) {
|
||||
t.setT(std::atof(attr->get_value().c_str()));
|
||||
t.setCoordCount(2);
|
||||
}
|
||||
|
||||
attr = node->get_attribute("r");
|
||||
if(attr) {
|
||||
t.setR(std::atof(attr->get_value().c_str()));
|
||||
t.setCoordCount(3);
|
||||
}
|
||||
|
||||
attr = node->get_attribute("q");
|
||||
if(attr) {
|
||||
t.setQ(std::atof(attr->get_value().c_str()));
|
||||
t.setCoordCount(4);
|
||||
}
|
||||
|
||||
return t;
|
||||
}
|
||||
|
|
@ -83,6 +99,9 @@ Triangle::Triangle(xmlpp::Element *node) : triangleNode(node) {
|
|||
if(e->get_name() == "vertex") {
|
||||
vertexNodes[++i] = e;
|
||||
vertices[i] = loadVertex(e);
|
||||
|
||||
normalNodes[i] = NULL;
|
||||
texCoordsNodes[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -90,5 +109,52 @@ Triangle::Triangle(xmlpp::Element *node) : triangleNode(node) {
|
|||
texture = node->get_attribute_value("texture");
|
||||
}
|
||||
|
||||
void Triangle::setVertex(unsigned int i, const Vertex &v) {
|
||||
vertices[i] = v;
|
||||
|
||||
vertexNodes[i]->set_attribute("x", Glib::ustring::format(v.getX()));
|
||||
vertexNodes[i]->set_attribute("y", Glib::ustring::format(v.getY()));
|
||||
vertexNodes[i]->set_attribute("z", Glib::ustring::format(v.getZ()));
|
||||
}
|
||||
|
||||
void Triangle::setNormal(unsigned int i, const Vector &n) {
|
||||
normals[i] = n;
|
||||
|
||||
if(!normalNodes[i])
|
||||
normalNodes[i] = triangleNode->add_child(static_cast<xmlpp::Node*>(vertexNodes[i]), "normal");
|
||||
|
||||
normalNodes[i]->set_attribute("x", Glib::ustring::format(n.getX()));
|
||||
normalNodes[i]->set_attribute("y", Glib::ustring::format(n.getY()));
|
||||
normalNodes[i]->set_attribute("z", Glib::ustring::format(n.getZ()));
|
||||
}
|
||||
|
||||
void Triangle::setTexCoords(unsigned int i, const TexCoords &t) {
|
||||
texCoords[i] = t;
|
||||
|
||||
if(!texCoordsNodes[i]) {
|
||||
if(normalNodes[i])
|
||||
texCoordsNodes[i] = triangleNode->add_child(static_cast<xmlpp::Node*>(normalNodes[i]), "texcoords");
|
||||
else
|
||||
texCoordsNodes[i] = triangleNode->add_child(static_cast<xmlpp::Node*>(vertexNodes[i]), "texcoords");
|
||||
}
|
||||
|
||||
texCoordsNodes[i]->set_attribute("s", Glib::ustring::format(t.getS()));
|
||||
|
||||
if(t.getCoordCount() >= 2)
|
||||
texCoordsNodes[i]->set_attribute("t", Glib::ustring::format(t.getT()));
|
||||
else
|
||||
texCoordsNodes[i]->remove_attribute("t");
|
||||
|
||||
if(t.getCoordCount() >= 3)
|
||||
texCoordsNodes[i]->set_attribute("r", Glib::ustring::format(t.getR()));
|
||||
else
|
||||
texCoordsNodes[i]->remove_attribute("r");
|
||||
|
||||
if(t.getCoordCount() >= 4)
|
||||
texCoordsNodes[i]->set_attribute("q", Glib::ustring::format(t.getQ()));
|
||||
else
|
||||
texCoordsNodes[i]->remove_attribute("q");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,25 +50,34 @@ class Triangle {
|
|||
Triangle(xmlpp::Element *node);
|
||||
|
||||
const Vertex& getVertex(unsigned int i) const {return vertices[i%3];}
|
||||
void setVertex(unsigned int i, Vertex v) {vertices[i%3] = v;}
|
||||
void setVertices(Vertex v[3]) {
|
||||
vertices[0] = v[0]; vertices[1] = v[1]; vertices[2] = v[2];
|
||||
void setVertex(unsigned int i, const Vertex &v);
|
||||
|
||||
void setVertices(Vertex *v) {
|
||||
for(int i = 0; i < 3; ++i)
|
||||
setVertex(i, v[i]);
|
||||
}
|
||||
|
||||
const Vector& getNormal(unsigned int i) const {return normals[i%3];}
|
||||
void setNormal(unsigned int i, Vector n) {normals[i%3] = n;}
|
||||
void setNormals(Vector n[3]) {
|
||||
normals[0] = n[0]; normals[1] = n[1]; normals[2] = n[2];
|
||||
void setNormal(unsigned int i, const Vector &n);
|
||||
|
||||
void setNormals(Vector *n) {
|
||||
for(int i = 0; i < 3; ++i)
|
||||
setNormal(i, n[i]);
|
||||
}
|
||||
|
||||
const TexCoords& getTexCoords(unsigned int i) const {return texCoords[i%3];}
|
||||
void getTexCoords(unsigned int i, TexCoords t) {texCoords[i%3] = t;}
|
||||
void getTexCoords(TexCoords t[3]) {
|
||||
texCoords[0] = t[0]; texCoords[1] = t[1]; texCoords[2] = t[2];
|
||||
void setTexCoords(unsigned int i, const TexCoords &t);
|
||||
|
||||
void setTexCoords(TexCoords *t) {
|
||||
for(int i = 0; i < 3; ++i)
|
||||
setTexCoords(i, t[i]);
|
||||
}
|
||||
|
||||
bool isVisible() const {return visible;}
|
||||
void setVisible(bool vis) {visible = vis;}
|
||||
void setVisible(bool vis) {
|
||||
visible = vis;
|
||||
triangleNode->set_attribute("visible", vis ? "true" : "false");
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ CXXFLAGS = @CXXFLAGS@
|
|||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
|
|
@ -107,7 +106,6 @@ LTLIBOBJS = @LTLIBOBJS@
|
|||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@ CXXFLAGS = @CXXFLAGS@
|
|||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
|
|
@ -125,7 +124,6 @@ LTLIBOBJS = @LTLIBOBJS@
|
|||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
|
|
|
|||
Reference in a new issue