You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(30) |
Oct
(60) |
Nov
(17) |
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(33) |
Feb
(18) |
Mar
(3) |
Apr
(5) |
May
(6) |
Jun
(34) |
Jul
(54) |
Aug
(33) |
Sep
(36) |
Oct
(33) |
Nov
(40) |
Dec
(6) |
| 2009 |
Jan
(37) |
Feb
(38) |
Mar
(31) |
Apr
(23) |
May
(24) |
Jun
(2) |
Jul
(6) |
Aug
(5) |
Sep
(1) |
Oct
(14) |
Nov
(12) |
Dec
(26) |
| 2010 |
Jan
(23) |
Feb
(17) |
Mar
(17) |
Apr
(2) |
May
(10) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(2) |
| 2011 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
|
Dec
|
|
From: <and...@us...> - 2007-09-17 07:10:39
|
Revision: 380
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=380&view=rev
Author: andy_miller
Date: 2007-09-17 00:10:37 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Linux Shell Scripts -- Work in Progress
Added Paths:
-----------
trunk/python-ogre/scripts/00-PreReqs.sh
trunk/python-ogre/scripts/01-RetrieveSource.sh
trunk/python-ogre/scripts/02-ExtractAndPatch.sh
trunk/python-ogre/scripts/03-BuildBaseLibs.sh
trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh
trunk/python-ogre/scripts/05-BuildTools.sh
trunk/python-ogre/scripts/06-GenerateCode.sh
trunk/python-ogre/scripts/07-BuildModules.sh
trunk/python-ogre/scripts/config.sh
trunk/python-ogre/scripts/master.sh
trunk/python-ogre/scripts/ogre_cvs2.sh
trunk/python-ogre/scripts/setup.sh
Added: trunk/python-ogre/scripts/00-PreReqs.sh
===================================================================
--- trunk/python-ogre/scripts/00-PreReqs.sh (rev 0)
+++ trunk/python-ogre/scripts/00-PreReqs.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+sudo apt-get install g++ libfreetype6-dev libpcre3-dev autoconf automake1.9 libgl1-mesa-dev libx11-dev \
+libglut3-dev libtool libxaw7-dev libxxf86vm-dev \
+libxrandr-dev cvs subversion libxt-dev libexpat1-dev python python-dev \
+python-celementtree libglew-dev libzzip-dev scons
Property changes on: trunk/python-ogre/scripts/00-PreReqs.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/01-RetrieveSource.sh
===================================================================
--- trunk/python-ogre/scripts/01-RetrieveSource.sh (rev 0)
+++ trunk/python-ogre/scripts/01-RetrieveSource.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,51 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo "Retrieving sources"
+#
+# Get all sources
+#
+pushd $DOWNLOADS
+echo " -- Getting bundles"
+$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz
+$WGET http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz
+$WGET http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip
+$WGET http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz
+$WGET http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz
+$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz
+$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz
+$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-4.tar.bz2
+$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip
+$WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2
+$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz
+$WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
+$WGET http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz
+popd
+cd $INSTALL_DIR
+echo " -- getting OgreAL"
+svn co https://ogreal.svn.sourceforge.net/svnroot/ogreal/trunk/OgreAL-Eihort OgreAL
+echo " -- getting NxOgre"
+svn co http://latest.nxogre.org/nxogre3/ NxOgre
+echo " -- getting pygccxml"
+svn co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml
+echo " -- getting python-ogre"
+svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
+echo " -- getting quickgui"
+svn co --username anyone --password nopassword svn://www.stellarcommand.com/QuickGUI/trunk/src/ quickgui
+echo " -- getting gccxml"
+cvs -z3 -q -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml
+echo " -- getting ogreode"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
+echo " -- getting ogrenewt"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt
+echo " -- getting videoplugins"
+cvs -z3 -q -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/videoplugin
+
+echo ""
+echo "======= Sources Retrieved ======="
+echo ""
+
+
Property changes on: trunk/python-ogre/scripts/01-RetrieveSource.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
===================================================================
--- trunk/python-ogre/scripts/02-ExtractAndPatch.sh (rev 0)
+++ trunk/python-ogre/scripts/02-ExtractAndPatch.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,83 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo " == extracting =="
+echo " -- Unpacking OGRE"
+tar jxf $DOWNLOADS/ogre-linux_osx-v1-4-4.tar.bz2
+echo " -- Unpacking Boost"
+tar jxf $DOWNLOADS/boost_1_34_0.tar.bz2
+echo " -- Unpacking CEGUI"
+tar zxf $DOWNLOADS/CEGUI-0.5.0b.tar.gz
+echo " -- Unpacking OIS"
+tar zxf $DOWNLOADS/ois-1.0RC1.tar.gz
+echo " -- Unpacking FreeImage"
+unzip -q -o $DOWNLOADS/FreeImage393.zip
+echo " -- Unpacking Newton"
+tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz
+echo " -- Unpacking ODE"
+unzip -q -o $DOWNLOADS/ode-src-0.8.zip
+
+echo " -- Unpacking CG"
+pushd $ROOT
+echo "Installing Cg"
+tar zxf $DOWNLOADS/Cg-1.5_Aug2007_x86.tar.gz
+popd
+#
+# install bjam
+#
+echo " -- Unpacking bjam"
+rm -r -f boost-jam-3.1.13-1-linuxx86
+tar -xvzf $DOWNLOADS/boost-jam-3.1.13-1-linuxx86.tgz --overwrite
+mv boost-jam-3.1.13-1-linuxx86/bjam $PREFIX/bin
+
+#
+# install cmake
+#
+echo " -- Unpacking cmake"
+tar -xvzf $DOWNLOADS/cmake-2.4.6-Linux-i386.tar.gz --overwrite
+cd cmake-2.4.6-Linux-i386
+cp * $PREFIX -r
+cd ..
+
+
+echo " -- Patching OgreOde"
+cd ogreaddons/ogreode
+patch -s -i ../../python-ogre/patch/ogreode.patch -p0
+cd $INSTALL_DIR
+echo " -- Patching OgreNewt"
+cd ogreaddons/ogrenewt
+patch -s -i ../../python-ogre/patch/ogrenewt.patch -p0
+cp SConscript OgreNewt_Main
+rm -r ./OgreNewt_Main/inc/boost
+cd $INSTALL_DIR
+
+#
+# Install Newton
+#
+echo " -- Installing Newton to OgreNewt and root"
+cp newtonSDK/sdk/Newton.h $PREFIX/include
+cp newtonSDK/sdk/*.a $PREFIX/lib
+cp newtonSDK/sdk/*.a ogreaddons/ogrenewt
+
+echo " -- Patching Boost"
+chmod -R +rw boost_1_34_0
+cp -r python-ogre/boost/* boost_1_34_0
+
+echo " -- Patching Ogre"
+patch -s -i ./python-ogre/patch/ogre.patch -p0
+
+echo " -- Patching CEGUI"
+pushd CEGUI-0.5.0
+patch -s -i ../python-ogre/patch/cegui.patch -p0
+echo "EMPTY" >>./INSTALL
+echo "EMPTY" >>./NEWS
+popd
+
+echo
+echo "== Finished Extraction and Patching =="
+echo
+
+
Property changes on: trunk/python-ogre/scripts/02-ExtractAndPatch.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/03-BuildBaseLibs.sh
===================================================================
--- trunk/python-ogre/scripts/03-BuildBaseLibs.sh (rev 0)
+++ trunk/python-ogre/scripts/03-BuildBaseLibs.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,59 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo " == Building base libraries == "
+#
+# Install CEGUI (Crazy Eddie's GUI)
+#
+echo " -- Building CEGUI"
+pushd CEGUI-0.5.0
+aclocal
+#patch -q -i ../python-ogre/patch/cegui.patch -p0
+#echo "EMPTY" >>./INSTALL
+#echo "EMPTY" >>./NEWS
+automake
+./configure --prefix=$PREFIX --enable-freeimage=yes --disable-samples --without-ogre-renderer
+make
+make install
+popd
+
+#
+# Install OIS (Object Oriented Input System)
+#
+echo " -- Builing OIS"
+pushd ois-1.0RC1
+./bootstrap
+./configure --prefix=$PREFIX
+make
+make install
+popd
+
+
+#
+# Install and build ODE
+#
+echo " -- Building ODE"
+pushd ode-0.8
+chmod +x autogen.sh
+./autogen.sh
+./configure --prefix=$PREFIX
+make
+make install
+popd
+
+#
+# Install Ogre (Object Oriented Graphics Rendering Engine)
+#
+echo " -- Building Ogre"
+pushd ogrenew
+./bootstrap
+./configure --prefix=$PREFIX
+make
+make install
+popd
+
+echo
+echo " ==== Finished building base libraries ===="
Property changes on: trunk/python-ogre/scripts/03-BuildBaseLibs.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh
===================================================================
--- trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh (rev 0)
+++ trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo " == Building additional libraries == "
+#
+# Install and build OgreOde
+#
+echo " -- Building Ogreode"
+pushd ogreaddons/ogreode
+chmod +x autogen.sh
+./autogen.sh
+./configure --prefix=$PREFIX
+make
+make install
+popd
+
+#
+# Install and build OgreNewt
+#
+echo " -- Building OgreNewt"
+pushd ogreaddons/ogrenewt
+scons prefix=$PREFIX boost=$PREFIX/include/boost-1_34 install
+popd
+
+#
+# OgreAl
+#
Property changes on: trunk/python-ogre/scripts/04-BuildAdditionalLibs.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/05-BuildTools.sh
===================================================================
--- trunk/python-ogre/scripts/05-BuildTools.sh (rev 0)
+++ trunk/python-ogre/scripts/05-BuildTools.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,62 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo " === Building Tools ==="
+
+#
+# build GCC_XML
+#
+echo " -- building GCC_XML"
+mkdir -p gccxml-build
+cd gccxml-build
+cmake ../gccxml -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX
+make
+make install
+cd ..
+
+
+#
+# build and install boost
+#
+echo " -- building boost"
+cd boost_1_34_0
+./configure --with-libraries=python --prefix=$PREFIX
+cat << EOF > boost.patch
+--- Makefile 2007-05-12 12:10:17.000000000 -0300
++++ Makefile.new 2007-05-12 12:10:52.000000000 -0300
+@@ -1,6 +1,4 @@
+-BJAM=./tools/jam/src/bin.linuxx86
+-don't know how to make trie.c
+-...skipped bjam for lack of trie.c.../bjam
++BJAM=bjam
+BJAM_CONFIG=release
+PREFIX=/usr/local
+EPREFIX=/usr/local
+EOF
+patch -p0 < boost.patch
+sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost/python/detail/preprocessor.hpp
+make
+make install
+cd $INSTALL_DIR
+
+## Scons
+echo " -- installing SCONs"
+rm -rf scons-0.96.96
+tar -xvzf $DOWNLOADS/scons-0.96.96.tar.gz --overwrite
+cd scons-0.96.96
+python setup.py install --prefix=$PREFIX
+cd ..
+
+# py++
+echo " -- installing PY++"
+cd pygccxml/pygccxml_dev
+python setup.py install --prefix=$PREFIX
+cd ../pyplusplus_dev
+python setup.py install --prefix=$PREFIX
+cd $INSTALL_DIR
+
+echo
+echo " ==== Done building tools ===="
Property changes on: trunk/python-ogre/scripts/05-BuildTools.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/06-GenerateCode.sh
===================================================================
--- trunk/python-ogre/scripts/06-GenerateCode.sh (rev 0)
+++ trunk/python-ogre/scripts/06-GenerateCode.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+echo "=== generating code ==="
+echo ' -- creating OGRE code'
+cd python-ogre/code_generators/ogre
+python generate_code.py > build.out
+cd ..
+echo ' -- creating OGRErefapp code'
+cd ogrerefapp
+python generate_code.py > build.out
+cd ..
+#echo ' -- creating OgreAL code'
+#cd ogreal
+#python generate_code.py > build.out
+#cd ..
+echo ' -- creating quickgui code'
+cd quickgui
+python generate_code.py > build.out
+cd ..
+echo ' -- creating OIS code'
+cd ois
+python generate_code.py > build.out
+cd ..
+echo ' -- creating OGREode code'
+cd ogreode
+python generate_code.py > build.out
+cd ..
+#echo ' -- creating OGREnewt code'
+#cd ogrenewt
+#python generate_code.py > build.out
+#cd ..
+echo ' -- creating ode code'
+cd ode
+python generate_code.py > build.out
+cd ..
+echo ' -- creating CEGUI code'
+cd cegui
+python generate_code.py > build.out
+cd $INSTALL_DIR
+echo
+echo "=== done building code ==="
Property changes on: trunk/python-ogre/scripts/06-GenerateCode.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/07-BuildModules.sh
===================================================================
--- trunk/python-ogre/scripts/07-BuildModules.sh (rev 0)
+++ trunk/python-ogre/scripts/07-BuildModules.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,13 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# master config setup
+source ./config.sh
+
+#
+# compile code
+#
+cd python-ogre
+scons PROJECTS=ogre,ois,quickgui,cegui,ogrerefapp
+cd ..
+
Property changes on: trunk/python-ogre/scripts/07-BuildModules.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/config.sh
===================================================================
--- trunk/python-ogre/scripts/config.sh (rev 0)
+++ trunk/python-ogre/scripts/config.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,28 @@
+INSTALL_DIR=`pwd`
+ROOT=$INSTALL_DIR/root
+PREFIX=$ROOT/usr
+DOWNLOADS=$INSTALL_DIR/downloads
+WGETARGS="-c -nc --tries=3 --random-wait"
+WGET="`which wget` $WGETARGS"
+
+TEMPFILE=`mktemp`
+cat << EOF > $TEMPFILE
+#!/usr/bin/python
+import sys
+version = sys.version.split('.')
+print "%s.%s" % (version[0], version[1])
+EOF
+PYTHONVERSION=`python $TEMPFILE`
+rm $TEMPFILE
+
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig
+export LD_LIBRARY_PATH=$PREFIX/lib
+export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
+export CXXFLAGS=$CFLAGS
+export PATH=$PATH:$PREFIX/bin
+export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
+
+mkdir -p $PREFIX
+mkdir -p $PREFIX/lib
+mkdir -p $PREFIX/include
+mkdir -p $DOWNLOADS
Property changes on: trunk/python-ogre/scripts/config.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/master.sh
===================================================================
--- trunk/python-ogre/scripts/master.sh (rev 0)
+++ trunk/python-ogre/scripts/master.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Part of the Python-Ogre installation
+
+# Run them all :)
+source ./00-PreReqs.sh
+source ./01-RetrieveSource.sh
+source ./02-ExtractAndPatch.sh
+source ./03-BuildBaseLibs.sh
+source ./04-BuildAdditionalLibs.sh
+source ./05-BuildTools.sh
+source ./06-GenerateCode.sh
+source ./07-BuildModules.sh
+
+
+
Property changes on: trunk/python-ogre/scripts/master.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/ogre_cvs2.sh
===================================================================
--- trunk/python-ogre/scripts/ogre_cvs2.sh (rev 0)
+++ trunk/python-ogre/scripts/ogre_cvs2.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,459 @@
+#!/bin/bash
+
+# May 17th -- extend to pathc ogreode and ogrenewt, build code for both, compile ode, ogreode (not ogrenewt yet)
+# Changes late May 15th - Corrected the environment variables definitions on the setup.sh file.
+# Changes May 15th - added Ode, Newton, Ogreode - adjusted for Boost 1.34 instead of CVS version
+#
+# Copyright (C) 2007
+# Renato Cunha <re...@ta...>
+# Andy Miller
+# Konrad Kleine
+#
+# http://www.python-ogre.org
+#
+# This script is based on Andy Miller's script, which was based on Konrad Kleine's
+# one. Since there wasn't a license associated, I decided to apply this script
+# to the GPL terms.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program on the LICENSE file; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
+
+# sudo ldconfig ~/development/root/usr/lib
+
+##
+## This script installs all packages and libraries needed to build Python-Ogre
+## It can be run as root, but you'll be on your own. You really should
+## run it as a normal user.
+##
+## PLEASE NOTE: You might need to interact with this program by entering
+## the root password and things like that.
+##
+## Another note: Unlike this script's predecessors I am going to assume you have
+## a working build environment (with gcc, g++, svn etc.) If this is not the case,
+## please install the following packages:
+##
+# sudo apt-get install g++ libfreetype6-dev libpcre3-dev autoconf automake1.9 libgl1-mesa-dev libx11-dev \
+# libglut3-dev libtool libxaw7-dev libxxf86vm-dev \
+# libxrandr-dev cvs subversion libxt-dev libexpat1-dev python python-dev \
+# python-celementtree libglew-dev libzzip-dev scons
+##
+
+echo -e "Python-Ogre Retrieve script\n"
+echo -e "This script will retrieve and build all the necessary software for\
+ Ogre and Python-Ogre\n"
+
+if [ $UID -eq 0 ]
+then
+ echo
+ echo "It's not good practice to start this script as root!"
+ echo
+ exit 1
+fi
+
+echo "Do you want to proceed? (Y/n)"
+
+read answer
+
+if [ "$answer" == "n" ]
+then
+ exit 0
+fi
+
+INSTALL_DIR=`pwd`
+ROOT=$INSTALL_DIR/root
+PREFIX=$ROOT/usr
+DOWNLOADS=$INSTALL_DIR/downloads
+WGETARGS="-c -nc --tries=3 --random-wait"
+WGET="`which wget` $WGETARGS"
+
+CONTROLretrieve="n"
+CONTROLextract="n"
+CONTROLpatchogre="n"
+CONTROLbuildfreeimage="n"
+CONTROLbuildutils="n"
+CONTROLbuildogre="n"
+CONTROLgeneratecode="y"
+CONTROLbuildpythonogre="n"
+
+#
+# Please don't edit below this point unless you know what you are doing
+#
+
+TEMPFILE=`mktemp`
+cat << EOF > $TEMPFILE
+#!/usr/bin/python
+import sys
+version = sys.version.split('.')
+print "%s.%s" % (version[0], version[1])
+EOF
+PYTHONVERSION=`python $TEMPFILE`
+rm $TEMPFILE
+
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig
+export LD_LIBRARY_PATH=$PREFIX/lib
+export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
+export CXXFLAGS=$CFLAGS
+export PATH=$PATH:$PREFIX/bin
+export PYTHONPATH=$PREFIX/lib/python$PYTHONVERSION/site-packages
+
+cat << EOF > setup.sh
+export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig"
+export LD_LIBRARY_PATH="$PREFIX/lib"
+export CFLAGS="-I$PREFIX/include -L$PREFIX/lib"
+export CXXFLAGS="$CFLAGS"
+export PATH="$PATH:$PREFIX/bin"
+export PYTHONPATH="$PREFIX/lib/python$PYTHONVERSION/site-packages"
+EOF
+
+mkdir -p $PREFIX
+mkdir -p $PREFIX/lib
+mkdir -p $PREFIX/include
+mkdir -p $DOWNLOADS
+
+if [ "$CONTROLretrieve" == "y" ]
+then
+{
+ echo "Retrieving sources" &&\
+#
+# Get all sources
+#
+pushd $DOWNLOADS && \
+$WGET http://developer.download.nvidia.com/cg/Cg_1.5/1.5.0/0022/Cg-1.5_Aug2007_x86.tar.gz && \
+$WGET http://www.cmake.org/files/v2.4/cmake-2.4.6-Linux-i386.tar.gz && \
+$WGET http://prdownloads.sourceforge.net/freeimage/FreeImage393.zip && \
+$WGET http://prdownloads.sourceforge.net/crayzedsgui/CEGUI-0.5.0b.tar.gz && \
+$WGET http://prdownloads.sourceforge.net/wgois/ois-1.0RC1.tar.gz && \
+$WGET http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz && \
+$WGET http://prdownloads.sourceforge.net/scons/scons-0.96.96.tar.gz && \
+$WGET http://prdownloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-4.tar.bz2 && \
+$WGET http://prdownloads.sourceforge.net/opende/ode-src-0.8.zip && \
+$WGET http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2 && \
+$WGET http://www.newtondynamics.com/downloads/newtonLinux-1.53.tar.gz && \
+# $WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8-1.i586.rpm &&
+$WGET http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
+# $WGET http://www.openal.org/openal_webstf/downloads/freealut-1.1.0-1.i586.rpm &&
+$WGET http://www.openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz &&\
+popd && \
+echo && \
+echo "Please just press Enter when you are asked for a password" && \
+echo && \
+svn co https://ogreal.svn.sourceforge.net/svnroot/ogreal/trunk/OgreAL-Eihort OgreAL
+svn co https://pygccxml.svn.sourceforge.net/svnroot/pygccxml pygccxml
+svn co https://python-ogre.svn.sourceforge.net/svnroot/python-ogre/trunk/python-ogre python-ogre
+svn co --username anyone --password nopassword svn://www.stellarcommand.com/QuickGUI/trunk/src/ quickgui
+#cvs -z3 -d :pserver:an...@ww...:/cvsroot/GCC_XML co gccxml
+cvs -z3 -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogreode
+cd ogreaddons/ogreode
+patch -i ../../python-ogre/patch/ogreode.patch -p0
+cd ../..
+cvs -z3 -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/ogrenewt
+cd ogreaddons/ogrenewt
+patch -i ../../python-ogre/patch/ogrenewt.patch -p0
+cp SConscript OgreNewt_Main
+rm -r ./OgreNewt_Main/inc/boost
+cd ../..
+cvs -z3 -d :pserver:ano...@cv...:/cvsroot/ogre co -P ogreaddons/videoplugin; }
+fi
+
+if [ "$CONTROLextract" == "y" ]
+then
+{
+echo "Unpacking OGRE"
+tar jxf $DOWNLOADS/ogre-linux_osx-v1-4-4.tar.bz2
+echo "Unpacking (and Patching) Boost"
+tar jxf $DOWNLOADS/boost_1_34_0.tar.bz2
+cp -r python-ogre/boost/* boost_1_34_0
+echo "Unpacking CEGUI"
+tar zxf $DOWNLOADS/CEGUI-0.5.0b.tar.gz
+echo "Unpacking OIS"
+tar zxf $DOWNLOADS/ois-1.0RC1.tar.gz
+echo "Unpacking FreeImage"
+unzip -o $DOWNLOADS/FreeImage393.zip
+echo "Unpacking Newton"
+tar zxf $DOWNLOADS/newtonLinux-1.53.tar.gz
+echo "Unpacking ODE"
+unzip -o $DOWNLOADS/ode-src-0.8.zip ; }
+fi
+
+if [ "$CONTROLpatchogre" == "y" ]
+then
+#
+# patch ogre etc
+#
+{ echo "Patching Ogre" &&\
+patch -i ./python-ogre/patch/ogre.patch -p0 ; }
+fi
+
+
+
+if [ "$CONTROLbuildfreeimage" == "y" ]
+then
+{
+
+#
+# Install FreeImage (For image loading in Ogre)
+#
+ pushd FreeImage
+ make
+cat << EOF > freeimage.patch
+--- Makefile.gnu 2006-12-20 15:22:08.000000000 -0200
++++ Makefile.gnu.new 2007-05-12 11:11:54.000000000 -0300
+@@ -58,11 +58,11 @@
+ \$(CC) -s -shared -Wl,-soname,\$(VERLIBNAME) -o \$@ \$(MODULES) \$(LIBRARIES)
+
+ install:
+- install -m 644 -o root -g root \$(HEADER) \$(INCDIR)
+- install -m 644 -o root -g root \$(STATICLIB) \$(INSTALLDIR)
+- install -m 755 -o root -g root \$(SHAREDLIB) \$(INSTALLDIR)
+- ln -sf \$(SHAREDLIB) \$(INSTALLDIR)/\$(VERLIBNAME)
+- ln -sf \$(VERLIBNAME) \$(INSTALLDIR)/\$(LIBNAME)
++ install -m 644 \$(HEADER) \$(DESTDIR)\$(INCDIR)
++ install -m 644 \$(STATICLIB) \$(DESTDIR)/\$(INSTALLDIR)
++ install -m 755 \$(SHAREDLIB) \$(DESTDIR)/\$(INSTALLDIR)
++ ln -sf \$(DESTDIR)/\$(SHAREDLIB) \$(DESTDIR)/\$(INSTALLDIR)/\$(VERLIBNAME)
++ ln -sf \$(DESTDIR)/\$(VERLIBNAME) \$(DESTDIR)/\$(INSTALLDIR)/\$(LIBNAME)
+ ldconfig
+
+ clean:
+EOF
+ patch -p0 < freeimage.patch
+ make DESTDIR=$ROOT install # On Freeimage's case, this is the right path
+ popd; }
+fi
+
+
+# cegui gets patched further down
+
+if [ "$CONTROLbuildogre" == "y" ]
+then
+#
+# Install Nvidia's Cg-Toolkit (Needed for shader support in Ogre)
+#
+{
+ pushd $ROOT
+ echo "Installing Cg"
+ tar zxvf $DOWNLOADS/Cg-1.5_Aug2007_x86.tar.gz
+ popd
+
+
+ #
+ # Install CEGUI (Crazy Eddie's GUI)
+ #
+ pushd CEGUI-0.5.0
+ aclocal
+ patch -i ../python-ogre/patch/cegui.patch -p0
+ echo "EMPTY" >>./INSTALL
+ echo "EMPTY" >>./NEWS
+ automake
+ ./configure --prefix=$PREFIX --enable-freeimage=yes --disable-samples --without-ogre-renderer
+ make
+ make install
+ popd
+
+ #
+ # Install OIS (Object Oriented Input System)
+ #
+ pushd ois-1.0RC1
+ ./bootstrap
+ ./configure --prefix=$PREFIX
+ make
+ make install
+ popd
+
+ #
+ # Install Newton
+ #
+ cp newtonSDK/sdk/Newton.h ogreaddons/ogrenewt/OgreNewt_Main/inc
+ cp newtonSDK/sdk/*.a ogreaddons/ogrenewt
+
+ #
+ # Install and build ODE
+ #
+ echo "Building ODE"
+ pushd ode-0.8
+ chmod +x autogen.sh
+ ./autogen.sh
+ ./configure --prefix=$PREFIX
+ make
+ make install
+ popd
+
+ #
+ # Install Ogre (Object Oriented Graphics Rendering Engine)
+ #
+ pushd ogrenew
+ ./bootstrap
+ ./configure --prefix=$PREFIX
+ make
+ make install
+ popd
+
+ #
+ # Install and build OgreOde
+ #
+ pushd ogreaddons/ogreode
+ chmod +x autogen.sh
+ ./autogen.sh
+ ./configure --prefix=$PREFIX
+ make
+ make install
+ popd ; }
+
+ #
+ # Install and build OgreNewt
+ #
+ pushd ogreaddons/ogrenewt/OgreNewt_Main/inc
+cat << EOF > newt.patch
+--- Newton.h
++++ Newton.h
+//********************************************************************
+// Newton Game dynamics
+// copyright 2000-2004
+// By Julio Jerez
+// VC: 6.0
+// One and only header file.
+//********************************************************************
+
+#ifndef NEWTON_H__736495_6495_076__INCLUDED_
+#define NEWTON_H__736495_6495_076__INCLUDED_
++#include "Ogre.h"
+
+// force all not visual studio platform to be in library form
+EOF
+ patch -p0 < newt.patch
+ popd
+
+ pushd ogreaddons/ogrenewt
+ scons prefix=$PREFIX boost=$PREFIX/include/boost-1_34 install
+ popd
+
+fi
+
+if [ "$CONTROLbuildutils" == "y" ]
+then
+ #
+ # install cmake
+ #
+ { echo && \
+ echo "Building tools" &&\
+ tar -xvzf $DOWNLOADS/cmake-2.4.6-Linux-i386.tar.gz --overwrite && \
+ cd cmake-2.4.6-Linux-i386 && \
+ cp * $PREFIX -r && \
+ cd .. && \
+
+ #
+ # build GCC_XML
+ #
+ mkdir -p gccxml-build && \
+ cd gccxml-build && \
+ cmake ../gccxml -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX && \
+ make && \
+ make install && \
+ cd .. &&\
+
+ #
+ # install bjam
+ #
+ rm -r -f boost-jam-3.1.13-1-linuxx86
+ tar -xvzf $DOWNLOADS/boost-jam-3.1.13-1-linuxx86.tgz --overwrite && \
+ mv boost-jam-3.1.13-1-linuxx86/bjam $PREFIX/bin
+
+ #
+ # build and install boost
+ #
+ cd boost_1_34_0
+ ./configure --with-libraries=python --prefix=$PREFIX
+cat << EOF > boost.patch
+--- Makefile 2007-05-12 12:10:17.000000000 -0300
++++ Makefile.new 2007-05-12 12:10:52.000000000 -0300
+@@ -1,6 +1,4 @@
+-BJAM=./tools/jam/src/bin.linuxx86
+-don't know how to make trie.c
+-...skipped bjam for lack of trie.c.../bjam
++BJAM=bjam
+ BJAM_CONFIG=release
+ PREFIX=/usr/local
+ EPREFIX=/usr/local
+EOF
+ patch -p0 < boost.patch
+ sed -i s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ boost/python/detail/preprocessor.hpp
+ make
+ make install
+ cd $INSTALL_DIR
+
+ ## Scons
+ rm -rf scons-0.96.96 &&\
+ tar -xvzf $DOWNLOADS/scons-0.96.96.tar.gz --overwrite && \
+ cd scons-0.96.96 && \
+ python setup.py install --prefix=$PREFIX && \
+ cd .. &&\
+
+ # py++
+ cd pygccxml/pygccxml_dev &&\
+ python setup.py install --prefix=$PREFIX &&\
+ cd ../pyplusplus_dev &&\
+ python setup.py install --prefix=$PREFIX &&\
+ cd $INSTALL_DIR ; }
+fi
+
+
+#
+# create code
+#
+if [ "$CONTROLgeneratecode" == "y" ]
+then
+{ echo "generating code" && \
+cd python-ogre/code_generators/ogre && \
+python generate_code.py > build.out && \
+cd .. &&\
+cd ogrerefapp && \
+python generate_code.py > build.out && \
+cd .. &&\
+cd ois && \
+python generate_code.py > build.out && \
+cd .. &&\
+cd quickgui && \
+python generate_code.py > build.out && \
+cd .. &&\
+cd ogreode && \
+python generate_code.py > build.out && \
+cd .. &&\
+#cd ogrenewt && \
+#python generate_code.py > build.out && \
+#cd .. &&\
+cd ode && \
+python generate_code.py > build.out && \
+cd .. &&\
+cd cegui && \
+python generate_code.py > build.out && \
+cd $INSTALL_DIR ; }
+fi
+#
+# compile code
+#
+if [ "$CONTROLbuildpythonogre" == "y" ]
+then
+{ echo "building python-ogre" && \
+cd python-ogre &&\
+scons PROJECTS=ogre,ois,quickgui,cegui,ogrerefapp&&\
+cd .. ;}
+fi
+
+#
+# install
+#
+
+#
+# check/update ldconfig
+#
Property changes on: trunk/python-ogre/scripts/ogre_cvs2.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/python-ogre/scripts/setup.sh
===================================================================
--- trunk/python-ogre/scripts/setup.sh (rev 0)
+++ trunk/python-ogre/scripts/setup.sh 2007-09-17 07:10:37 UTC (rev 380)
@@ -0,0 +1,6 @@
+export PKG_CONFIG_PATH=":/home/andy/development/root/usr/lib/pkgconfig:/home/andy/development/root/usr/lib/pkgconfig"
+export LD_LIBRARY_PATH="/home/andy/development/root/usr/lib"
+export CFLAGS="-I/home/andy/development/root/usr/include -L/home/andy/development/root/usr/lib"
+export CXXFLAGS="-I/home/andy/development/root/usr/include -L/home/andy/development/root/usr/lib"
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/home/andy/development/root/usr/bin:/home/andy/development/root/usr/bin"
+export PYTHONPATH="/home/andy/development/root/usr/lib/python2.5/site-packages"
Property changes on: trunk/python-ogre/scripts/setup.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-09-17 07:09:03
|
Revision: 379
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=379&view=rev
Author: andy_miller
Date: 2007-09-17 00:09:05 -0700 (Mon, 17 Sep 2007)
Log Message:
-----------
Linux updates
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-17 04:21:58 UTC (rev 378)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-17 07:09:05 UTC (rev 379)
@@ -4,16 +4,16 @@
## Boost stuff
## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
module_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
-
## lets assume that the base development directory is one level higher
BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-ROOT_DIR = os.path.join(BASE_DIR,'root')
+ROOT_DIR = os.path.join(BASE_DIR,'root')
+root_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
+LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
+LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
-LOCAL_LIB = os.path.join(ROOT_DIR,'/usr/lib')
-LOCAL_INCLUDE = os.path.join(ROOT_DIR, '/usr/include')
-PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost_1_34')
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_34')
#
PATH_LIB_Boost = LOCAL_LIB
@@ -29,21 +29,29 @@
# # ## Parent directories of the libraries
PATH_Ogre = os.path.join(BASE_DIR,'ogrenew')
-# # PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
-# # PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
-# # PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
-# # PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk/sdk')
+PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
+PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
+PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK/sdk')
# # PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
-# # PATH_ODE = os.path.join(BASE_DIR, 'opende/trunk')
-# # PATH_OGREAL= os.path.join(BASE_DIR, 'ogreal/trunk/OgreAL-Eihort')
-# # PATH_OGG = os.path.join(BASE_DIR, 'ogg')
-# # PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
-# # PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
-# # PATH_ALUT= os.path.join(BASE_DIR, 'freealut')
+PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
+PATH_OGREAL= os.path.join(BASE_DIR, 'OgreAL')
+PATH_OGG = os.path.join(BASE_DIR, 'ogg')
+PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
+PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
+PATH_ALUT= os.path.join(BASE_DIR, 'freealut')
PATH_OgreOde= os.path.join(BASE_DIR, 'OgreAddons/ogreode')
PATH_betagui= os.path.join(BASE_DIR, 'betagui')
# PATH_raknet= os.path.join(BASE_DIR, 'RakNet')
PATH_simplegui= os.path.join(module_dir, 'ThirdParty/simplegui')
+PATH_quickgui= os.path.join(BASE_DIR, 'Quickgui') ## note test for Quickgui SVN version
+PATH_plib = os.path.join(BASE_DIR, 'plib')
+PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
+PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
+PATH_PhysX= os.path.join(BASE_DIR, 'AGEIA Technologies/SDK/v2.7.2/SDKs')
+PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
+PATH_ogrevideoffmpeg = os.path.join(root_dir, 'ThirdParty','ffmpeg')
+PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
@@ -61,6 +69,7 @@
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( LOCAL_LIB ) #, 'Samples/Common/CEGUIRenderer/lib')
PATH_LIB_Ogre_OgreMain= os.path.join( LOCAL_LIB ) # PATH_Ogre, 'OgreMain/lib/Release' )
PATH_LIB_Ogre_Dependencies = os.path.join( LOCAL_LIB ) # , 'Dependencies/lib/Release')
+PATH_LIB_quickgui = os.path.join(PATH_quickgui, 'bin')
@@ -77,7 +86,16 @@
PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
PATH_LIB_betagui = PATH_betagui
PATH_LIB_simplegui = PATH_simplegui
-# PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
+# PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
+PATH_LIB_OPCODE = os.path.join( LOCAL_LIB )
+PATH_LIB_Bullet = os.path.join( LOCAL_LIB )
+PATH_LIB_plib = PATH_plib
+PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
+PATH_LIB_NxOgre= os.path.join(LOCAL_LIB )
+PATH_LIB_PhysX = os.path.join(PATH_PhysX,'lib/win32')
+PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
+PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
@@ -90,6 +108,7 @@
PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ODE') #os.path.join( PATH_ODE, 'include')
PATH_INCLUDE_ODESOURCE = '' # os.path.join( PATH_ODE, 'ode/src')
+PATH_INCLUDE_quickgui = os.path.join(PATH_quickgui,'QuickGUI','include')
PATH_INCLUDE_OgreAL = ''# os.path.join( PATH_OGREAL, 'include' )
PATH_INCLUDE_OPENAL = ''# os.path.join( PATH_OPENAL, 'include')
@@ -100,8 +119,32 @@
PATH_INCLUDE_OgreOde = os.path.join( PATH_OgreOde,'include')
PATH_INCLUDE_OgreOdePrefab= os.path.join( PATH_OgreOde,'prefab/include')
PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')
+PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
PATH_INCLUDE_betagui = PATH_betagui
PATH_INCLUDE_simplegui = PATH_simplegui
# PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
-PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples/Common/CEGUIRenderer/include')
+PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples/Common/CEGUIRenderer/include')
+PATH_INCLUDE_OPCODE = os.path.join( LOCAL_INCLUDE )
+PATH_INCLUDE_Bullet = os.path.join( LOCAL_INCLUDE )
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
+
+PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
+ ,os.path.join(BASE_DIR, 'vorbis', 'include')
+ ,os.path.join(PATH_OgreAddons,'videoplugin','theora','include')
+ ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include')
+ ]
+
+PATH_INCLUDE_PhysX= [ os.path.join(PATH_PhysX, 'Physics','include')
+ ,os.path.join(PATH_PhysX, 'Cooking','include')
+ ,os.path.join(PATH_PhysX, 'Foundation','include')
+ ,os.path.join(PATH_PhysX, 'PhysXLoader','include')
+ ,os.path.join(PATH_PhysX, 'NxCharacter','include')
+ ,os.path.join(PATH_PhysX, 'NxExtensions','include')
+ ]
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-09-17 04:21:58 UTC (rev 378)
+++ trunk/python-ogre/environment.py 2007-09-17 07:09:05 UTC (rev 379)
@@ -366,22 +366,6 @@
ModuleName='OgreOde'
active=True
-class fmod:
- version= "4.06"
- parent = "ogre/sound"
- include_dirs=[Config.PATH_Boost
- ,Config.PATH_INCLUDE_FMOD
- ]
- lib_dirs = [ Config.PATH_LIB_Boost
- ,Config.PATH_LIB_FMOD
- ]
-
- CCFLAGS = ' /D "NDEBUG" /D "WIN32" /D "_MBCS" '
- ModuleName = 'FMOD'
- CheckIncludes = ['fmod.h']
- active=False
-
-
class quickgui:
version="0.9.6"
parent="ogre/gui"
@@ -588,22 +572,27 @@
ModuleName="ogrevideoffmpeg"
active=True
-class ogredshow:
+class ogredshow:
version="0.1"
parent="ogre/addons"
cflags = ""
- include_dirs = [ Config.PATH_Boost,
- Config.PATH_INCLUDE_Ogre,
- Config.PATH_INCLUDE_ogredshow
- ]
- lib_dirs = [Config.PATH_LIB_Boost,
- Config.PATH_LIB_Ogre_OgreMain,
- Config.PATH_LIB_ogredshow
- ]
- CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain','Strmiids' , 'ole32']
ModuleName="ogredshow"
- active=True
+ if os.name == "nt":
+ include_dirs = [ Config.PATH_Boost,
+ Config.PATH_INCLUDE_Ogre,
+ Config.PATH_INCLUDE_ogredshow
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain,
+ Config.PATH_LIB_ogredshow
+ ]
+ CheckIncludes=[]
+ libs=[ Config.LIB_Boost, 'OgreMain','Strmiids' , 'ole32']
+ active=True
+ else:
+ active=False
+
+
############################################################################################
## Here is the master list....
@@ -617,7 +606,6 @@
, 'newton' : newton
, 'ogrerefapp' : ogrerefapp
, 'ogrenewt' : ogrenewt
- , 'fmod' : fmod
, 'ogreode' : ogreode
, 'ogreal' : ogreal
, 'quickgui' : quickgui
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-09-17 04:21:56
|
Revision: 378
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=378&view=rev
Author: andy_miller
Date: 2007-09-16 21:21:58 -0700 (Sun, 16 Sep 2007)
Log Message:
-----------
Linux Update to Config
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_posix.py
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-17 04:13:09 UTC (rev 377)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-09-17 04:21:58 UTC (rev 378)
@@ -41,7 +41,7 @@
# # PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
# # PATH_ALUT= os.path.join(BASE_DIR, 'freealut')
PATH_OgreOde= os.path.join(BASE_DIR, 'OgreAddons/ogreode')
-# # PATH_betagui= os.path.join(BASE_DIR, 'betagui')
+PATH_betagui= os.path.join(BASE_DIR, 'betagui')
# PATH_raknet= os.path.join(BASE_DIR, 'RakNet')
PATH_simplegui= os.path.join(module_dir, 'ThirdParty/simplegui')
@@ -77,7 +77,7 @@
PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
PATH_LIB_betagui = PATH_betagui
PATH_LIB_simplegui = PATH_simplegui
-PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
+# PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
@@ -103,5 +103,5 @@
PATH_INCLUDE_betagui = PATH_betagui
PATH_INCLUDE_simplegui = PATH_simplegui
-PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
+# PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples/Common/CEGUIRenderer/include')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-09-17 04:13:06
|
Revision: 377
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=377&view=rev
Author: andy_miller
Date: 2007-09-16 21:13:09 -0700 (Sun, 16 Sep 2007)
Log Message:
-----------
NxOgre enhancements - removed getActors* functions from Scene as Actors isn't exposed by library
Modified Paths:
--------------
trunk/python-ogre/code_generators/nxogre/generate_code.py
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-17 01:27:01 UTC (rev 376)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-17 04:13:09 UTC (rev 377)
@@ -162,6 +162,7 @@
,'::NxOgre::PhysXDriver::start'
,'::NxOgre::PhysXDriver::reset'
,'::NxOgre::PhysXDriver::hasHardware'
+
]
for e in excludes:
print "excluding ", e
@@ -171,8 +172,12 @@
names = ['_begin','_end', '_atEnd', '_next']
for f in main_ns.member_functions():
if f.name in names:
- print "excuding MF:", f.name, f
- f.exclude()
+ print "excluding MF:", f.name, f
+ f.exclude()
+ elif f.name.startswith('getActors'): # these return 'Actors' which doesn't exist
+ print "excluding MF:", f.name
+ f.exclude()
+
### Free Functions
excludes = []
for e in excludes:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-09-17 01:26:59
|
Revision: 376
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=376&view=rev
Author: andy_miller
Date: 2007-09-16 18:27:01 -0700 (Sun, 16 Sep 2007)
Log Message:
-----------
Added access to CEGUI.Window.setUserData and getUserData
Further NXOgre updates
Fix for correct QuickGui compiling and support for latest SVN
Modified Paths:
--------------
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
trunk/python-ogre/code_generators/ogrenewt/hand_made_wrappers.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/environment.py
Modified: trunk/python-ogre/code_generators/cegui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/generate_code.py 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/code_generators/cegui/generate_code.py 2007-09-17 01:27:01 UTC (rev 376)
@@ -145,6 +145,10 @@
print "Excluding Iterator", cls.name
CEGUI_ns.class_('OgreCEGUIResourceProvider').exclude() # it's _ogrePrivate..
+ ## Replaced these with 'useful' functions in the handwrappers - take and return python objects
+ CEGUI_ns.class_( "Window" ).member_functions("setUserData").exclude()
+ CEGUI_ns.class_( "Window" ).member_functions("getUserData").exclude()
+
global_ns.namespace( 'Ogre' ).class_('SceneManager').include(already_exposed=True)
global_ns.namespace( 'Ogre' ).class_('RenderWindow').include(already_exposed=True)
Modified: trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py 2007-09-17 01:27:01 UTC (rev 376)
@@ -353,7 +353,31 @@
bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
"""
+WRAPPER_DEFINITION_Window=\
+"""
+void
+Window_setUserData ( ::CEGUI::Window & me, PyObject * data ) {
+ me.setUserData ( data );
+ }
+
+PyObject *
+Window_getUserData ( ::CEGUI::Window & me) {
+ void * data = me.getUserData ( );
+ Py_INCREF( (PyObject *) data ); // I'm passing a reference to this object so better inc the ref :)
+ return (PyObject *) data;
+ }
+"""
+
+WRAPPER_REGISTRATION_Window =[
+ 'def ("setUserData", &::Window_setUserData );',
+ 'def ("getUserData", &::Window_getUserData);'
+ ]
+
+def apply_reg ( class_, code ):
+ for c in code:
+ class_.add_registration_code ( c )
+
def apply( mb ):
# # mb.add_declaration_code( WRAPPER_DEFINITION_General )
# # mb.add_registration_code( WRAPPER_REGISTRATION_General )
@@ -365,3 +389,7 @@
rt = mb.class_( 'String' )
rt.add_declaration_code( WRAPPER_DEFINITION_String )
rt.add_registration_code( WRAPPER_REGISTRATION_String )
+
+ rt = mb.class_( 'Window' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_Window )
+ apply_reg( rt, WRAPPER_REGISTRATION_Window )
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-17 01:27:01 UTC (rev 376)
@@ -102,6 +102,17 @@
,'::NxOgre::List<NxOgre::RemoteDebuggerConnection::Camera>::destroyAndEraseAll'
,'::NxOgre::List<NxOgre::RemoteDebuggerConnection::Camera>::dumpToConsole'
+
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::dumpToConsole'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::count'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::empty'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::insert'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::lock'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::isLocked'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::has'
+# ,'::NxOgre::Container<std::string, NxOgre::Joint*>::getFirst'
+
+
,'::NxOgre::UserAllocator::realloc'
# # # # not yet implemented in source
,'::NxOgre::WheelSet::attachNewWheel'
@@ -155,7 +166,13 @@
for e in excludes:
print "excluding ", e
main_ns.member_functions(e).exclude()
-
+
+ ## this is probably excessive :)
+ names = ['_begin','_end', '_atEnd', '_next']
+ for f in main_ns.member_functions():
+ if f.name in names:
+ print "excuding MF:", f.name, f
+ f.exclude()
### Free Functions
excludes = []
for e in excludes:
@@ -170,7 +187,7 @@
,'::NxOgre::Serialiser::SerialiserBase'
,'::NxOgre::UserAllocator'
,'::NxOgre::State'
-
+
# not yet implemented in source
]
for e in excludes:
@@ -180,15 +197,17 @@
## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
## so I have to look through and match on a class by class basis
excludeName = ['Container<NxOgre::Scene::Renderables, float>'
- ,'Container<std::string,NxOgre::Actor*>'
+ ,'Container<std::string, NxOgre::Actor*>'
,'List<NxOgre::CharacterHitReport*>'
,'List<NxOgre::RemoteDebuggerConnection::Camera>'
,'List<NxOgre::Blueprints::ActorBlueprint*>'
+ ,'Container<std::string, NxOgre::Joint*>'
]
for c in main_ns.classes():
# print c.decl_string
-# print c.name
+ print ("Checking:",c.name)
if c.name in excludeName:
+ print ("SPECIAL excluding ", c.name)
c.exclude()
# a temporary fix for container based classes -- still an issue with them though...
# AND this is an overkill -- not all classes need these removed...
Modified: trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h 2007-09-17 01:27:01 UTC (rev 376)
@@ -96,8 +96,6 @@
typedef NxOgre::Container<NxOgre::NxString, NxOgre::FluidDrain*> FluidDrains;
typedef NxOgre::Container<NxOgre::NxString, NxOgre::FluidEmitter*> FluidEmitters;
typedef NxOgre::Container<NxOgre::NxString, NxOgre::SoftBody*> SoftBodies;
-// typedef std::map<NxOgre::TI, NxOgre::Containee > Type;
-// typedef std::list<NxOgre::TT> Type;
typedef std::pair<NxOgre::NxString,NxOgre::NxString> Parameter;
typedef std::vector<Parameter> Parameters;
typedef Ogre::String NxString;
@@ -109,7 +107,7 @@
typedef NxOgre::Container<NxOgre::NxString, NxOgre::Cloth*> Cloths;
typedef NxOgre::Container<NxOgre::NxErrorIndex, NxOgre::ErrorReporter*> ErrorReporterList;
typedef NxOgre::Container<NxOgre::NxString, NxOgre::Helper*> Helpers;
-typedef NxOgre::Container<NxOgre::NxString, NxOgre::Joint*> Joints;
+typedef NxOgre::Container<NxOgre::NxString, NxOgre::Joint*> JointsClass;
typedef NxOgre::Container<NxOgre::NxString, NxOgre::Material*> MaterialList;
// typedef NxOgre::Container<NxOgre::NxMaterialIndex, NxOgre::Material*> MaterialListByIndex;
// typedef NxOgre::Container<NxOgre::NxString, NxOgre::NxMaterialIndex> MaterialPair;
@@ -127,3 +125,7 @@
typedef std::vector<std::pair<Ogre::Vector3, unsigned>, std::allocator<std::pair<Ogre::Vector3, unsigned> > > VectorPairVector3;
typedef std::set<Ogre::Entity*,std::less<Ogre::Entity*>,std::allocator<Ogre::Entity*> > SetEntity;
typedef NxOgre::Material NxOgreMaterial;
+typedef std::map<unsigned, NxOgre::Container<unsigned, NxOgre::Joint*>::Containee, std::less<unsigned>, std::allocator<std::pair<unsigned const, NxOgre::Container<unsigned, NxOgre::Joint*>::Containee> > >\
+ MapContainerJointContainee;
+typedef std::map<unsigned short, NxOgre::Container<unsigned short, NxOgre::DominanceGroup*>::Containee, std::less<unsigned short>, std::allocator<std::pair<unsigned short const, NxOgre::Container<unsigned short, NxOgre::DominanceGroup*>::Containee> > >\
+ MapContainerDominanceGroupContainee;
\ No newline at end of file
Modified: trunk/python-ogre/code_generators/ogrenewt/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/hand_made_wrappers.py 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/code_generators/ogrenewt/hand_made_wrappers.py 2007-09-17 01:27:01 UTC (rev 376)
@@ -449,6 +449,7 @@
cs = mb.namespace( 'BasicJoints' ).class_("Slider" )
cs.add_declaration_code( WRAPPER_DEFINITION_Slider )
apply_reg (cs, WRAPPER_REGISTRATION_Slider )
+
cs = mb.namespace( 'BasicJoints' ).class_("Universal" )
cs.add_declaration_code( WRAPPER_DEFINITION_Universal )
apply_reg (cs, WRAPPER_REGISTRATION_Universal )
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-09-17 01:27:01 UTC (rev 376)
@@ -77,7 +77,7 @@
excludes=[\
'::QuickGUI::QuadContainer::_populateRenderObjectList'
,'::QuickGUI::QuadContainer::_updateRenderQueue'
- ,'::QuickGUI::GUIManager::getDefaultFont'
+ ##,'::QuickGUI::GUIManager::getDefaultFont'
]
for e in excludes:
print "excluding function", e
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-09-12 13:40:08 UTC (rev 375)
+++ trunk/python-ogre/environment.py 2007-09-17 01:27:01 UTC (rev 376)
@@ -152,6 +152,7 @@
moduleName='OGRE'
cflags = ""
moduleParentLocation = "renderer"
+ parent = "ogre/renderer"
dependsOn = ['boost']
myLibraryPaths = []
myLibraries = ['OgreMain']
@@ -384,7 +385,8 @@
class quickgui:
version="0.9.6"
parent="ogre/gui"
- CCFLAGS = ' /D "WIN32" /D "NDEBUG", /D "WINDOWS"' ###/D "OGRE_PLATFORM_WIN32"' # /D "FT2_BUILD_LIBRARY"
+ ## note the defined for _QuickGUIExport forces non dll usage
+ CCFLAGS = ' /D WIN32 /D NDEBUG /D WINDOWS /D _QuickGUIExport="" '
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-09-12 13:40:20
|
Revision: 375
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=375&view=rev
Author: andy_miller
Date: 2007-09-12 06:40:08 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
General updates for 1.1 release
Support for latest Quickgui and NXogre (from their SVN's)
Initial wrapping for navi GUI -- not yet complete however works 'ok'
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/scripts/MakeRelease.bat
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/code_generators/navi/
trunk/python-ogre/code_generators/navi/NxOgre.log.html
trunk/python-ogre/code_generators/navi/customization_data.py
trunk/python-ogre/code_generators/navi/generate_code.py
trunk/python-ogre/code_generators/navi/hand_made_wrappers.py
trunk/python-ogre/code_generators/navi/python_navi.h
trunk/python-ogre/code_generators/navi/python_navi_aliases.h
trunk/python-ogre/code_generators/navi/python_navi_sizeof.h
trunk/python-ogre/code_generators/navi/register_exceptions.py
trunk/python-ogre/scripts/MakeSnapShot.bat
trunk/python-ogre/scripts/PythonOgreInstallCreator.iss.1.0
trunk/python-ogre/scripts/PythonOgreInstallCreator.iss.org
trunk/python-ogre/scripts/UpdateDLLs.bat
Removed Paths:
-------------
trunk/python-ogre/scripts/PythonOgreInstallCreator.iss
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -47,7 +47,9 @@
PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
PATH_ogredshow = os.path.join(root_dir, 'ThirdParty','dshow')
PATH_plib = os.path.join(BASE_DIR, 'plib')
+PATH_navi = os.path.join(BASE_DIR, 'navi','Navi')
+
#
# it's time for the SDK version
if SDK:
@@ -96,6 +98,7 @@
PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
PATH_LIB_ogredshow = PATH_ogredshow
PATH_LIB_plib = PATH_plib
+PATH_LIB_navi= os.path.join(PATH_navi, 'lib')
if SDK:
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
@@ -138,6 +141,7 @@
PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
PATH_INCLUDE_ogredshow = PATH_ogredshow
PATH_INCLUDE_plib = PATH_plib
+PATH_INCLUDE_navi = os.path.join (PATH_navi,'include')
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
Added: trunk/python-ogre/code_generators/navi/NxOgre.log.html
===================================================================
--- trunk/python-ogre/code_generators/navi/NxOgre.log.html (rev 0)
+++ trunk/python-ogre/code_generators/navi/NxOgre.log.html 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,29 @@
+<html>
+ <head>
+ <title>NxOgre Log - NxOgre 0.9-28</title>
+ <style>
+ body {background:#121212;color:white;font-family:Helvetica,sans-serif;font-size:80%;padding-top:1em;}
+ h2 {font-size:145%;margin:0;padding:0;color:#999;}
+ h2 small {padding-left:1em;}
+ div.log {width:75%;margin:0 auto 2em auto;padding:1em 2em 2em 1em;border-left:2px solid #333;background-color:#181818;}
+ div.conflict {border-left:2px solid hotpink;}
+ div.error {border-left:2px solid red;}
+ div.error h2{color:orangered}
+ div.leak {border-left:2px solid orangered;}
+ div.debug {border-left:2px solid #333;}
+ div.debug h2 {font-size:125%;color:#444;}
+ div.warning {border-left:2px solid SaddleBrown;}
+ span.item{font-size:85%;background:red;}
+ small {font-size:95%;color:#333;}
+ div.et0{border-left:2px solid red;}
+ div.et99{}
+ pre {font-size:1.1em;padding:0.5em 0 0 0;margin:0;overflow:auto;}
+ h1 {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPoAAABPCAMAAAD1NSjJAAAAGFBMVEUKCgr+/v4tLS1VVVWEhITY2Nitra3///+Y5SUzAAAACHRSTlP/////////AN6DvVkAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAF+0lEQVR42u2c2YKkIAxFYzb+/4/nQUGWhMWy26rq4W2qo3hYArmBgfBnC/xtdExl1BC71ZVqEIn4LESE8Dw6bKnwwHi3WvxmIFbZjCLKBO+CvuHd6EC6dQvjm6DLzego27AovAX6Rrei8zZTBN8CXeBG9IxcmOh0p1hOf4Fn0WXs6RbRMXozQgDD6RPLzFj7eXSSoadbQwcZ+jGIlcKj6BAHPtyETjs5zLQPPYsepybfhK5T03hfA/RhdBgN+SX0fabrTS30w+jJL92CzpMjmSb2Uj+PHrTvcJfQZRJpH2v0NPrA062gH7MHJtuIn0YfeLol9GlbfcjPVejQXWdX0HHalsfBw2+gH07H6YR19BnPTTe4eAAAeBG96+lyS0/bgOMPs2tbbG2oN7msqqqcJI2yPjj/iUc8INpuHAEpvYm5lEcadOhEFIZXQHtNk6PXeRo9exGytCE9lD2S2gvVDYCBuImZ5WyeBj0OeR4NeDW7lWKL0CJ6ggK1Q3pp0cUIi3GoFSh66HHI4wDd3H2fP9L03ry0tD9YwEJXQxCQqgutQh66P+RLSzLMOHXSRXTIyFVVNRGpgU5RC0BMQpha5NmbUrca6LEpaYAeg9J2RcNwGZ2TsoEAAQLEsF6NXt9No7R5zHopVmllwt37AyCxZs1jobthTGWJjZmejTG/Nc/Rj1dWkS60mgZZjk1PGyqbpRYI0EF3F/fakiuzfApcQ1cnxmcPvXTp555YPNGPko2J7i3ujVcoPR3k9V1CB9fLqI1emVLsis7SqnHzaKOj7ekay3LLVoSp8+h4PuZ/MdnoZLxKUt+hXx146E4Y400NzbUJeAGd3YfqpZTMvonovbAx7Y0cdNvTGZbnxx7DHZYViGzAd75YLXQNDnontzFCtz2dYQlJ16lYr6D3OostdO6ic0dIYB/d9HSWZfxwqBSHS+idaI8s9NoPo6oqF3PIGT89dMvTmZaHrMiV9XV0DZfRDffhSyMuuuXpTMt864nhJfRetIcWOl6ROsfohqfrjo/qo6+j0+Pohqfrj49ycjyKfmwz2SwyRm/DmPnxMZhuv4PeTer30Q8kgZE2R8bvn43eZGMGvU4fhC7QR68FG8cyBZBtGDAjUJ0bwt+Z6/sRrkGv14LNyMNr8+ij6LgoRvcW9+G6TjW6TqPDu6GX2RjTcq+G6+03TJzIKraDA3S6bV2fRI+jWV30mGqoQ6kqkBuij/zDBXR6Db0IY6zILSkzVVQZZjOtcB6rwNU9PF7Zw0+j557OjdeziBPbKTyTkuUwiNx4HZ1fRM89nafS5ELkslaB3VHVlyqw25yOoyEiIppBzzydJ1tjLh1yUf0YPVcl/UliC1QDdBspNssYPfN0jWUJW+nyk0ejuMnjof8Rs+g9RzMTvjR7utqy1ga5FWiHLr5YCfwcJS+h9xRZWEFPYYydfaHakBdWmJLW1+FlDb2zViS3OoOeIndayLml/uye9s8TQfYry8TzLHrn/BaNFFlzyGthyW6m9fjtTB06R3NS6l+rnEadc9NtFT1OEC/Axll0KJLeYA/3zFCrp0SZidKxcCIiVpGtDfk0HX6IY+toIFlDj3ULn6eyAVIqWmEWvQyAIeuJWuanfMjTNlfICgNFlfk8Ns9r6MVZfFVVzZvaz7QOuj07SyPeWRrI0poj1YDM4L9qHVhE78oVFObRiy8CM7duenngEXw9r80TJUJhGd1vd6Gwgh60QPdccesDAJ2rXseZB2Mhqy9JCUO4gB6AjJpFY5X7FT8iGt04A6RYIAQgRO+Z3RCrZ5lVVY6iykzmtZD4CmYVEdF02K1Ch5lvTgfwzkqzk3O/eg4dUpk2bhOk1+ttI7fPKK+gu0Hrf/T/6M/yMTPbt8O+Ht3nw29H9+/B3H876M3muq/szKqcH4vuXnqbl/U/Fd1Vdng6hfep6GCfbQXebp/qb7eux2RPvoWFGMzd+/8bvBt6kipE9vR4rjDce/vz7XZzNCXmfOdG1mPXu2/8vuEeHg1l55Qpvzx8ASRO13Tya37fj17qGj9WQfiz5R/SFale8MO0+QAAAABJRU5ErkJggg==") top center no-repeat;padding-top:85px;text-align:center;font-size:1.2em;}
+ a#jump {position:absolute;top:0.5em;right:0.5em;color:white;text-decoration:none;}
+ a#jump:hover {text-decoration:underline;}
+ h5 {width:80%;margin:0 auto 2em auto;padding:1.25em 0 0.25em 0;border-bottom:2px solid red;text-align:center;}
+ div#e {width:90%;margin:0 auto 2em auto;padding:1.25em 0 0 0;font-size:0.9em;text-align:center;}
+ div#key {margin:0 auto 2em auto;display:table;font-size:0.75em;} div#key span{display:table-cell;margin-left:24px;width:12px;height:1em;font-size:1px;border-left:32px solid #121212;border-right:8px solid #121212;} </style>
+ </head>
+<body>
+<h1>Log<br /><small>NxOgre 0.9-28</small></h1><a href="#bottom" id="jump">Jump to bottom</a><div id="key"><span style="background-color:#333;"> </span> Debug <span style="background-color:Indigo;"> </span> Warning<span style="background-color:hotpink;"> </span> Conflict<span style="background-color: red;"> </span> Error <span style="background-color: orangered;"> </span> Leaks</div>
Added: trunk/python-ogre/code_generators/navi/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/navi/customization_data.py (rev 0)
+++ trunk/python-ogre/code_generators/navi/customization_data.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,9 @@
+
+def header_files( version ):
+ return [ 'navi.h'
+
+ ]
+
+def huge_classes( version ):
+ return []
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/navi/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/navi/generate_code.py (rev 0)
+++ trunk/python-ogre/code_generators/navi/generate_code.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,517 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+
+import os, sys, time, shutil
+
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+import register_exceptions
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+
+MAIN_NAMESPACE = 'NaviLibrary'
+
+## small helper function
+def docit ( general, i, o ):
+ docs = "Python-Ogre Modified Function Call\\n" + general +"\\n"
+ docs = docs + "Input: " + i + "\\n"
+ docs = docs + "Output: " + o + "\\n\\\n"
+ return docs
+
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ # things not yet implemented in the C source..
+ excludes=[]
+ for c in main_ns.classes():
+ for m in c.member_functions(allow_empty=True):
+ for e in excludes:
+ if e in m.decl_string:
+ m.exclude()
+
+ ### Member Functions
+ excludes=[ '::NaviLibrary::NaviDataValue::isEmpty'
+ ,'::NaviLibrary::NaviDataValue::isNumber' ## inline functions
+ ]
+ for e in excludes:
+ print "excluding ", e
+ main_ns.member_functions(e).exclude()
+
+ ### Free Functions
+ excludes = []
+ for e in excludes:
+ main_ns.free_functions(e).exclude()
+
+ ## Classes
+ excludes = []
+ for e in excludes:
+ main_ns.class_(e).exclude()
+
+
+ ## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
+ ## so I have to look through and match on a class by class basis
+ excludeName = []
+ for c in main_ns.classes():
+ if c.name in excludeName:
+ c.exclude()
+
+ ### Variables
+ excludes = []
+ for e in excludes:
+ main_ns.variable(e).exclude()
+
+ ### Typedefs
+ excludes = []
+ for e in excludes:
+ main_ns.typedefs(e).exclude()
+
+ ### Operators
+ excludes=[]
+ for e in excludes:
+ main_ns.operators(e).exclude()
+
+ main_ns.class_('::NaviLibrary::NaviDataValue').constructor(arg_types=['bool']).exclude()
+# ### Constructors
+# for c in main_ns.class_('NaviDataValue').constructor(arg_types=['bool']): ## these hide the working constructors
+# for a in c.arguments:
+# if 'NxVec3' in a.type.decl_string or 'NxQuat' in a.type.decl_string:
+# c.exclude()
+# break
+
+
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
+
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ includes=[]
+ ### Free Functions
+ for e in includes:
+ main_ns.free_functions(e).include()
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+
+ global_ns = mb.global_ns
+
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ def _ReturnUnsignedInt( type_ ):
+ """helper to return an UnsignedInt call for tranformation functions
+ """
+ return declarations.cpptypes.unsigned_int_t()
+
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
+
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+
+
+def AutoExclude( mb ):
+ """ Automaticaly exclude a range of things that don't convert well from C++ to Python
+ """
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ # vars that are static consts but have their values set in the header file are bad
+ Remove_Static_Consts ( main_ns )
+
+ ## Exclude protected and private that are not pure virtual
+ query = ~declarations.access_type_matcher_t( 'public' ) \
+ & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
+ non_public_non_pure_virtual = main_ns.calldefs( query )
+ non_public_non_pure_virtual.exclude()
+
+ #Virtual functions that return reference could not be overriden from Python
+ query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
+ & declarations.custom_matcher_t( lambda decl: declarations.is_reference( decl.return_type ) )
+ try:
+ main_ns.calldefs( query ).virtuality = declarations.VIRTUALITY_TYPES.NOT_VIRTUAL
+ except:
+ pass
+
+def AutoInclude( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+
+def AutoFixes ( mb ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+
+ # arguments passed as refs but not const are not liked by boost
+ #Fix_Ref_Not_Const ( main_ns )
+
+ # Functions that have void pointers in their argument list need to change to unsigned int's
+ Fix_Void_Ptr_Args ( main_ns )
+
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ Fix_Pointer_Returns ( main_ns )
+
+ # functions that need to have implicit conversions turned off
+ Fix_Implicit_Conversions ( main_ns)
+
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
+
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
+
+def Fix_Implicit_Conversions ( mb ):
+ """By default we disable explicit conversion, however sometimes it makes sense
+ """
+ pass
+
+def Add_Auto_Conversions( mb ):
+ pass
+
+
+def Set_Call_Policies( mb ):
+ """ set the return call policies on classes that this hasn't already been done for.
+ Set the default policy to deal with pointer/reference return types to reference_existing object
+ """
+ mem_funs = mb.calldefs ()
+ mem_funs.create_with_signature = True #Generated code will not compile on
+ #MSVC 7.1 if function has throw modifier.
+ for mem_fun in mem_funs:
+ if mem_fun.call_policies:
+ continue
+ if not mem_fun.call_policies and \
+ (declarations.is_reference (mem_fun.return_type) or declarations.is_pointer (mem_fun.return_type) ):
+ mem_fun.call_policies = call_policies.return_value_policy(
+ call_policies.reference_existing_object )
+
+
+def Set_Exception(mb):
+ pass
+ #~ """We don't exclude Exception, because it contains functionality, that could
+ #~ be useful to user. But, we will provide automatic exception translator
+ #~ """
+ #~ Exception = mb.namespace( 'Ogre' ).class_( 'Exception' )
+ #~ Exception.include()
+ #~ Exception.mem_fun('what').exclude() # declared with empty throw
+ #~ Exception.mem_fun('getNumber').exclude() # declared with empty throw
+ #~ Exception.translate_exception_to_string( 'PyExc_RuntimeError', 'exc.getFullDescription().c_str()' )
+
+
+def _ReturnUnsignedInt( type_ ):
+ """helper to return an UnsignedInt call for tranformation functions
+ """
+ return declarations.cpptypes.unsigned_int_t()
+
+def Fix_Void_Ptr_Args ( mb ):
+ """ we modify functions that take void *'s in their argument list to instead take
+ unsigned ints, which allows us to use CTypes buffers
+ """
+ for fun in mb.member_functions():
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.type_traits.is_void_pointer(arg.type) or arg.type.decl_string == "void const *":
+ fun.add_transformation( ft.modify_type(arg_position,_ReturnUnsignedInt ), alias=fun.name )
+ fun.documentation = docit ("Modified Input Argument to work with CTypes",
+ "Argument "+arg.name+ "(pos:" + str(arg_position)\
+ +") takes a CTypes.adddressof(xx)", "...")
+ print "Fixed Void Ptr", fun, arg_position
+ break
+ arg_position +=1
+
+ ## lets go and look for stuff that might be a problem
+ pointee_types=['unsigned int',' int ', ' float ', ' Real ', 'uchar', 'uint8',
+ 'unsigned char']
+
+ function_names=[]
+ for fun in mb.member_functions():
+ if fun.documentation or fun.ignore: continue ## means it's been tweaked somewhere else
+ for n in function_names:
+ if n in fun.name:
+ print "CHECK :", fun
+ break
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
+ for i in pointee_types:
+ if i in arg.type.decl_string:
+ print '"',arg.type.decl_string, '"'
+ print "CHECK ", fun, str(arg_position)
+ fun.documentation=docit("SUSPECT - MAYBE BROKEN", "....", "...")
+ break
+ arg_position +=1
+
+## NEED To do the same for constructors
+ for fun in mb.constructors():
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
+ for i in pointee_types:
+ if i in arg.type.decl_string:
+ print '"',arg.type.decl_string, '"'
+ print "Excluding: ", fun
+ fun.exclude()
+ break
+ arg_position +=1
+
+def Fix_Pointer_Returns ( mb ):
+ """ Change out functions that return a variety of pointer to base types and instead
+ have them return the address the pointer is pointing to (the pointer value)
+ This allow us to use CTypes to handle in memory buffers from Python
+
+ Also - if documentation has been set then ignore the class/function as it means it's been tweaked else where
+ """
+ pointee_types=['unsigned int','int', 'float', 'unsigned char']
+ known_names=[] # these are function names we know it's cool to exclude
+ for fun in mb.member_functions():
+ if declarations.is_pointer (fun.return_type) and not fun.documentation:
+ for i in pointee_types:
+ if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
+ if not fun.name in known_names:
+ print "Excluding (function):", fun, "as it returns (pointer)", i
+ fun.exclude()
+ for fun in mb.member_operators(allow_empty=True):
+ if declarations.is_pointer (fun.return_type) and not fun.documentation:
+ for i in pointee_types:
+ if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
+ print "Excluding (operator):", fun
+ fun.exclude()
+
+
+
+def query_containers_with_ptrs(decl):
+ if not isinstance( decl, declarations.class_types ):
+ return False
+ if not decl.indexing_suite:
+ return False
+ return declarations.is_pointer( decl.indexing_suite.element_type )
+
+
+def Remove_Static_Consts ( mb ):
+ """ linux users have compile problems with vars that are static consts AND have values set in the .h files
+ we can simply leave these out """
+ checker = varchecker.var_checker()
+ for var in mb.vars():
+ if type(var.type) == declarations.cpptypes.const_t:
+ if checker( var ):
+ print "Excluding static const ", var
+ var.exclude()
+
+#
+# the 'main'function
+#
+def generate_code():
+# messages.disable(
+# # Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+# messages.W1020
+# , messages.W1021
+# , messages.W1022
+# , messages.W1023
+# , messages.W1024
+# , messages.W1025
+# , messages.W1026
+# , messages.W1027
+# , messages.W1028
+# , messages.W1029
+# , messages.W1030
+# , messages.W1031
+# , messages.W1035
+# , messages.W1040
+# , messages.W1038
+# , messages.W1039
+# , messages.W1041
+# , messages.W1036 # pointer to Python immutable member
+# , messages.W1033 # unnamed variables
+# , messages.W1018 # expose unnamed classes
+# , messages.W1049 # returns reference to local variable
+# , messages.W1014 # unsupported '=' operator
+# )
+ #
+ # Use GCCXML to create the controlling XML file.
+ # If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
+ xml_cached_fc = parser.create_cached_source_fc(
+ os.path.join( environment.navi.root_dir, "python_navi.h" )
+ , environment.navi.cache_file )
+
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'OGRE_GCC_VISIBILITY']
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+ defined_symbols.append( 'VERSION_' + environment.navi.version )
+
+ undefined_symbols = []
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
+ mb = module_builder.module_builder_t( [ xml_cached_fc ]
+ , gccxml_path=environment.gccxml_bin
+ , working_directory=environment.root_dir
+ , include_paths=environment.navi.include_dirs
+ , define_symbols=defined_symbols
+ , indexing_suite_version=2
+ , cflags=environment.navi.cflags
+ )
+ # NOTE THE CHANGE HERE
+ mb.constructors().allow_implicit_conversion = False
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
+ #
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ main_ns = global_ns.namespace( MAIN_NAMESPACE )
+ main_ns.include()
+
+
+ AutoExclude ( mb )
+ ManualExclude ( mb )
+ AutoInclude ( mb )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+
+ AutoFixes ( mb )
+ ManualFixes ( mb )
+
+
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ Set_Call_Policies ( mb.global_ns )
+
+ #
+ # the manual stuff all done here !!!
+ #
+ hand_made_wrappers.apply( mb )
+
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+
+ common_utils.add_constants( mb, { 'PROJECT_version' : '"%s"' % environment.navi.version.replace("\n", "\\\n")
+ , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
+
+ ## need to create a welcome doc string for this...
+ common_utils.add_constants( mb, { '__doc__' : '"Navi PROJECT DESCRIPTION"' } )
+
+
+ ##########################################################################################
+ #
+ # Creating the code. After this step you should not modify/customize declarations.
+ #
+ ##########################################################################################
+ extractor = exdoc.doc_extractor("") # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_navi_' , doc_extractor= extractor )
+
+ for inc in environment.navi.include_dirs:
+ mb.code_creator.user_defined_directories.append(inc )
+ mb.code_creator.user_defined_directories.append( environment.navi.generated_dir )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.navi.version ) )
+
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.navi.version ) )
+
+ mb.split_module(environment.navi.generated_dir, huge_classes,use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generaated directory..
+ additional_files = []
+ paths = []
+
+ for p in paths:
+ additional_files = os.listdir(p)
+ for f in additional_files:
+ if f.endswith('cpp') or f.endswith('.h'):
+ sourcefile = os.path.join(p, f)
+ destfile = os.path.join(environment.navi.generated_dir, f )
+
+ if not common_utils.samefile( sourcefile ,destfile ):
+ shutil.copy( sourcefile, environment.navi.generated_dir )
+ print "Updated ", f, "as it was missing or out of date"
+if __name__ == '__main__':
+ start_time = time.clock()
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Added: trunk/python-ogre/code_generators/navi/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/navi/hand_made_wrappers.py (rev 0)
+++ trunk/python-ogre/code_generators/navi/hand_made_wrappers.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,72 @@
+import os
+import environment
+
+
+WRAPPER_DEFINITION_NaviManager = \
+"""
+class EventCallback
+{
+public:
+ EventCallback(PyObject* subscriber, std::string const & method)
+ {
+ mSubscriber = subscriber;
+ mMethod = method;
+ }
+
+ void call(const NaviLibrary::NaviData &naviData)
+ {
+ if (mMethod.length() > 0 ) {
+ boost::python::call_method<void>(mSubscriber, mMethod.c_str(),
+ static_cast<const NaviLibrary::NaviData&>(naviData) );
+ }
+ else
+ boost::python::call<void>(mSubscriber,
+ static_cast<const NaviLibrary::NaviData&>(naviData) );
+ }
+ PyObject* mSubscriber;
+ std::string mMethod;
+};
+
+
+
+void NaviManager_bind(NaviLibrary::NaviManager &me, const std::string &naviName,
+ const std::string &naviDataName,
+ PyObject* subscriber, std::string const & method="",
+ boost::python::list listin= boost::python::list())
+{
+ int index;
+
+ // create a new call back function that knows how to call a python function or class method
+ EventCallback * cb = new EventCallback( subscriber, method);
+
+ // create the necessary Delegate wrapper around this new functions
+ NaviLibrary::NaviDelegate callback = NaviLibrary::NaviDelegate ( cb, &EventCallback::call );
+
+ // we allow a list of strings to be passed in and we convert these to a string vector
+ std::vector<std::string> myVector;
+ for (index=0;index<len(listin);index++ )
+ myVector.push_back ( boost::python::extract<std::string> (listin[index]) );
+
+ // and finally call the bind function to make it all work
+ me.bind(naviName, naviDataName, callback, myVector ) ;
+}
+
+"""
+WRAPPER_REGISTRATION_NaviManager = [
+ """def( "bind", &::NaviManager_bind );"""
+
+]
+
+
+#################################################################################################
+#################################################################################################
+
+def apply_reg ( class_, code ):
+ for c in code:
+ class_.add_registration_code ( c )
+
+def apply( mb ):
+ rt = mb.class_( 'NaviManager' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_NaviManager )
+ apply_reg (rt, WRAPPER_REGISTRATION_NaviManager )
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/navi/python_navi.h
===================================================================
--- trunk/python-ogre/code_generators/navi/python_navi.h (rev 0)
+++ trunk/python-ogre/code_generators/navi/python_navi.h 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,19 @@
+#include "navi.h"
+
+// First we create a magic namespace to hold all our aliases
+namespace pyplusplus { namespace aliases {
+
+ #include "python_navi_aliases.h"
+} }
+
+// then we exposed everything needed (and more) to ensure GCCXML makes them visible to Py++
+//
+namespace python_plib{ namespace details{
+inline void instantiate(){
+ using namespace NaviLibrary;
+
+ #include "python_navi_sizeof.h"
+
+} } }
+
+
Added: trunk/python-ogre/code_generators/navi/python_navi_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/navi/python_navi_aliases.h (rev 0)
+++ trunk/python-ogre/code_generators/navi/python_navi_aliases.h 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,5 @@
+typedef NaviLibrary::NaviUtilities::InlineVector<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >\
+ InlineVectorString;
+typedef std::map<std::string, std::string, std::less<std::string>, std::allocator<std::pair<std::string const, std::string> > >\
+ MapStringString;
+typedef std::vector<std::string, std::allocator<std::string> > VectorString;
Added: trunk/python-ogre/code_generators/navi/python_navi_sizeof.h
===================================================================
--- trunk/python-ogre/code_generators/navi/python_navi_sizeof.h (rev 0)
+++ trunk/python-ogre/code_generators/navi/python_navi_sizeof.h 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,3 @@
+
+
+
Added: trunk/python-ogre/code_generators/navi/register_exceptions.py
===================================================================
--- trunk/python-ogre/code_generators/navi/register_exceptions.py (rev 0)
+++ trunk/python-ogre/code_generators/navi/register_exceptions.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,137 @@
+import os
+import environment
+from string import Template
+
+base_exception = \
+"""
+class OgreException(Exception):
+ def __init__( self, app_error ):
+ Exception.__init__( self )
+ self._pimpl = app_error
+
+ def __str__( self ):
+ return self._pimpl.getFullDescription()
+
+ def __getattribute__(self, attr):
+ my_pimpl = super(OgreException, self).__getattribute__("_pimpl")
+ try:
+ return getattr(my_pimpl, attr)
+ except AttributeError:
+ return super(OgreException,self).__getattribute__(attr)
+
+_ogre_.OgreException = OgreException
+#this one for backward compatability
+_ogre_.Exception = OgreException
+_ogre_._Exception_.py_err_class = OgreException
+""".strip()
+
+derived_py_exception = \
+"""
+class Ogre${err_class}(OgreException):
+ def __init__( self, app_error ):
+ OgreException.__init__( self, app_error )
+
+ def __getattribute__(self, attr):
+ return super(Ogre${err_class},self).__getattribute__(attr)
+
+_ogre_._${err_class}_.py_err_class = Ogre${err_class}
+_ogre_.Ogre${err_class} = Ogre${err_class}
+""".strip()
+
+register_translator = """${err_class}_exception_translator();"""
+
+exception_translator = \
+"""
+
+struct ${err_class}_exception_translator{
+
+ typedef Ogre::${err_class} exception_type;
+ typedef ${err_class}_exception_translator translator_type;
+
+ ${err_class}_exception_translator(){
+ bp::converter::registry::push_back( &translator_type::convertible
+ , &translator_type::construct
+ , bp::type_id<exception_type>() );
+
+ bp::register_exception_translator<exception_type>(&translator_type::translate);
+ }
+
+ static void
+ translate( const exception_type& err ){
+ bp::object pimpl_err( err );
+ bp::object pyerr_class = pimpl_err.attr( "py_err_class" );
+ bp::object pyerr = pyerr_class( pimpl_err );
+ PyErr_SetObject( pyerr_class.ptr(), bp::incref( pyerr.ptr() ) );
+ }
+
+ //Sometimes, exceptions should be passed back to the library.
+ static void*
+ convertible(PyObject* py_obj){
+ if( 1 != PyObject_IsInstance( py_obj, PyExc_Exception ) ){
+ return 0;
+ }
+
+ if( !PyObject_HasAttrString( py_obj, "_pimpl" ) ){
+ return 0;
+ }
+
+ bp::object pyerr( bp::handle<>( bp::borrowed( py_obj ) ) );
+ bp::object pimpl = bp::getattr( pyerr, "_pimpl" );
+ bp::extract<exception_type> type_checker( pimpl );
+ if( !type_checker.check() ){
+ return 0;
+ }
+ return py_obj;
+ }
+
+ static void
+ construct( PyObject* py_obj, bp::converter::rvalue_from_python_stage1_data* data){
+ typedef bp::converter::rvalue_from_python_storage<exception_type> storage_t;
+
+ bp::object pyerr( bp::handle<>( bp::borrowed( py_obj ) ) );
+ bp::object pimpl = bp::getattr( pyerr, "_pimpl" );
+
+ storage_t* the_storage = reinterpret_cast<storage_t*>( data );
+ void* memory_chunk = the_storage->storage.bytes;
+ exception_type* cpp_err
+ = new (memory_chunk) exception_type( bp::extract<exception_type>(pimpl) );
+
+ data->convertible = memory_chunk;
+ }
+
+};
+""".strip()
+
+def substitute( text, **keywd ):
+ return Template( text ).substitute( **keywd )
+
+def register( mb ):
+ ogre_ns = mb.namespace( 'Ogre' )
+ python_part_code = ['import _ogre_']
+
+ exception = ogre_ns.class_( 'Exception' )
+ exception.include()
+ exception.alias = '_%s_' % exception.name
+ exception.add_declaration_code( substitute( exception_translator, err_class=exception.name ) )
+ exception.add_registration_code( substitute( register_translator, err_class=exception.name ), False )
+ python_part_code.append( base_exception )
+
+ for derived_info in exception.derived:
+ derived = derived_info.related_class
+ derived.include()
+ derived.alias = '_%s_' % derived.name
+ derived.add_declaration_code( substitute( exception_translator, err_class=derived.name ) )
+ derived.add_registration_code( substitute( register_translator, err_class=derived.name ), False )
+ python_part_code.append( substitute( derived_py_exception, err_class=derived.name ) )
+
+ directory_path = environment.ogre.generated_dir
+ ogre_exceptions = os.path.join( directory_path, '_ogre_exceptions_.py' )
+
+ if os.path.exists( directory_path ) and not os.path.isdir(directory_path):
+ raise RuntimeError( 'directory_path should be a path not a file.' )
+ if not os.path.exists( directory_path ):
+ os.makedirs( directory_path )
+
+ f = file( ogre_exceptions, 'w+' )
+ f.write( os.linesep.join( python_part_code ) )
+ f.close()
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -93,6 +93,11 @@
,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::get'
,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::getFirst'
,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::next'
+ ,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::_begin'
+ ,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::_next'
+ ,'::NxOgre::Container<std::string, NxOgre::FluidEmitter*>::_begin'
+ ,'::NxOgre::Container<std::string, NxOgre::FluidEmitter*>::_next'
+
,'::NxOgre::Container<std::string, NxOgre::FluidEmitter*>::getFirst'
,'::NxOgre::List<NxOgre::RemoteDebuggerConnection::Camera>::destroyAndEraseAll'
,'::NxOgre::List<NxOgre::RemoteDebuggerConnection::Camera>::dumpToConsole'
@@ -109,20 +114,24 @@
,'::NxOgre::Joint::getBreakableMaxTorque'
,'::NxOgre::Joint::getGlobalAxis'
,'::NxOgre::Joint::setGlobalAxis'
- ,'::NxOgre::Joint::getType'
- ,'::NxOgre::Joint::hasMoreLimitPlanes'
- ,'::NxOgre::Joint::purgeLimitPlanes'
- ,'::NxOgre::Joint::resetLimitPlaneIterator'
- ,'::NxOgre::Joint::addLimitPlane'
- ,'::NxOgre::Joint::setBreakable'
- ,'::NxOgre::Joint::getGlobalAnchor'
- ,'::NxOgre::Joint::setGlobalAnchor'
- ,'::NxOgre::Joint::getState'
- ,'::NxOgre::Joint::getNextLimitPlane'
- ,'::NxOgre::Joint::setLimitPoint'
- ,'::NxOgre::Joint::getLimitPoint'
- ,'::NxOgre::Joint::getActorA'
- ,'::NxOgre::Joint::getActorB'
+# # # ,'::NxOgre::Joint::getType'
+# ,'::NxOgre::Joint::hasMoreLimitPlanes'
+# ,'::NxOgre::Joint::purgeLimitPlanes'
+# ,'::NxOgre::Joint::resetLimitPlaneIterator'
+# ,'::NxOgre::Joint::addLimitPlane'
+# ,'::NxOgre::Joint::setBreakable'
+# ,'::NxOgre::Joint::getGlobalAnchor'
+# ,'::NxOgre::Joint::setGlobalAnchor'
+# ,'::NxOgre::Joint::getState'
+# ,'::NxOgre::Joint::getNextLimitPlane'
+# ,'::NxOgre::Joint::setLimitPoint'
+# ,'::NxOgre::Joint::getLimitPoint'
+# ,'::NxOgre::Joint::getActorA'
+# ,'::NxOgre::Joint::getActorB'
+ ,'::NxOgre::JointParams::setSpring'
+ ,'::NxOgre::JointParams::setMotor'
+ ,'::NxOgre::JointParams::setLimits'
+ ,'::NxOgre::JointParams::setJointProjection'
,'::NxOgre::Scene::addMaterialPairsFromFile'
,'::NxOgre::Scene::addMaterialPair'
,'::NxOgre::Fluid::setName'
@@ -134,6 +143,8 @@
,'::NxOgre::Scene::createPrismaticJoint'
,'::NxOgre::Scene::createFixedJoint'
,'::NxOgre::Scene::save'
+ ,'::NxOgre::Scene::batchDestroyActors'
+ ,'::NxOgre::SimpleIntersection::getResult'
,'::NxOgre::SoftBody::simulate'
,'::NxOgre::SoftBody::render'
,'::NxOgre::PhysXDriver::stop'
@@ -169,6 +180,7 @@
## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
## so I have to look through and match on a class by class basis
excludeName = ['Container<NxOgre::Scene::Renderables, float>'
+ ,'Container<std::string,NxOgre::Actor*>'
,'List<NxOgre::CharacterHitReport*>'
,'List<NxOgre::RemoteDebuggerConnection::Camera>'
,'List<NxOgre::Blueprints::ActorBlueprint*>'
Modified: trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h 2007-09-12 13:40:08 UTC (rev 375)
@@ -1,3 +1,6 @@
+typedef std::vector<NxOgre::Joint::LimitPlane,std::allocator<NxOgre::Joint::LimitPlane> > VectorJointLimitPlane;
+typedef std::vector<NxOgre::SimplePlane*,std::allocator<NxOgre::SimplePlane*> > VectorSimplePlane;
+
typedef std::vector<float, std::allocator<float> > VectorFloat;
typedef std::vector<std::string, std::allocator<std::string> > VectorString;
typedef std::list<std::string> stdString;
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -369,8 +369,8 @@
os.path.join( environment.quickgui.root_dir, "python_quickgui.h" )
, environment.quickgui.cache_file )
- defined_symbols = [ 'OGRE_NONCLIENT_BUILD', 'FT2_BUILD_LIBRARY', 'QUICKGUI_EXPORTS',
- 'WIN32', 'NDEBUG', 'WINDOWS' ]
+ defined_symbols = [ 'OGRE_NONCLIENT_BUILD',
+ 'WIN32', 'NDEBUG', 'WINDOWS' ] ## , 'QUICKGUI_EXPORTS'
if environment._USE_THREADS:
defined_symbols.append('BOOST_HAS_THREADS')
defined_symbols.append('BOOST_HAS_WINTHREADS')
@@ -461,17 +461,17 @@
## now we need to ensure a series of headers and additional source files are
## copied to the generated directory..
- additional_files= os.listdir(environment.Config.PATH_INCLUDE_quickgui)
- additional_files=[]
- for f in additional_files:
- if f.endswith('cpp') or f.endswith('.h'):
- sourcefile = os.path.join(environment.Config.PATH_INCLUDE_quickgui, f)
- destfile = os.path.join(environment.quickgui.generated_dir, f )
+ additional_dirs=[environment.Config.PATH_INCLUDE_quickgui,
+ os.path.join(environment.Config.PATH_quickgui,'QuickGUI','src')]
+ for d in additional_dirs:
+ for f in os.listdir(d):
+ if f.endswith('cpp') or f.endswith('.h'):
+ sourcefile = os.path.join(d, f)
+ destfile = os.path.join(environment.quickgui.generated_dir, f )
+ if not common_utils.samefile( sourcefile ,destfile ):
+ shutil.copy( sourcefile, environment.quickgui.generated_dir )
+ print "Updated ", f, "as it was missing or out of date"
- if not common_utils.samefile( sourcefile ,destfile ):
- shutil.copy( sourcefile, environment.quickgui.generated_dir )
- print "Updated ", f, "as it was missing or out of date"
-
if __name__ == '__main__':
start_time = time.clock()
generate_code()
Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/environment.py 2007-09-12 13:40:08 UTC (rev 375)
@@ -103,15 +103,64 @@
######################
## Hopefully we can make the rest of this 'automagic' ##
+class Default:
+ version = ""
+ pythonModule = False
+ moduleName = ""
+ myHome = ""
+ myLibraryPaths = [ ]
+ myLibraries = [ ]
+ parent = None
+ children = []
+ codeGenerationFlags=[]
+ dependsOn = []
+ compileFlags = []
+ linkFlags= []
+ includePaths = []
+ myIncludes = []
+ libaries = myLibraries # a list of the libraries I need plus
+ mySource = [] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
+ myBuildCmds = [] # commands to build the library with
######################
-
+class boost:
+ version = "3.4"
+ pythonModule = False
+ moduleName = ""
+ myHome = 'boost'
+ myLibraryPaths = [ 'boost/bin.v2/libs/python2.5/build/msvc-8.0/release/threading-multi' ]
+ myLibraries = [ 'boost_python-vc80-mt-1_35']
+
+ parent = None
+ children = []
+ codeGenerationFlags=[]
+ dependsOn = []
+ compileFlags = []
+ linkFlags= []
+ includePaths = []
+ myIncludes = []
+ libaries = myLibraries # a list of the libraries I need plus
+ mySource = ['http://prdownloads.sourceforge.net/boost/boost-jam-3.1.13-1-linuxx86.tgz',
+ 'http://downloads.sourceforge.net/boost/boost_1_34_0.tar.bz2'] # where to get the source - tuples, {'svn|cvs|ftp|http','utl'}
+ myBuildCmds = [] # commands to build the library with
+
class ogre:
active = True
- version = "1.4" # "1.2"
+ pythonModule = True
+ version = "1.4"
+ myName='ogre'
+ moduleName='OGRE'
cflags = ""
- parent = "ogre/renderer"
- ModuleName = 'OGRE'
+ moduleParentLocation = "renderer"
+ dependsOn = ['boost']
+ myLibraryPaths = []
+ myLibraries = ['OgreMain']
+ libraries = myLibraries
+
+# for mod in dependsOn:
+# libraries += mod.libraries
+#
+
if os.name =='nt':
libs=[Config.LIB_Boost, 'OgreMain' ] #, 'OgreGUIRenderer', 'CEGUIBase']
lib_dirs = [ Config.PATH_LIB_Boost
@@ -335,7 +384,7 @@
class quickgui:
version="0.9.6"
parent="ogre/gui"
- CCFLAGS = ' /D "WIN32" /D "NDEBUG", /D "WINDOWS" /D "OGRE_PLATFORM_WIN32"' # /D "FT2_BUILD_LIBRARY"
+ CCFLAGS = ' /D "WIN32" /D "NDEBUG", /D "WINDOWS"' ###/D "OGRE_PLATFORM_WIN32"' # /D "FT2_BUILD_LIBRARY"
cflags=""
include_dirs = [ Config.PATH_Boost,
Config.PATH_INCLUDE_Ogre,
@@ -343,14 +392,35 @@
#,Config.PATH_INCLUDE_freetype
]
lib_dirs = [Config.PATH_LIB_Boost,
- Config.PATH_LIB_Ogre_OgreMain,
- Config.PATH_LIB_quickgui
+ Config.PATH_LIB_Ogre_OgreMain
+ ##,Config.PATH_LIB_quickgui
]
CheckIncludes=[]
- libs=[ Config.LIB_Boost, 'OgreMain', 'QuickGUI' ]
+ libs=[ Config.LIB_Boost, 'OgreMain' ]
ModuleName="quickgui"
active=True
+class navi:
+ version="0.9"
+ parent="ogre/gui"
+ CCFLAGS = '/D "WIN32" /D "NDEBUG", /D "WINDOWS"'
+ cflags=""
+ include_dirs = [ Config.PATH_Boost
+ ,Config.PATH_INCLUDE_Ogre
+ ,Config.PATH_INCLUDE_navi
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','llmozlib','include')
+ ]
+ lib_dirs = [Config.PATH_LIB_Boost,
+ Config.PATH_LIB_Ogre_OgreMain
+ ,Config.PATH_LIB_navi
+ ,os.path.join(Config.PATH_navi,'..','Dependencies','win32','llmozlib','lib')
+ ]
+ CheckIncludes=[]
+ libs=[ Config.LIB_Boost, 'Navi', 'OgreMain','llmozlib', 'user32',
+ 'kernel32.lib', 'gdi32.lib', 'winspool.lib', 'comdlg32.lib', 'advapi32.lib',
+ 'shell32.lib','ole32.lib','oleaut32.lib','uuid.lib' ]
+ ModuleName="navi"
+ active=True
class betagui:
version="0.16"
@@ -558,6 +628,7 @@
, 'ogrevideoffmpeg' : ogrevideoffmpeg
, 'ogredshow' : ogredshow
, 'plib' : plib
+ , 'navi': navi
#, 'raknet' : raknet
}
Modified: trunk/python-ogre/scripts/MakeRelease.bat
===================================================================
--- trunk/python-ogre/scripts/MakeRelease.bat 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/scripts/MakeRelease.bat 2007-09-12 13:40:08 UTC (rev 375)
@@ -26,6 +26,7 @@
del ..\..\PythonOgreRelease\1 /s
del ..\..\PythonOgreRelease\2 /s
del ..\..\PythonOgreRelease\ogre.cfg /s
+for /r ..\..\PythonOgreRelease\ %1 in (*) do touch %1
rem rmdir /s /q ..\..\PythonOgreRelease\demos\gui\tofix
rem rmdir /s /q ..\..\PythonOgreRelease\demos\ogre\tofix
Added: trunk/python-ogre/scripts/MakeSnapShot.bat
===================================================================
--- trunk/python-ogre/scripts/MakeSnapShot.bat (rev 0)
+++ trunk/python-ogre/scripts/MakeSnapShot.bat 2007-09-12 13:40:08 UTC (rev 375)
@@ -0,0 +1,31 @@
+rem echo off
+echo
+echo ====== Python-Ogre Snap Shot ======
+echo =
+rmdir /s /q ..\..\PythonOgreSnapShot
+mkdir ..\..\PythonOgreSnapShot\packages_2.5
+mkdir ..\..\PythonOgreSnapShot\plugins
+mkdir ..\..\PythonOgreSnapShot\demos
+mkdir ..\..\PythonOgreSnapShot\ThirdParty
+mkdir ..\..\PythonOgreSnapShot\Tools
+mkdir ..\..\PythonOgreSnapShot\docs
+xcopy ..\packages_2.5 ..\..\PythonOgreSnapShot\packages_2.5 /s
+xcopy ..\plugins ..\..\PythonOgreSnapShot\plugins
+copy ..\*.rtf ..\..\PythonOgreSnapShot
+copy ..\COPYING ..\..\PythonOgreSnapShot
+copy ..\*.gpl ..\..\PythonOgreSnapShot
+copy ..\setup.py ..\..\PythonOgreSnapShot
+
+copy ..\changelog.txt ..\..\PythonOgreSnapShot
+del ..\..\PythonOgreSnapShot\*.pyc /s
+del ..\..\PythonOgreSnapShot\*.log /s
+del ..\..\PythonOgreSnapShot\1 /s
+del ..\..\PythonOgreSnapShot\2 /s
+del ..\..\PythonOgreSnapShot\ogre.cfg /s
+for /r ..\..\PythonOgreSnapShot\ %1 in (*) do touch %1
+rem rmdir /s /q ..\..\PythonOgreSnapShot\demos\gui\tofix
+rem rmdir /s /q ..\..\PythonOgreSnapShot\demos\ogre\tofix
+
+
+
+
Deleted: trunk/python-ogre/scripts/PythonOgreInstallCreator.iss
===================================================================
--- trunk/python-ogre/scripts/PythonOgreInstallCreator.iss 2007-09-06 10:19:05 UTC (rev 374)
+++ trunk/python-ogre/scripts/PythonOgreInstallCreator.iss 2007-09-12 13:40:08 UTC (rev 375)
@@ -1,446 +0,0 @@
-;
-; Python-Ogre setup script
-;
-[Setup]
-AppName=Python-Ogre
-AppVerName=Python-Ogre 1.0RC2c
-DefaultDirName=C:\PythonOgre
-DefaultGroupName=Python-Ogre
-OutputBaseFilename=PythonOgreInstaller
-OutputDir=C:\temp
-SourceDir=C:\Development\PythonOgreRelease
-VersionInfoDescription=First Installer Release of Python-Ogre
-AllowNoIcons=true
-AppPublisher=OpenSource
-AppPublisherURL=http://www.python-ogre.org
-AppSupportURL=http://www.python-ogre.org
-AppUpdatesURL=http://www.python-ogre.org
-AppVersion=1.0.2.3
-LicenseFile=LICENSE.GPL
-Compression=lzma
-InfoBeforeFile=InstallWarning.rtf
-InfoAfterFile=postinstall.rtf
-SolidCompression=true
-AppCopyright=LPGL
-VersionInfoCompany=OpenSource
-VersionInfoTextVersion=1.0RC2c
-VersionInfoCopyright=PythonOgre Development Team
-RestartIfNeededByRun=false
-UninstallDisplayName=PythonOgre
-WizardImageFile=compiler:WizModernImage-IS.bmp
-WizardSmallImageFile=compiler:WizModernSmallImage-IS.bmp
-VersionInfoVersion=1.0.2.3
-[Files]
-; base files, demos and tools
-Source: *; DestDir: {app}
-Source: plugins\*; DestDir: {app}\plugins
-Source: tools\*; DestDir: {app}\tools
-Source: demos\*; DestDir: {app}\demos; Flags: recursesubdirs
-Source: docs\*; DestDir: {app}\docs; Flags: recursesubdirs
-; the python modules - in the event we find python
-Source: packages_2.5\*; DestDir: {code:GetPythonSiteDir}; Flags: recursesubdirs; Check: SelectedPython('2.5')
-Source: packages_2.4\*; DestDir: {code:GetPythonSiteDir}; Flags: recursesubdirs; Check: SelectedPython('2.4')
-; the python modules again - if we don't find python we install both versions in the app directory
-Source: packages_2.5\*; DestDir: {app}\packages_2.5; Flags: recursesubdirs; Check: NoPythonFound
-Source: packages_2.4\*; DestDir: {app}\packages_2.4; Flags: recursesubdirs; Check: NoPythonFound
-;
-; we need to remove the .pyc files when we uninstall
-;
-Source: ThirdParty\dxwebsetup.exe; DestDir: {app}\ThirdParty
-Source: ThirdParty\vcredist_x86.exe; DestDir: {app}\ThirdParty
-
-[UninstallDelete]
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\renderer\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\renderer\OGRE\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\io\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\io\OIS\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\gui\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\gui\CEGUI\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\gui\QuickGUI\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\sound\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\sound\OgreAL\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\physics\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\physics\OgreRefApp\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\physics\ODE\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\physics\OgreOde\*.pyc
-Type: filesandordirs; Name: {code:GetPythonSiteDir}\ogre\physics\OgreNewt\*.pyc
-
-Type: files; Name: {app}\demos\CEGUI\*.pyc
-Type: files; Name: {app}\demos\CEGUI\*.log
-Type: files; Name: {app}\demos\GUI\*.pyc
-Type: files; Name: {app}\demos\GUI\*.log
-Type: files; Name: {app}\demos\ogre\*.pyc
-Type: files; Name: {app}\demos\ogre\*.log
-Type: files; Name: {app}\demos\ogreode\*.pyc
-Type: files; Name: {app}\demos\ogreode\*.log
-Type: files; Name: {app}\demos\ogrenewt\*.pyc
-Type: files; Name: {app}\demos\ogrenewt\*.log
-Type: files; Name: {app}\demos\ogreal\*.pyc
-Type: files; Name: {app}\demos\ogreal\*.log
-Type: files; Name: {app}\demos\ode\*.pyc
-Type: files; Name: {app}\demos\ode\*.log
-Type: files; Name: {app}\demos\CEGUI\*.cfg
-Type: files; Name: {app}\demos\GUI\*.cfg
-Type: files; Name: {app}\demos\ogre\*.cfg
-Type: files; Name: {app}\demos\ogreode\*.cfg
-Type: files; Name: {app}\demos\ogrenewt\*.cfg
-Type: files; Name: {app}\demos\ogreal\*.cfg
-Type: files; Name: {app}\demos\ode\*.cfg
-Type: dirifempty; Name: {app}\demos\CEGUI
-Type: dirifempty; Name: {app}\demos\GUI
-Type: dirifempty; Name: {app}\demos\ogre
-Type: dirifempty; Name: {app}\demos\ogreode
-Type: dirifempty; Name: {app}\demos\ogrenewt
-Type: dirifempty; Name: {app}\demos\ogreal
-Type: dirifempty; Name: {app}\demos\ode
-Type: dirifempty; Name: {app}\demos
-Type: dirifempty; Name: {app}
-
-;
-; I REALLY DON'T like doing this but if people have used a previous version of Python-Ogre
-; I need to remove it to force any existing source code to fail and hence have them
-; update to the new directory structure..
-; being very conservative in this!!!!!!!!!!!!!
-;
-[InstallDelete]
-Type: files; Name: {code:GetPythonSiteDir}\Ogre\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\OIS\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\GUI\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\OgreOde\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\OgreNewt\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\OgreAL\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\OgreRefApp\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\ODE\*.pyd
-Type: files; Name: {code:GetPythonSiteDir}\FMOD\*.pyd
-
-Type: files; Name: {code:GetPythonSiteDir}\Ogre\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\OIS\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\GUI\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\OgreOde\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\OgreNewt\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\OgreAL\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\OgreRefApp\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\ODE\*.dll
-Type: files; Name: {code:GetPythonSiteDir}\FMOD\*.dll
-
-Type: files; Name: {code:GetPythonSiteDir}\Ogre\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\OIS\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\GUI\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\OgreOde\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\OgreNewt\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\OgreAL\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\OgreRefApp\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\ODE\_*.p*
-Type: files; Name: {code:GetPythonSiteDir}\FMOD\_*.p*
-
-Type: files; Name: {code:GetPythonSiteDir}\Ogre\sf_*.*
-
-Type: files; Name: {code:GetPythonSiteDir}\Ogre
-Type: files; Name: {code:GetPythonSiteDir}\OIS
-Type: files; Name: {code:GetPythonSiteDir}\GUI
-Type: files; Name: {code:GetPythonSiteDir}\OgreOde
-Type: files; Name: {code:GetPythonSiteDir}\OgreNewt
-Type: files; Name: {code:GetPythonSiteDir}\OgreAL
-Type: files; Name: {code:GetPythonSiteDir}\OgreRefApp
-Type: files; Name: {code:GetPythonSiteDir}\ODE
-Type: files; Name: {code:GetPythonSiteDir}\FMOD
-
-Type: dirifempty; Name: {code:GetPythonSiteDir}\Ogre
-Type: dirifempty; Name: {code:GetPythonSiteDir}\OIS
-Type: dirifempty; Name: {code:GetPythonSiteDir}\GUI
-Type: dirifempty; Name: {code:GetPythonSiteDir}\OgreOde
-Type: dirifempty; Name: {code:GetPythonSiteDir}\OgreNewt
-Type: dirifempty; Name: {code:GetPythonSiteDir}\OgreAL
-Type: dirifempty; Name: {code:GetPythonSiteDir}\OgreRefApp
-Type: dirifempty; Name: {code:GetPythonSiteDir}\ODE
-
-[Icons]
-Name: {group}\Ogre Demos\Bezier; Filename: {code:GetPythonExe}; Parameters: Demo_Bezier.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\BSP; Filename: {code:GetPythonExe}; Parameters: Demo_BSP.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\BSP_Collision; Filename: {code:GetPythonExe}; Parameters: Demo_BspCollision.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\Camera Tracking; Filename: {code:GetPythonExe}; Parameters: Demo_CameraTracking.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\CEL Shading; Filename: {code:GetPythonExe}; Parameters: Demo_CelShading.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\Compositor; Filename: {code:GetPythonExe}; Parameters: Demo_Compositor.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\ENV Map; Filename: {code:GetPythonExe}; Parameters: Demo_EnvMap.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre Demos\Facial; Filename: {code:GetPythonExe}; Parameters: Demo_Facial.py; WorkingDir: {app}\Demos\Ogre
-Name: {group}\Ogre ...
[truncated message content] |
|
From: <and...@us...> - 2007-09-06 10:19:03
|
Revision: 374
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=374&view=rev
Author: andy_miller
Date: 2007-09-06 03:19:05 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
Initial 1.1 development.
Added Plib (sound and networking) and Theora (video) modules
Mods to handle Quickgui updates
Code generation handles 'new module' support in Py++ (remove the already registered errors)
Mods for NxOgre SVN 33 support
Modified Paths:
--------------
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/cleanbuild.bat
trunk/python-ogre/code_generators/nxogre/customization_data.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/nxogre/python_nxogre.h
trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
trunk/python-ogre/code_generators/ogreal/generate_code.py
trunk/python-ogre/code_generators/ogredshow/generate_code.py
trunk/python-ogre/code_generators/ogrenewt/generate_code.py
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_sizeof.h
trunk/python-ogre/code_generators/theora/generate_code.py
trunk/python-ogre/environment.py
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/code_generators/cleanIncrementalbuild.bat
trunk/python-ogre/code_generators/plib/
trunk/python-ogre/code_generators/plib/customization_data.py
trunk/python-ogre/code_generators/plib/generate_code.py
trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
trunk/python-ogre/code_generators/plib/python_plib.h
trunk/python-ogre/code_generators/plib/python_plib_aliases.h
trunk/python-ogre/code_generators/plib/python_plib_sizeof.h
trunk/python-ogre/code_generators/plib/register_exceptions.py
trunk/python-ogre/demos/theora/
trunk/python-ogre/demos/theora/SampleFramework.py
trunk/python-ogre/demos/theora/demo_video.py
trunk/python-ogre/demos/theora/plugins.cfg
trunk/python-ogre/demos/theora/resources.cfg
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -46,6 +46,8 @@
PATH_ogrevideoffmpeg = os.path.join(root_dir, 'ThirdParty','ffmpeg')
PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
PATH_ogredshow = os.path.join(root_dir, 'ThirdParty','dshow')
+PATH_plib = os.path.join(BASE_DIR, 'plib')
+
#
# it's time for the SDK version
if SDK:
@@ -93,6 +95,7 @@
PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
PATH_LIB_ogredshow = PATH_ogredshow
+PATH_LIB_plib = PATH_plib
if SDK:
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
@@ -134,6 +137,7 @@
PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
PATH_INCLUDE_ogredshow = PATH_ogredshow
+PATH_INCLUDE_plib = PATH_plib
PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
,os.path.join(BASE_DIR, 'vorbis', 'include')
Modified: trunk/python-ogre/code_generators/betagui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/betagui/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/betagui/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -387,7 +387,8 @@
)
# NOTE THE CHANGE HERE
mb.constructors().allow_implicit_conversion = False
-
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
mb.BOOST_PYTHON_MAX_ARITY = 25
mb.classes().always_expose_using_scope = True
Added: trunk/python-ogre/code_generators/cleanIncrementalbuild.bat
===================================================================
--- trunk/python-ogre/code_generators/cleanIncrementalbuild.bat (rev 0)
+++ trunk/python-ogre/code_generators/cleanIncrementalbuild.bat 2007-09-06 10:19:05 UTC (rev 374)
@@ -0,0 +1,59 @@
+rem del /Q cache\*
+call vcvars32
+rem cd ogre
+rem python generate_code.py >1
+rem cd ..
+cd ogreode
+python generate_code.py >1
+cd ..
+cd ogrenewt
+python generate_code.py >1
+cd ..
+cd ogreal
+python generate_code.py >1
+cd ..
+cd ogrerefapp
+python generate_code.py >1
+cd ..
+cd ode
+python generate_code.py >1
+cd ..
+cd ois
+python generate_code.py >1
+cd ..
+cd cegui
+python generate_code.py >1
+cd ..
+cd quickgui
+python generate_code.py >1
+cd ..
+cd opcode
+python generate_code.py >1
+cd ..
+cd physx
+python generate_code.py >1
+cd ..
+cd nxogre
+python generate_code.py >1
+cd ..
+cd ogredshow
+python generate_code.py >1
+cd ..
+cd ogrevideoffmpeg
+python generate_code.py >1
+cd ..
+cd theora
+python generate_code.py >1
+cd ..
+cd bullet
+python generate_code.py >1
+cd ..
+cd betagui
+python generate_code.py >1
+cd ..
+cd plib
+python generate_code.py >1
+cd ..
+cd ..
+scons -i
+
Modified: trunk/python-ogre/code_generators/cleanbuild.bat
===================================================================
--- trunk/python-ogre/code_generators/cleanbuild.bat 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/cleanbuild.bat 2007-09-06 10:19:05 UTC (rev 374)
@@ -1,5 +1,5 @@
del /Q cache\*
-rmdir /s /q ..\generated
+echo rmdir /s /q ..\generated
cd ogre
python generate_code.py >1
cd ..
@@ -24,4 +24,8 @@
cd cegui
python generate_code.py >1
cd ..
+cd quickgui
+python generate_code.py >1
+cd ..
+
Modified: trunk/python-ogre/code_generators/nxogre/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/customization_data.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/nxogre/customization_data.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -1,6 +1,7 @@
def header_files( version ):
return [ 'NxOgre.h'
+ ,'NxOgreSkeleton.h'
, 'Ogre.h'
,'OgrePlugin.h'
,'NxPhysics.h'
Modified: trunk/python-ogre/code_generators/nxogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/nxogre/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -56,6 +56,17 @@
if c.decl_string.startswith('::NxOgre::Container<') and '*' not in c.decl_string:
print "EXCLUDING: ", c
c.exclude()
+
+ ### Now some of the functions need to be excluded.. This is too much and could be cut back
+ ### ie only some of the containers lists fail at compile time
+ funlist = ['get','has','next','remove']
+ if c.decl_string.startswith('::NxOgre::List<'):
+ for f in funlist:
+ try:
+ c.member_function(f).exclude()
+ print "EXCLUDING: ", c, f
+ except:
+ pass
for v in c.variables(allow_empty=True):
if v.access_type != 'public' :
v.exclude()
@@ -64,9 +75,6 @@
if t.decl_string.startswith('::NxOgre::Container<') and '*' not in t.decl_string:
t.exclude()
print "EXCLUDING: ", t
-# print dir ( main_ns )
-# for t in main_ns.variables():
-# print t
# things not yet implemented in the C source..
excludes=['::NxOgre::Compartment']
@@ -75,26 +83,25 @@
for e in excludes:
if e in m.decl_string:
m.exclude()
-# for c in main_ns.constructors():
-# print c
- # problem with a constructor on Shape
- main_ns.class_('::NxOgre::Shape').constructor(arg_types=['::NxOgre::ShapeParams']).exclude()
- # And coth..
+ # problem with a constructor on Cloth
main_ns.class_('::NxOgre::Cloth').constructor(arg_types=[None,'::NxClothDesc','::NxMeshData',None,None]).exclude()
-
- ### Member Functions
+# # #
+# # # ### Member Functions
excludes=[
'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::begin'
,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::get'
,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::getFirst'
,'::NxOgre::Container<std::string, NxOgre::FluidDrain*>::next'
,'::NxOgre::Container<std::string, NxOgre::FluidEmitter*>::getFirst'
+ ,'::NxOgre::List<NxOgre::RemoteDebuggerConnection::Camera>::destroyAndEraseAll'
+ ,'::NxOgre::List<NxOgre::RemoteDebuggerConnection::Camera>::dumpToConsole'
+
,'::NxOgre::UserAllocator::realloc'
- ,'::NxOgre::Serialiser::NXU_notifySaveActor' # takes a * * argument
- # not yet implemented in source
+# # # # not yet implemented in source
,'::NxOgre::WheelSet::attachNewWheel'
,'::NxOgre::WheelSet::createThreeWheelSet'
+ ,'::NxOgre::WheelSet::createSixWheelSet'
,'::NxOgre::Wheel::addEntity'
,'::NxOgre::Cloth::duplicate'
,'::NxOgre::ClothRayCaster::getClosestCloth'
@@ -126,14 +133,9 @@
,'::NxOgre::Scene::createSphericalJoint'
,'::NxOgre::Scene::createPrismaticJoint'
,'::NxOgre::Scene::createFixedJoint'
- ,'::NxOgre::Serialiser::saveScene'
- ,'::NxOgre::Serialiser::restoreScene'
+ ,'::NxOgre::Scene::save'
,'::NxOgre::SoftBody::simulate'
,'::NxOgre::SoftBody::render'
- ,'::NxOgre::WheelSet::createSixWheelSet'
- ,'::NxOgre::Summary::has'
- ,'::NxOgre::ActorBlueprint::setDynamicCollisionModel'
- ,'::NxOgre::ActorBlueprint::setCollisionModel'
,'::NxOgre::PhysXDriver::stop'
,'::NxOgre::PhysXDriver::start'
,'::NxOgre::PhysXDriver::reset'
@@ -144,36 +146,32 @@
main_ns.member_functions(e).exclude()
### Free Functions
- excludes = ['::NxOgre::NxCookTriMeshToDisk'
- ,'::NxOgre::NxCookConvexToDisk'
- ,'::NxOgre::simulateWorldGeometry']
+ excludes = []
for e in excludes:
main_ns.free_functions(e).exclude()
## Classes
excludes = ['::NxOgre::BaseCharacterHitReport'
,'::NxOgre::CharacterHitReport'
+ ,'::NxOgre::Blueprints::ActorBlueprint'
+ ,'::NxOgre::Blueprints::ActorFactory'
+ ,'::NxOgre::Blueprints::WorldBlueprint'
+ ,'::NxOgre::Serialiser::SerialiserBase'
+ ,'::NxOgre::UserAllocator'
+ ,'::NxOgre::State'
+
# not yet implemented in source
]
for e in excludes:
main_ns.class_(e).exclude()
-
-
+# # #
+# # #
## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
## so I have to look through and match on a class by class basis
excludeName = ['Container<NxOgre::Scene::Renderables, float>'
,'List<NxOgre::CharacterHitReport*>'
- ,'Container<std::string, NxOgre::RayCastHit>'
,'List<NxOgre::RemoteDebuggerConnection::Camera>'
- ,'List<NxOgre::Wheel*>'
- ,'NxCookTriMeshToDisk'
- ,'NxCookConvexToDisk'
- ,'simulateWorldGeometry'
- ,'UserAllocator'
- ,'ClothVertex'
-# ,'Cloth'
- ##,'PhysXDriver'
- ,'State'
+ ,'List<NxOgre::Blueprints::ActorBlueprint*>'
]
for c in main_ns.classes():
# print c.decl_string
@@ -210,7 +208,7 @@
if 'NxVec3' in a.type.decl_string or 'NxQuat' in a.type.decl_string:
c.exclude()
break
-
+# # #
############################################################
##
@@ -604,7 +602,10 @@
)
# NOTE THE CHANGE HERE
mb.constructors().allow_implicit_conversion = False
-
+ ## This module depends on Ogre and physx
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+ mb.register_module_dependency ( environment.physx.generated_dir )
+
mb.BOOST_PYTHON_MAX_ARITY = 25
mb.classes().always_expose_using_scope = True
Modified: trunk/python-ogre/code_generators/nxogre/python_nxogre.h
===================================================================
--- trunk/python-ogre/code_generators/nxogre/python_nxogre.h 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/nxogre/python_nxogre.h 2007-09-06 10:19:05 UTC (rev 374)
@@ -1,5 +1,6 @@
#include "NxOgre.h"
+#include "NXOgreSkeleton.h" //missing ??
#include "Ogre.h"
#include "OgrePlugin.h"
#include <NxPhysics.h>
Modified: trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h 2007-09-06 10:19:05 UTC (rev 374)
@@ -7,7 +7,23 @@
typedef std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> >,std::basic_string<char, std::char_traits<char>, std::allocator<char> > >\
PairString;
-
+typedef NxOgre::List<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > ListString;
+typedef NxOgre::List<NxOgre::Blueprints::ActorBlueprint*> ListBlueprints;
+typedef NxOgre::Container<unsigned, NxOgre::ShapeBlueprint const&> ContainerShapeBlueprint;
+typedef NxOgre::Container<std::string, NxOgre::ActorBlueprint> ContainerActorBlueprint;
+//typedef NxOgre::Container<NxOgre::Scene::Renderables, float> ContainerSceneRencerables;
+typedef std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >,float,std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >,std::allocator<std::pair<const std::basic_string<char, std::char_traits<char>, std::allocator<char> >, float> > >\
+ MapStrings;
+typedef std::map<unsigned, float, std::less<unsigned>, std::allocator<std::pair<unsigned const, float> > >\
+ MapUnsignedFloat;
+typedef std::vector<NxOgre::Scene*, std::allocator<NxOgre::Scene*> > VectorScene;
+typedef std::list<NxOgre::Blueprints::ActorBlueprint*, std::allocator<NxOgre::Blueprints::ActorBlueprint*> > ListBlueprintsActorBlueprint;
+typedef std::list<std::pair<std::string, std::string>, std::allocator<std::pair<std::string, std::string> > >\
+ ListPairString;
+typedef std::map<std::string, NxOgre::Container<std::string, NxOgre::DominanceGroup*>::Containee, std::less<std::string>, std::allocator<std::pair<std::string const, NxOgre::Container<std::string, NxOgre::DominanceGroup*>::Containee> > >\
+ MapContainerDominanceGroup;
+
+
typedef std::map<std::string, NxOgre::Container<std::string, NxOgre::Scene*>::Containee, std::less<std::string> >\
MapContainerScene;
typedef std::list<NxOgre::CharacterHitReport*, std::allocator<NxOgre::CharacterHitReport*> > ListCharacterHitReportPtr;
@@ -41,7 +57,7 @@
MapContainerTrigger;
typedef std::list<NxOgre::RemoteDebuggerConnection::Camera, std::allocator<NxOgre::RemoteDebuggerConnection::Camera> >\
ListRemoteDebuggerConnectionCamera;
-typedef std::vector<NxOgre::Summary::Feature> VectorSummaryFeature;
+// typedef std::vector<NxOgre::Summary::Feature> VectorSummaryFeature;
typedef std::map<unsigned, NxOgre::Container<unsigned, NxOgre::Shape*>::Containee, std::less<unsigned> >\
MapContainerUnsignedShape;
typedef std::map<unsigned, NxOgre::Container<unsigned, NxOgre::ErrorReporter*>::Containee, std::less<unsigned> >\
Modified: trunk/python-ogre/code_generators/ogre/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogre/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -543,7 +543,15 @@
};
}
"""
-
+# c = ns.class_( 'PixelBox' )
+# c.add_declaration_code( pixelBox_size )
+# for f in c.mem_funs( 'getData' ):
+# f.call_policies = call_policies.return_range( f, 'ImageSize' )
+# f.documentation = "Python-Ogre Modified Return Range \\n"
+# if f.has_const:
+# f.alias = 'getReadOnlyData'
+
+
image_size = """
namespace{
struct ImageSize{
@@ -916,10 +924,21 @@
""" we modify functions that take void *'s in their argument list to instead take
unsigned ints, which allows us to use CTypes buffers
"""
+# for fun in mb.class_('PixelUtil').member_functions('unpackColour') :
+# print "Function:", fun
+# for arg in fun.arguments:
+# print arg
+# print arg.type
+# print "Const", declarations.is_const(arg.type)
+# print "pointer", declarations.is_pointer(arg.type)
+# print "Void", declarations.is_void(arg.type)
+# print arg.type.decl_string
+# sys.exit()
+
for fun in mb.member_functions():
arg_position = 0
for arg in fun.arguments:
- if declarations.type_traits.is_void_pointer(arg.type):
+ if arg.type.decl_string == 'void const *' or arg.type.decl_string == 'void *':
fun.add_transformation( ft.modify_type(arg_position,_ReturnUnsignedInt ), alias=fun.name )
fun.documentation = docit ("Modified Input Argument to work with CTypes",
"Argument "+arg.name+ "(pos:" + str(arg_position)\
Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -2,7 +2,23 @@
import environment
+WRAPPER_DEFINITION_PixelBox =\
+"""
+// return the data buffer - can't be handled 'normally' by Py++
+void * PixelBox_data ( ::Ogre::PixelBox & me )
+{
+ return me.data;
+}
+"""
+WRAPPER_REGISTRATION_PixelBox = [
+ """def( "getData", &::PixelBox_data,\\
+ "Python-Ogre Helper Function: Returns the data buffer.\\n\\
+ Input: \\n\\
+ Output: A void pointer to the data buffer",\\
+ bp::return_value_policy< bp::return_opaque_pointer >());"""
+ ]
+
WRAPPER_WRAPPER_RenderQueueListener =\
"""
virtual void renderQueueEnded( ::Ogre::uint8 queueGroupId, ::Ogre::String const & invocation, bool & repeatThisInvocation ){
@@ -22,32 +38,6 @@
"""
-# WRAPPER_DEFINITION_ShadowRenderable =\
-# """
-# Ogre::ShadowRenderable * ShadowRenderable_castElement(Ogre::ShadowRenderable * r){
-# if( dynamic_cast< Ogre::Region::RegionShadowRenderable * >( r ) ){
-# return (Ogre::Region::RegionShadowRenderable*) r ;
-# }
-# if( dynamic_cast< Ogre::ManualObject::ManualObjectSectionShadowRenderable * >( r ) ){
-# return (Ogre::ManualObject::ManualObjectSectionShadowRenderable*) r ;
-# }
-# if( dynamic_cast< Ogre::Entity::EntityShadowRenderable * >( r ) ){
-# return (Ogre::Entity::EntityShadowRenderable*) r ;
-# }
-# return ( r );
-# }
-#
-# Ogre::ShadowRenderable* ShadowRenderable_getLightCapRenderable( Ogre::ShadowRenderable & me){
-# return ShadowRenderable_castElement ( me.getLightCapRenderable() );
-# }
-# """
-WRAPPER_REGISTRATION_ShadowRenderable = [
- 'def( "getLightCapRenderable", &::ShadowRenderable_getLightCapRenderable,\
- "Python-Ogre Hand Wrapped\\n",\
- bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());',
-
- ]
-
WRAPPER_DEFINITION_OverlayElement = \
"""
@@ -677,6 +667,10 @@
rt.add_declaration_code( WRAPPER_DEFINITION_Node )
apply_reg (rt, WRAPPER_REGISTRATION_Node )
+ rt = mb.class_( 'PixelBox' )
+ rt.add_declaration_code( WRAPPER_DEFINITION_PixelBox )
+ apply_reg (rt, WRAPPER_REGISTRATION_PixelBox )
+
# rt = mb.class_( 'ShadowRenderable' )
# rt.add_declaration_code( WRAPPER_DEFINITION_ShadowRenderable )
# apply_reg (rt, WRAPPER_REGISTRATION_ShadowRenderable )
@@ -712,8 +706,8 @@
for cls in map_iterators:
iter_as_generator_map( cls )
-# rt = mb.class_( 'RenderQueueListener' )
-# rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
+ rt = mb.class_( 'RenderQueueListener' )
+ rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
# cls = mb.class_('Animation').class_('NodeTrackIterator')
# iter_as_generator_map( cls )
Modified: trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
===================================================================
--- trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h 2007-09-06 10:19:05 UTC (rev 374)
@@ -299,7 +299,7 @@
typedef Ogre::Pose::VertexOffsetMap VertexOffsetMap;
typedef Ogre::Pose::VertexOffsetIterator VertexOffsetIterator;
typedef Ogre::Pose::ConstVertexOffsetIterator ConstVertexOffsetIterator;
-typedef Ogre::PlaneBoundedVolume::PlaneList PlaneList;
+typedef Ogre::PlaneBoundedVolume::PlaneList PlaneListBoundedVolume;
typedef Ogre::Pass::PassSet PassSet;
typedef Ogre::Pass::TextureUnitStateIterator TextureUnitStateIterator;
typedef Ogre::Pass::ConstTextureUnitStateIterator ConstTextureUnitStateIterator;
Modified: trunk/python-ogre/code_generators/ogreal/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreal/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogreal/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -174,6 +174,8 @@
, indexing_suite_version=2
)
#
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
# We filter (both include and exclude) specific classes and functions that we want to wrap
#
filter_declarations (mb)
Modified: trunk/python-ogre/code_generators/ogredshow/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogredshow/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogredshow/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -462,7 +462,8 @@
)
# NOTE THE CHANGE HERE
mb.constructors().allow_implicit_conversion = False
-
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
mb.BOOST_PYTHON_MAX_ARITY = 25
mb.classes().always_expose_using_scope = True
Modified: trunk/python-ogre/code_generators/ogrenewt/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogrenewt/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -212,6 +212,8 @@
'OIS_NONCLIENT_BUILD', 'OIS_STATIC_BUILD']
, indexing_suite_version=2 )
+ ## This module depends on Ogre
+ mb.register_module_dependency ( environment.ogre.generated_dir )
filter_declarations (mb)
#
# fix shared Ptr's that are defined as references but NOT const...
Modified: trunk/python-ogre/code_generators/ogreode/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogreode/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogreode/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -37,7 +37,8 @@
def filter_declarations( mb ):
global_ns = mb.global_ns
global_ns.exclude()
-
+
+ global_ns.namespace("std").class_('list<Ogre::Plane, std::allocator<Ogre::Plane> >').exclude()
if not environment.ogre.version.startswith("1.2") and os.name =='nt':
mb.global_ns.class_( 'vector<Ogre::Vector4, std::allocator<Ogre::Vector4> >' ).exclude( )
@@ -112,9 +113,11 @@
global_ns.namespace( 'Ogre' ).class_('SceneManager').include(already_exposed=True)
global_ns.namespace( 'Ogre' ).class_('Matrix4').include(already_exposed=True)
global_ns.namespace( 'Ogre' ).class_('Plugin').include(already_exposed=True)
-# print "\nCLASSES::: Std"
-# for c in global_ns.namespace('std').classes():
-# print c.name, c
+ print "\nCLASSES::: Std"
+ for c in global_ns.namespace('std').classes():
+ print c.name, c
+ global_ns.namespace("std").class_('list<Ogre::Plane, std::allocator<Ogre::Plane> >').exclude()
+
# print "\nCLASSES::: Ode"
# for c in global_ns.namespace('OgreOde').classes():
# print c.name, c
@@ -180,7 +183,9 @@
, include_paths=environment.ogreode.include_dirs
, define_symbols= defined_symbols
, indexing_suite_version=2 )
-
+
+ ## This module depends on Ogre
+ mb.register_module_dependency ( environment.ogre.generated_dir )
filter_declarations (mb)
## we need to handle "ode" return values etc
@@ -255,7 +260,7 @@
huge_classes = map( mb.class_, customization_data.huge_classes(environment.ogreode.version) )
print "ABOUT TO SPLIT"
- mb.split_module(environment.ogreode.generated_dir, huge_classes)
+ mb.split_module(environment.ogreode.generated_dir, huge_classes, use_files_sum_repository=False )
if __name__ == '__main__':
start_time = time.clock()
Modified: trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2007-08-30 11:46:24 UTC (rev 373)
+++ trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -361,7 +361,8 @@
)
# NOTE THE CHANGE HERE
mb.constructors().allow_implicit_conversion = False
-
+ mb.register_module_dependency ( environment.ogre.generated_dir )
+
mb.BOOST_PYTHON_MAX_ARITY = 25
mb.classes().always_expose_using_scope = True
Added: trunk/python-ogre/code_generators/plib/customization_data.py
===================================================================
--- trunk/python-ogre/code_generators/plib/customization_data.py (rev 0)
+++ trunk/python-ogre/code_generators/plib/customization_data.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -0,0 +1,11 @@
+
+def header_files( version ):
+ return [ 'ul.h'
+ ,'sl.h'
+ , 'sm.h'
+ , 'net.h'
+ ]
+
+def huge_classes( version ):
+ return []
+
\ No newline at end of file
Added: trunk/python-ogre/code_generators/plib/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/plib/generate_code.py (rev 0)
+++ trunk/python-ogre/code_generators/plib/generate_code.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -0,0 +1,563 @@
+#!/usr/bin/env python
+# -----------------------------------------------------------------------------
+# This source file is part of Python-Ogre and is covered by the LGPL
+# For the latest info, see http://python-ogre.org/
+#
+# -----------------------------------------------------------------------------
+
+
+import os, sys, time, shutil
+
+#add environment to the path
+sys.path.append( os.path.join( '..', '..' ) )
+#add common utils to the pass
+sys.path.append( '..' )
+sys.path.append( '.' )
+
+import environment
+import common_utils
+import customization_data
+import hand_made_wrappers
+import register_exceptions
+
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import module_builder
+from pyplusplus import decl_wrappers
+
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+from pyplusplus.module_creator import sort_algorithms
+
+import common_utils.extract_documentation as exdoc
+import common_utils.var_checker as varchecker
+import common_utils.ogre_properties as ogre_properties
+
+MAIN_NAMESPACE = ''
+
+## small helper function
+def docit ( general, i, o ):
+ docs = "Python-Ogre Modified Function Call\\n" + general +"\\n"
+ docs = docs + "Input: " + i + "\\n"
+ docs = docs + "Output: " + o + "\\n\\\n"
+ return docs
+
+############################################################
+##
+## Here is where we manually exclude stuff
+##
+############################################################
+
+def ManualExclude ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns
+
+ # things not yet implemented in the C source..
+ excludes=[]
+ for c in main_ns.classes():
+ for m in c.member_functions(allow_empty=True):
+ for e in excludes:
+ if e in m.decl_string:
+ m.exclude()
+
+ ### Member Functions
+ excludes=[ #'::slScheduler::waveOutClose'
+# ,'::slScheduler::waveOutWrite'
+# ,'::slScheduler::waveOutReset'
+# ,'::slScheduler::waveOutGetPosition'
+# ,'::slScheduler::waveOutPrepareHeader'
+ '::netMessage::print' # strange / ugly defination
+ ,'::slSample::getBuffer' # returns char pointer -- needs wrapping
+ ,'::slSample::getComment' # same..
+ # have callbacks and need to be hand wrapped
+ ,'::slScheduler::loopSample'
+ ,'::slScheduler::loopMusic'
+ ,'::slScheduler::playSample'
+ ,'::slScheduler::playMusic'
+ # handwrapped to handle python lists instead of c buffers
+ ,'::netSocket::send'
+ ,'::netSocket::sendto'
+ ,'::netSocket::recv'
+ ,'::netSocket::recvfrom'
+ ,'::netBuffer::getData' ## returns a char pointer to the data which needs wrapping
+ ,'::netChannel::send'
+ ,'::netChannel::recv'
+ ,'::netMonitorServer::setCommandFunc' ## needs to handle callbacks
+
+ ]
+ for e in excludes:
+ print "excluding ", e
+ main_ns.member_functions(e).exclude()
+
+ ### Free Functions
+ excludes = []
+ for e in excludes:
+ main_ns.free_functions(e).exclude()
+
+ ## Classes
+ excludes = []
+ for e in excludes:
+ main_ns.class_(e).exclude()
+
+
+ ## I have a challenge that Py++ doesn't recognise these classes by full name (perhaps because they are structs?)
+ ## so I have to look through and match on a class by class basis
+ excludeName = []
+ for c in main_ns.classes():
+ if c.name in excludeName:
+ c.exclude()
+
+ ### Variables
+ excludes = []
+ for e in excludes:
+ main_ns.variable(e).exclude()
+
+ ### Typedefs
+ excludes = []
+ for e in excludes:
+ main_ns.typedefs(e).exclude()
+
+ ### Operators
+ excludes=[]
+ for e in excludes:
+ main_ns.operators(e).exclude()
+
+# ### Constructors
+# for c in main_ns.class_('::plib::Pose').constructors(): ## these hide the working constructors
+# for a in c.arguments:
+# if 'NxVec3' in a.type.decl_string or 'NxQuat' in a.type.decl_string:
+# c.exclude()
+# break
+
+
+############################################################
+##
+## And there are things that manually need to be INCLUDED
+##
+############################################################
+
+def ManualInclude ( mb ):
+ global_ns = mb.global_ns
+ main_ns = global_ns
+
+ includes=['netInit']
+ ### Free Functions
+ for e in includes:
+ main_ns.free_functions(e).include()
+
+############################################################
+##
+## And things that need manual fixes, but not necessarly hand wrapped
+##
+############################################################
+def ManualFixes ( mb ):
+
+ global_ns = mb.global_ns
+
+
+############################################################
+##
+## And things that need to have their argument and call values fixed.
+## ie functions that pass pointers in the argument list and of course we need
+## to read the updated values - so instead we pass them back
+## as new values in a tuple (ETC ETC)
+##
+############################################################
+
+def ManualTransformations ( mb ):
+ def _ReturnUnsignedInt( type_ ):
+ """helper to return an UnsignedInt call for tranformation functions
+ """
+ return declarations.cpptypes.unsigned_int_t()
+
+ global_ns = mb.global_ns
+ main_ns = global_ns
+
+ def create_output( size ):
+ return [ ft.output( i ) for i in range( size ) ]
+
+ ## hack to get things working -- needs to be wrapped to handle a python call back
+ change = ['loopSample', 'loopMusic','playSample','playMusic']
+ for fun in change:
+ f = global_ns.class_('::slScheduler').mem_fun(fun)
+ f.add_transformation( ft.modify_type('cb',_ReturnUnsignedInt ), alias=fun )
+ print "Changed ", f
+
+###############################################################################
+##
+## Now for the AUTOMATIC stuff that should just work
+##
+###############################################################################
+
+
+def AutoExclude( mb ):
+ """ Automaticaly exclude a range of things that don't convert well from C++ to Python
+ """
+ global_ns = mb.global_ns
+ main_ns = global_ns
+
+ # vars that are static consts but have their values set in the header file are bad
+ Remove_Static_Consts ( main_ns )
+
+ ## Exclude protected and private that are not pure virtual
+ query = ~declarations.access_type_matcher_t( 'public' ) \
+ & ~declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.PURE_VIRTUAL )
+ non_public_non_pure_virtual = main_ns.calldefs( query )
+ non_public_non_pure_virtual.exclude()
+
+ #Virtual functions that return reference could not be overriden from Python
+ query = declarations.virtuality_type_matcher_t( declarations.VIRTUALITY_TYPES.VIRTUAL ) \
+ & declarations.custom_matcher_t( lambda decl: declarations.is_reference( decl.return_type ) )
+ try:
+ main_ns.calldefs( query ).virtuality = declarations.VIRTUALITY_TYPES.NOT_VIRTUAL
+ except:
+ pass
+
+def AutoInclude( mb ):
+ main_ns = mb.global_ns ## doesn't have it's own namespace..
+ validPrefix= ['sl','sm','net','ul']
+
+ for cls in main_ns.classes():
+ for p in validPrefix:
+ if cls.name.startswith ( p ) and cls.name[len(p)].isupper():
+ print "Including class: ", cls.name
+ cls.include()
+
+ for cls in main_ns.enums():
+ for p in validPrefix:
+ if cls.name.startswith ( p ) and cls.name[len(p)].isupper():
+ print "Including enum: ", cls.name
+ cls.include()
+
+ for cls in main_ns.free_functions():
+ print "Free Function:", cls
+ for p in validPrefix:
+ if cls.name.startswith ( p ) and cls.name[len(p)].isupper():
+ print "Including free function: ", cls.name
+ cls.include()
+
+
+def AutoFixes ( mb ):
+ """ now we fix a range of things automatically - typically by going through
+ the entire name space trying to guess stuff and fix it:)
+ """
+ global_ns = mb.global_ns
+ main_ns = global_ns
+
+ # arguments passed as refs but not const are not liked by boost
+ #Fix_Ref_Not_Const ( main_ns )
+
+ # Functions that have void pointers in their argument list need to change to unsigned int's
+ Fix_Void_Ptr_Args ( main_ns )
+
+ # and change functions that return a variety of pointers to instead return unsigned int's
+ Fix_Pointer_Returns ( main_ns )
+
+ # functions that need to have implicit conversions turned off
+ Fix_Implicit_Conversions ( main_ns)
+
+ if os.name =='nt':
+ Fix_NT( mb )
+ elif os.name =='posix':
+ Fix_Posix( mb )
+
+
+###############################################################################
+##
+## here are the helper functions that do much of the work
+##
+###############################################################################
+def Fix_Posix ( mb ):
+ """ fixup for posix specific stuff -- note only expect to be called on a posix machine
+ """
+ ## we could do more here if need be...
+ if sys.platform == 'darwin':
+ pass
+ elif sys.platform.startswith ('linux'):
+ pass
+
+
+def Fix_NT ( mb ):
+ """ fixup for NT systems
+ """
+
+
+def Fix_Implicit_Conversions ( mb ):
+ """By default we disable explicit conversion, however sometimes it makes sense
+ """
+ pass
+
+def Add_Auto_Conversions( mb ):
+ pass
+
+
+def Set_Call_Policies( mb ):
+ """ set the return call policies on classes that this hasn't already been done for.
+ Set the default policy to deal with pointer/reference return types to reference_existing object
+ """
+ mem_funs = mb.calldefs ()
+ mem_funs.create_with_signature = True #Generated code will not compile on
+ #MSVC 7.1 if function has throw modifier.
+ for mem_fun in mem_funs:
+ if mem_fun.call_policies:
+ continue
+ if not mem_fun.call_policies and \
+ (declarations.is_reference (mem_fun.return_type) or declarations.is_pointer (mem_fun.return_type) ):
+ mem_fun.call_policies = call_policies.return_value_policy(
+ call_policies.reference_existing_object )
+
+
+def Set_Exception(mb):
+ pass
+ #~ """We don't exclude Exception, because it contains functionality, that could
+ #~ be useful to user. But, we will provide automatic exception translator
+ #~ """
+ #~ Exception = mb.namespace( 'Ogre' ).class_( 'Exception' )
+ #~ Exception.include()
+ #~ Exception.mem_fun('what').exclude() # declared with empty throw
+ #~ Exception.mem_fun('getNumber').exclude() # declared with empty throw
+ #~ Exception.translate_exception_to_string( 'PyExc_RuntimeError', 'exc.getFullDescription().c_str()' )
+
+
+def _ReturnUnsignedInt( type_ ):
+ """helper to return an UnsignedInt call for tranformation functions
+ """
+ return declarations.cpptypes.unsigned_int_t()
+
+def Fix_Void_Ptr_Args ( mb ):
+ """ we modify functions that take void *'s in their argument list to instead take
+ unsigned ints, which allows us to use CTypes buffers
+ """
+ for fun in mb.member_functions():
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.type_traits.is_void_pointer(arg.type) or arg.type.decl_string == "void const *":
+ fun.add_transformation( ft.modify_type(arg_position,_ReturnUnsignedInt ), alias=fun.name )
+ fun.documentation = docit ("Modified Input Argument to work with CTypes",
+ "Argument "+arg.name+ "(pos:" + str(arg_position)\
+ +") takes a CTypes.adddressof(xx)", "...")
+ print "Fixed Void Ptr", fun, arg_position
+ break
+ arg_position +=1
+
+ ## lets go and look for stuff that might be a problem
+ pointee_types=['unsigned int',' int ', ' float ', ' Real ', 'uchar', 'uint8',
+ 'unsigned char']
+
+ function_names=[]
+ for fun in mb.member_functions():
+ if fun.documentation or fun.ignore: continue ## means it's been tweaked somewhere else
+ for n in function_names:
+ if n in fun.name:
+ print "CHECK :", fun
+ break
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
+ for i in pointee_types:
+ if i in arg.type.decl_string:
+ print '"',arg.type.decl_string, '"'
+ print "CHECK ", fun, str(arg_position)
+ fun.documentation=docit("SUSPECT - MAYBE BROKEN", "....", "...")
+ break
+ arg_position +=1
+
+## NEED To do the same for constructors
+ for fun in mb.constructors():
+ arg_position = 0
+ for arg in fun.arguments:
+ if declarations.is_pointer(arg.type): ## and "const" not in arg.type.decl_string:
+ for i in pointee_types:
+ if i in arg.type.decl_string:
+ print '"',arg.type.decl_string, '"'
+ print "Excluding: ", fun
+ fun.exclude()
+ break
+ arg_position +=1
+
+def Fix_Pointer_Returns ( mb ):
+ """ Change out functions that return a variety of pointer to base types and instead
+ have them return the address the pointer is pointing to (the pointer value)
+ This allow us to use CTypes to handle in memory buffers from Python
+
+ Also - if documentation has been set then ignore the class/function as it means it's been tweaked else where
+ """
+ pointee_types=['unsigned int','int', 'float', 'unsigned char']
+ known_names=[] # these are function names we know it's cool to exclude
+ for fun in mb.member_functions():
+ if declarations.is_pointer (fun.return_type) and not fun.documentation:
+ for i in pointee_types:
+ if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
+ if not fun.name in known_names:
+ print "Excluding (function):", fun, "as it returns (pointer)", i
+ fun.exclude()
+ for fun in mb.member_operators(allow_empty=True):
+ if declarations.is_pointer (fun.return_type) and not fun.documentation:
+ for i in pointee_types:
+ if fun.return_type.decl_string.startswith ( i ) and not fun.documentation:
+ print "Excluding (operator):", fun
+ fun.exclude()
+
+
+
+def query_containers_with_ptrs(decl):
+ if not isinstance( decl, declarations.class_types ):
+ return False
+ if not decl.indexing_suite:
+ return False
+ return declarations.is_pointer( decl.indexing_suite.element_type )
+
+
+def Remove_Static_Consts ( mb ):
+ """ linux users have compile problems with vars that are static consts AND have values set in the .h files
+ we can simply leave these out """
+ checker = varchecker.var_checker()
+ for var in mb.vars():
+ if type(var.type) == declarations.cpptypes.const_t:
+ if checker( var ):
+ print "Excluding static const ", var
+ var.exclude()
+
+#
+# the 'main'function
+#
+def generate_code():
+# messages.disable(
+# # Warnings 1020 - 1031 are all about why Py++ generates wrapper for class X
+# messages.W1020
+# , messages.W1021
+# , messages.W1022
+# , messages.W1023
+# , messages.W1024
+# , messages.W1025
+# , messages.W1026
+# , messages.W1027
+# , messages.W1028
+# , messages.W1029
+# , messages.W1030
+# , messages.W1031
+# , messages.W1035
+# , messages.W1040
+# , messages.W1038
+# , messages.W1039
+# , messages.W1041
+# , messages.W1036 # pointer to Python immutable member
+# , messages.W1033 # unnamed variables
+# , messages.W1018 # expose unnamed classes
+# , messages.W1049 # returns reference to local variable
+# , messages.W1014 # unsupported '=' operator
+# )
+ #
+ # Use GCCXML to create the controlling XML file.
+ # If the cache file (../cache/*.xml) doesn't exist it gets created, otherwise it just gets loaded
+ # NOTE: If you update the source library code you need to manually delete the cache .XML file
+ #
+ xml_cached_fc = parser.create_cached_source_fc(
+ os.path.join( environment.plib.root_dir, "python_plib.h" )
+ , environment.plib.cache_file )
+
+ defined_symbols = [ ]
+ if environment._USE_THREADS:
+ defined_symbols.append('BOOST_HAS_THREADS')
+ defined_symbols.append('BOOST_HAS_WINTHREADS')
+ defined_symbols.append( 'VERSION_' + environment.plib.version )
+
+ undefined_symbols = []
+ #
+ # build the core Py++ system from the GCCXML created source
+ #
+ mb = module_builder.module_builder_t( [ xml_cached_fc ]
+ , gccxml_path=environment.gccxml_bin
+ , working_directory=environment.root_dir
+ , include_paths=environment.plib.include_dirs
+ , define_symbols=defined_symbols
+ , indexing_suite_version=2
+ , cflags=environment.ogre.cflags
+ )
+ # NOTE THE CHANGE HERE
+ mb.constructors().allow_implicit_conversion = False
+
+ mb.BOOST_PYTHON_MAX_ARITY = 25
+ mb.classes().always_expose_using_scope = True
+
+ #
+ # We filter (both include and exclude) specific classes and functions that we want to wrap
+ #
+ global_ns = mb.global_ns
+ global_ns.exclude()
+ main_ns = global_ns
+# # main_ns.include()
+
+
+ AutoInclude ( mb )
+ AutoExclude ( mb )
+ ManualExclude ( mb )
+ ManualInclude ( mb )
+ # here we fixup functions that expect to modifiy their 'passed' variables
+ ManualTransformations ( mb )
+
+ AutoFixes ( mb )
+ ManualFixes ( mb )
+
+ #
+ # We need to tell boost how to handle calling (and returning from) certain functions
+ #
+ Set_Call_Policies ( mb.global_ns )
+
+ #
+ # the manual stuff all done here !!!
+ #
+ hand_made_wrappers.apply( mb )
+
+ NoPropClasses = [""]
+ for cls in main_ns.classes():
+ if cls.name not in NoPropClasses:
+ cls.add_properties( recognizer=ogre_properties.ogre_property_recognizer_t() )
+
+ common_utils.add_constants( mb, { 'PROJECT_version' : '"%s"' % environment.plib.version.replace("\n", "\\\n")
+ , 'python_version' : '"%s"' % sys.version.replace("\n", "\\\n" ) } )
+
+ ## need to create a welcome doc string for this...
+ common_utils.add_constants( mb, { '__doc__' : '"plib PROJECT DESCRIPTION"' } )
+
+
+ ##########################################################################################
+ #
+ # Creating the code. After this step you should not modify/customize declarations.
+ #
+ ##########################################################################################
+ extractor = exdoc.doc_extractor("") # I'm excluding the UTFstring docs as lots about nothing
+ mb.build_code_creator (module_name='_plib_' , doc_extractor= extractor )
+
+ for inc in environment.plib.include_dirs:
+ mb.code_creator.user_defined_directories.append(inc )
+ mb.code_creator.user_defined_directories.append( environment.plib.generated_dir )
+ mb.code_creator.replace_included_headers( customization_data.header_files( environment.plib.version ) )
+
+ huge_classes = map( mb.class_, customization_data.huge_classes( environment.plib.version ) )
+
+ mb.split_module(environment.plib.generated_dir, huge_classes,use_files_sum_repository=False)
+
+ ## now we need to ensure a series of headers and additional source files are
+ ## copied to the generaated directory..
+ additional_files = []
+ paths = [os.path.join(environment.Config.PATH_plib,'src','sl'),
+ os.path.join(environment.Config.PATH_plib,'src','util'),
+ os.path.join(environment.Config.PATH_plib,'src','net')
+ ]
+
+ for p in paths:
+ additional_files = os.listdir(p)
+ for f in additional_files:
+ if f.endswith('cxx') or f.endswith('.h'):
+ sourcefile = os.path.join(p, f)
+ destfile = os.path.join(environment.plib.generated_dir, f )
+
+ if not common_utils.samefile( sourcefile ,destfile ):
+ shutil.copy( sourcefile, environment.plib.generated_dir )
+ print "Updated ", f, "as it was missing or out of date"
+if __name__ == '__main__':
+ start_time = time.clock()
+ generate_code()
+ print 'Source code was updated( %f minutes ).' % ( ( time.clock() - start_time )/60 )
Added: trunk/python-ogre/code_generators/plib/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/plib/hand_made_wrappers.py (rev 0)
+++ trunk/python-ogre/code_generators/plib/hand_made_wrappers.py 2007-09-06 10:19:05 UTC (rev 374)
@@ -0,0 +1,304 @@
+import os
+import environment
+
+WRAPPER_DEFINITION_netSocket =\
+"""
+int netSocket_send ( netSocket & me, boost::python::list listin, int flags = 0 )
+{
+ int index, result;
+ int size = len(listin);
+ byte * buffer = new byte [size];
+ for (index=0;index<size;index++ ) {
+ buffer[index] = (byte) boost::python::extract<int> (listin[index]);
+ }
+ result = me.send((const void *) buffer, size, flags );
+ delete buffer;
+ return result;
+}
+
+int netSocket_send_str ( netSocket & me, boost::python::str listin, int flags = 0 )
+{
+ int index, result;
+ int size = len(listin);
+ byte * buffer = new byte[size];
+ for (index=0;index<size;index++ ) {
+ buffer[index] = (byte) boost::python::extract<char> (listin[index]);
+ }
+ result = me.send((const void *) buffer, size, flags );
+ delete buffer;
+ return result;
+}
+int netSocket_sendto ( netSocket & me, boost::python::list listin, int flags, const netAddress* to )
+{
+ int index, result;
+ int size = len(listin);
+ byte * buffer = new byte[size];
+ for (index=0;index<size;index++ ) {
+ buffer[index] = boost::python::extract<int> (listin[index]);
+ }
+ result= me.sendto((const void *) buffer, size, flags, to );
+ delete buffer;
+ return result;
+}
+int netSocket_sendto_str ( netSocket & me, boost::python::str listin, int flags, const netAddress* to )
+{
+ int index, result;
+ int size = len(listin);
+ byte * buffer = new byte[size];
+ for (index=0;index<size;index++ ) {
+ buffer[index] = boost::python::extract<char> (listin[index]);
+ }
+ result= me.sendto((const void *) buffer, size, flags, to );
+ delete buffer;
+ return result;
+}
+
+
+boost::python::list netSocket_recv ( netSocket & me, int MaxSize=20486, int flags = 0 )
+{
+ byte * buffer = new byte [MaxSize];
+ int length,x;
+ boost::python::list listout;
+ length = me.recv ( (void *) buffer, MaxSize, flags);
+ for (x=0;x<length;x++) {
+ listout.append ( buffer[x] );
+ }
+ delete buffer;
+ return listout;
+}
+boost::python::str netSocket_recv_str ( netSocket & me, int MaxSize=2048, int flags = 0 )
+{
+ char * buffer = new char [MaxSize];
+ int length;
+ boost::python::str str_out;
+ length = me.recv ( (void *) buffer, MaxSize, flags);
+ if (length > 0 )
+ str_out = boost::python::str (buffer, length);
+ else
+ str_out = boost::python::str();
+ delete buffer;
+ return str_out;
+}
+
+boost::python::list netSocket_recvfrom ( netSocket & me, int MaxSize, int flags, netAddress* from )
+{
+ byte * buffer = new byte [MaxSize];
+ int length,x;
+ boost::python::list listout;
+ length = me.recvfrom ( (void *) buffer, MaxSize, flags, from);
+ for (x=0;x<length;x++) {
+ listout.append ( buffer[x] );
+ }
+ delete buffer;
+ return listout;
+}
+boost::python::str netSocket_recvfrom_str ( netSocket & me, int MaxSize, int flags, netAddress* from )
+{
+ char * buffer = new char [MaxSize];
+ int length;
+ boost::python::str str_out;
+ length = me.recvfrom ( (void *) buffer, MaxSize, flags, from);
+ if (length > 0 )
+ str_out = boost::python::str (buffer, length);
+ else
+ str_out = boost::python::str();
+ delete buffer;
+ return str_out;
+}
+"""
+WRAPPER_REGISTRATION_netSocket = [
+ """def( "send", &::netSocket_send,
+ ( bp::arg("listin"), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "send", &::netSocket_send_str,
+ ( bp::arg("listin"), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "sendto", &::netSocket_sendto,
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "sendto", &::netSocket_sendto_str,
+ "Python-Ogre Hand Wrapped\\n" );""",
+
+ """def( "recv", &::netSocket_recv,
+ ( bp::arg("MaxSize")=(2048), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "recv_str", &::netSocket_recv_str,
+ ( bp::arg("MaxSize")=(2048), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "recvfrom", &::netSocket_recvfrom,
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "recvfrom_str", &::netSocket_recvfrom_str,
+ "Python-Ogre Hand Wrapped - receives a string\\n" );""",
+]
+
+
+WRAPPER_DEFINITION_netBuffer =\
+"""
+char * netBuffer_getData(netBuffer & me) {
+ return me.getData() ;
+ }
+
+boost::python::str netBuffer_getData_str(netBuffer & me) {
+ boost::python::str str_out;
+ int length = me.getLength();
+ if (length > 0)
+ str_out = boost::python::str( me.getData(), length );
+ else
+ str_out = boost::python::str();
+ return str_out;
+ }
+"""
+WRAPPER_REGISTRATION_netBuffer = [
+ """def( "getData", &::netBuffer_getData,
+ bp::return_value_policy< bp::return_opaque_pointer >(),
+ "Python-Ogre Hand Wrapped - returns pointer to data buffer suitable to use with ctypes\\n" );""",
+ """def( "getData_str", &::netBuffer_getData_str,
+ "Python-Ogre Hand Wrapped - returns a string containing the buffer data\\n" );"""
+ ]
+
+
+WRAPPER_DEFINITION_netChannel =\
+"""
+int netChannel_send ( netChannel & me, boost::python::list listin, int flags = 0 )
+{
+ int index, result;
+ int size = len(listin);
+ byte * buffer = new byte [size];
+ for (index=0;index<size;index++ ) {
+ buffer[index] = (byte) boost::python::extract<int> (listin[index]);
+ }
+ result = me.send((const void *) buffer, size, flags );
+ delete buffer;
+ return result;
+}
+
+int netChannel_send_str ( netChannel & me, boost::python::str listin, int flags = 0 )
+{
+ int index, result;
+ int size = len(listin);
+ byte * buffer = new byte[size];
+ for (index=0;index<size;index++ ) {
+ buffer[index] = (byte) boost::python::extract<char> (listin[index]);
+ }
+ result = me.send((const void *) buffer, size, flags );
+ delete buffer;
+ return result;
+}
+boost::python::list netChannel_recv ( netChannel & me, int MaxSize=2048, int flags = 0 )
+{
+ byte * buffer = new byte [MaxSize];
+ int length,x;
+ boost::python::list listout;
+ length = me.recv ( (void *) buffer, MaxSize, flags);
+ for (x=0;x<length;x++) {
+ listout.append ( buffer[x] );
+ }
+ delete buffer;
+ return listout;
+}
+boost::python::str netChannel_recv_str ( netChannel & me, int MaxSize=2048, int flags = 0 )
+{
+ char * buffer = new char [MaxSize];
+ int length;
+ boost::python::str str_out;
+ length = me.recv ( (void *) buffer, MaxSize, flags);
+ if (length > 0 )
+ str_out = boost::python::str (buffer, length);
+ else
+ str_out = boost::python::str();
+ delete buffer;
+ return str_out;
+}
+
+"""
+WRAPPER_REGISTRATION_netChannel = [
+ """def( "send", &::netChannel_send,
+ ( bp::arg("listin"), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "send", &::netChannel_send_str,
+ ( bp::arg("listin"), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "recv", &::netChannel_recv,
+ ( bp::arg("MaxSize")=(2048), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+ """def( "recv_str", &::netChannel_recv_str,
+ ( bp::arg("MaxSize")=(2048), bp::arg("flags")=(0) ),
+ "Python-Ogre Hand Wrapped\\n" );""",
+]
+
+WRAPPER_DEFINITION_netMonitorServer =\
+"""
+ void setCommandFunc ( void (*func)(const char*) )
+"""
+
+
+WRAPPER_DEFINITION_slScheduler =\
+"""
+int slScheduler_loopSample(slScheduler &me, slSample * s, int pri=0,
+ slPreemptMode mode=::SL_SAMPLE_MUTE, int magic=0,
+ PyObject* subscriber=0, std::string const & method="")
+{
+ return me.loopSample ( s, pri, mode, magic ); // note calling with a null callback
+}
+int slScheduler_playSample(slScheduler &me, slSample * s, int pri=1,
+ slPreemptMode mode=::SL_SAMPLE_ABORT, int magic=0,
+ PyObject* subscriber=0, std::string const & method="")
+{
+ return me.playSample ( s, pri, mode, magic ); // note calling with a null callback
+}
+int slScheduler_loopMusic(slScheduler &me, const char *fname, int pri=0,
+ slPreemptMode mode=::SL_SAMPLE_MUTE, int magic=0,
+ PyObject* subscriber=0, std::string const & method="")
+{
+ return me.loopMusic ( fname, pri, mode, magic ); // note calling with a null callback
+}
+int slScheduler_playMusic(slScheduler &me, const char *fname, int pri=1,
+ slPreemptMode mode=::SL_SAMPLE_ABORT, int magic=0,
+ PyObject* subscriber=0, std::string const & method="")
+{
+ return me.playMusic ( fname, pri, mode, magic ); // note calling with a null callback
+}
+""" ...
[truncated message content] |
|
From: <and...@us...> - 2007-08-30 11:46:27
|
Revision: 373
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=373&view=rev
Author: andy_miller
Date: 2007-08-30 04:46:24 -0700 (Thu, 30 Aug 2007)
Log Message:
-----------
Update to 1.0 release...
Modified Paths:
--------------
trunk/python-ogre/ThirdParty/vcredist_x86.exe
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/demos/nxogre/CakeFramework.py
trunk/python-ogre/demos/nxogre/config.yaml
Modified: trunk/python-ogre/ThirdParty/vcredist_x86.exe
===================================================================
(Binary files differ)
Modified: trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-08-12 14:34:59 UTC (rev 372)
+++ trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py 2007-08-30 11:46:24 UTC (rev 373)
@@ -712,8 +712,8 @@
for cls in map_iterators:
iter_as_generator_map( cls )
- rt = mb.class_( 'RenderQueueListener' )
- rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
+# rt = mb.class_( 'RenderQueueListener' )
+# rt.add_wrapper_code ( WRAPPER_WRAPPER_RenderQueueListener )
# cls = mb.class_('Animation').class_('NodeTrackIterator')
# iter_as_generator_map( cls )
Modified: trunk/python-ogre/demos/nxogre/CakeFramework.py
===================================================================
--- trunk/python-ogre/demos/nxogre/CakeFramework.py 2007-08-12 14:34:59 UTC (rev 372)
+++ trunk/python-ogre/demos/nxogre/CakeFramework.py 2007-08-30 11:46:24 UTC (rev 373)
@@ -41,21 +41,24 @@
def decorate(self):
pass
- def cleanup(self):
- pass
-
- def onFrame(self, deltaTime):
- pass
+ def cleanup(self):
+ pass
+
+ def onFrame(self, deltaTime):
+ pass
- def preStart(self, World):
- pass
-
+ def preStart(self, World):
+ pass
+
def getCamera(self ):
return self.Camera
def getSceneManager(self):
return self.SceneMgr
+
+
+
## From: http://www.ogre3d.org/phpBB2/viewtopic.php?p=183438#183438
class HighlightQueueListener ( ogre.RenderQueueListener ):
@@ -81,15 +84,16 @@
rendersys.setStencilCheckEnabled(True)
rendersys.setStencilBufferParams(ogre.CMPF_NOT_EQUAL,1,0xFFFFFFFF,
ogre.SOP_KEEP,ogre.SOP_KEEP,ogre.SOP_KEEP,False)
+ return skipThisInvocation
-
def renderQueueEnded(self,queueGroupId, invocation,repeatThisInvocation):
if (( queueGroupId == 90 ) or ( queueGroupId == 91 )):
rendersys = ogre.Root.getSingleton().getRenderSystem()
rendersys.setStencilCheckEnabled(False)
- rendersys.setStencilBufferParams()
+ rendersys.setStencilBufferParams()
+ return repeatThisInvocation
##/////////////////////////////////////////////////////////////////////////////
@@ -322,9 +326,8 @@
self.Root.setRenderSystem(self.RenderSystem)
self.RenderSystem.setConfigOption("Full Screen", configuration["fullscreen"])
- ##self.RenderSystem.setConfigOption("VSync", configuration["vsync"])
- self.RenderSystem.setConfigOption("VSync", "Yes")
-
+ self.RenderSystem.setConfigOption("VSync", configuration["vsync"])
+
if (configuration["device"] == "Direct3D9 Rendering Subsystem"):
self.RenderSystem.setConfigOption("Video Mode",
configuration["width"]
@@ -1162,9 +1165,9 @@
def start(self):
self.World = nxogre.World("log: html")
- self.Scene = self.World.createScene("Main", self.SceneMgr, "gravity: yes, floor: yes")
+ self.Scene = self.World.createScene("Main", self.SceneMgr, "gravity: yes, floor: yes, time-step-method: variable")
- self.Scene.createBody("cube.1m.mesh", nxogre.CubeShape(1), ogre.Vector3(0,2.5,0), "mass: 10")
+ self.Scene.createBody("cube.1m.mesh", nxogre.CubeShape(1), ogre.Vector3(0,5,0), "mass: 10")
def stop(self):
del self.World
@@ -1189,15 +1192,10 @@
import exceptions,sys
try:
application = Sponge_Cake ()
- print "PRE"
application.pre()
- print "START"
application.start()
- print "GETWORLD"
application.WorldInstance = application.getWorld()
- print "startRendereing"
application.startRendering(application)
- print "STOP"
application.stop()
application.post()
Modified: trunk/python-ogre/demos/nxogre/config.yaml
===================================================================
--- trunk/python-ogre/demos/nxogre/config.yaml 2007-08-12 14:34:59 UTC (rev 372)
+++ trunk/python-ogre/demos/nxogre/config.yaml 2007-08-30 11:46:24 UTC (rev 373)
@@ -1,8 +1,8 @@
# Graphics
-device:dx9
+device:direct3d9
width:640
height:480
-depth:16
+depth:32
aa:0
vsync:No
fullscreen:No
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-08-12 14:35:00
|
Revision: 372
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=372&view=rev
Author: andy_miller
Date: 2007-08-12 07:34:59 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/python-ogre/code_generators/ogredshow/generate_code.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/demos/gui/Demo_QuickGUI01.py
trunk/python-ogre/demos/nxogre/CakeFramework.py
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/demos/gui/resources.cfg.quickgui
Modified: trunk/python-ogre/code_generators/ogredshow/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogredshow/generate_code.py 2007-08-11 05:55:18 UTC (rev 371)
+++ trunk/python-ogre/code_generators/ogredshow/generate_code.py 2007-08-12 14:34:59 UTC (rev 372)
@@ -535,10 +535,10 @@
for f in additional_files:
if f.endswith('cpp') or f.endswith('.h'):
sourcefile = os.path.join(p, f)
- destfile = os.path.join(environment.ogrevideoffmpeg.generated_dir, f )
+ destfile = os.path.join(environment.ogredshow.generated_dir, f )
if not common_utils.samefile( sourcefile ,destfile ):
- shutil.copy( sourcefile, environment.ogrevideoffmpeg.generated_dir )
+ shutil.copy( sourcefile, environment.ogredshow.generated_dir )
print "Updated ", f, "as it was missing or out of date"
if __name__ == '__main__':
Modified: trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2007-08-11 05:55:18 UTC (rev 371)
+++ trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py 2007-08-12 14:34:59 UTC (rev 372)
@@ -441,10 +441,10 @@
for f in additional_files:
if f.endswith('cpp') or f.endswith('.h'):
sourcefile = os.path.join(p, f)
- destfile = os.path.join(environment.ogredshow.generated_dir, f )
+ destfile = os.path.join(environment.ogrevideoffmpeg.generated_dir, f )
if not common_utils.samefile( sourcefile ,destfile ):
- shutil.copy( sourcefile, environment.ogredshow.generated_dir )
+ shutil.copy( sourcefile, environment.ogrevideoffmpeg.generated_dir )
print "Updated ", f, "as it was missing or out of date"
if __name__ == '__main__':
Modified: trunk/python-ogre/code_generators/quickgui/generate_code.py
===================================================================
--- trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-08-11 05:55:18 UTC (rev 371)
+++ trunk/python-ogre/code_generators/quickgui/generate_code.py 2007-08-12 14:34:59 UTC (rev 372)
@@ -106,6 +106,7 @@
global_ns.class_('::Ogre::FontPtr').include(already_exposed=True)
global_ns.class_('::Ogre::RenderQueueListener').include(already_exposed=True)
global_ns.class_('::Ogre::SceneManager').include(already_exposed=True)
+# global_ns.class_('::Ogre::TRect<float>').include(already_exposed=True)
global_ns.namespace( 'Ogre' ).class_('Singleton<QuickGUI::GUIManager>').include() #already_exposed=True)
Modified: trunk/python-ogre/demos/gui/Demo_QuickGUI01.py
===================================================================
--- trunk/python-ogre/demos/gui/Demo_QuickGUI01.py 2007-08-11 05:55:18 UTC (rev 371)
+++ trunk/python-ogre/demos/gui/Demo_QuickGUI01.py 2007-08-12 14:34:59 UTC (rev 372)
@@ -59,7 +59,7 @@
s = ""
if( gm.getMouseOverWidget() != None): s = gm.getMouseOverWidget().getInstanceName()
- w = gm.getDefaultSheet().getWindow("Mouse Over Window").getTextBox(0).setText(s)
+ w = gm.getDefaultSheet().getWindow("Mouse Over Window")
if w :
w.getTextBox(0).setText(s)
@@ -92,6 +92,13 @@
def keyPressed( self, arg ):
if( arg.key == ois.KC_ESCAPE ):
self.ShutdownRequested = True
+ elif ( arg.key == ois.KC_UP ):
+ camPos = self.camera.getPostion()
+ self.camera.setPosition(camPos.x, camPos.y, camPos.z-5)
+ elif ( arg.key == ois.KC_DOWN ):
+ camPos = self.camera.getPostion()
+ self.camera.setPosition(camPos.x, camPos.y, camPos.z+5)
+
## Now convert from OIS keycode to QuickGUI one..
k = gui.KeyCode.values[arg.key]
gui.GUIManager.getSingleton().injectKeyDown( k )
@@ -107,6 +114,20 @@
class QuickGUIDemoApp (sf.Application):
+
+ def _setUpResources(self):
+ """This sets up Ogre's resources, which are different for QuickGUI
+ """
+ config = Ogre.ConfigFile()
+ config.load('resources.cfg.quickgui' )
+ seci = config.getSectionIterator()
+ while seci.hasMoreElements():
+ SectionName = seci.peekNextKey()
+ Section = seci.getNext()
+ for item in Section:
+ Ogre.ResourceGroupManager.getSingleton().\
+ addResourceLocation(item.value, item.key, SectionName)
+
## Just override the mandatory create scene method
def _createScene(self):
self.mDebugDisplayShown=True
@@ -123,9 +144,7 @@
## other objects, but I don't
l.setPosition(20,80,50)
- print "\n\nCREATE GUIMANAGER\n"
self.mGUIManager = gui.GUIManager(self.renderWindow.getWidth(),self.renderWindow.getHeight())
- print "\n\n", self.mGUIManager
self.robot = self.sceneManager.createEntity("ChuckNorris", "robot.mesh")
@@ -136,7 +155,7 @@
## This ensures the camera doesn't move when we move the cursor..
#3 However we do the same thing by setting MenuMode to True in the frameListerner further down
- self.camera.setAutoTracking(True, robotNode)
+# # # self.camera.setAutoTracking(True, robotNode)
plane = Ogre.Plane( Ogre.Vector3.UNIT_Y, 0 )
Ogre.MeshManager.getSingleton().createPlane("ground",
@@ -177,72 +196,66 @@
def createGUI(self):
self.callbacks=[]
- self.mousecursor = self.mGUIManager.getMouseCursor()
- self.mousecursor.show()
- self.mousecursor.setTexture("qgui.unchecked.over.png" ) #pointer.png")
- self.mousecursor.setSize(50,50)
- print "\n\n",self.mousecursor,"\n\n"
-
-
+ self.mGUIManager.clearAll()
self.mSheet = self.mGUIManager.getDefaultSheet()
## Main Menu and it's MenuLists
- topMenu = self.mSheet.createMenu((0,0,1,0.04))
+ topMenu = self.mSheet.createMenu((0,0,1,0.05))
+
fileList = topMenu.addMenuList("File",0,0.075)
exitListItem = fileList.addListItem("Exit")
- exitListItem.addEventHandler(gui.Widget.Event.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback (self.evtHndlr_exitListItem ) )
+ exitListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback (self.evtHndlr_exitListItem ) )
- cameraList = topMenu.addMenuList("Camera Properties",0.08,0.2)
+ cameraList = topMenu.addMenuList("Progress",0.08,0.2)
pointListItem = cameraList.addListItem("Point")
- pointListItem.addImage(Ogre.Vector4(0,0,0.2,1),"demo.pointmode")
- pointListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_CameraPoint) )
+ pointListItem.addImage(Ogre.Vector4(0,0,0.2,1),"pointmode.png")
+ pointListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_CameraPoint) )
wireframeListItem = cameraList.addListItem("Wire Frame")
- wireframeListItem.addImage(Ogre.Vector4(0,0,0.2,1),"demo.wireframemode")
- wireframeListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_CameraWireFrame) )
+ wireframeListItem.addImage(Ogre.Vector4(0,0,0.2,1),"wireframemode.png")
+ wireframeListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_CameraWireFrame) )
solidListItem = cameraList.addListItem("Solid")
- solidListItem.addImage(Ogre.Vector4(0,0,0.2,1),"demo.solidmode")
- solidListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_CameraSolid) )
+ solidListItem.addImage(Ogre.Vector4(0,0,0.2,1),"solidmode.png")
+ solidListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_CameraSolid) )
- viewportList = topMenu.addMenuList("Progress Bar Color",0.285,0.2)
+ viewportList = topMenu.addMenuList("Progress Bar Color",0.285,0.25)
redListItem = viewportList.addListItem("Red")
- redListItem.addImage(Ogre.Vector4(0.1,0.1,0.8,0.8),"demo.listitem.red")
- redListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_pbRed) )
+ redListItem.addImage(Ogre.Vector4(0.1,0.1,0.8,0.8),"listitem.red.png")
+ redListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_pbRed) )
greenListItem = viewportList.addListItem("Green")
- greenListItem.addImage(Ogre.Vector4(0.1,0.1,0.8,0.8),"demo.listitem.green")
- greenListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_pbGreen) )
+ greenListItem.addImage(Ogre.Vector4(0.1,0.1,0.8,0.8),"listitem.green.png")
+ greenListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_pbGreen) )
blueListItem = viewportList.addListItem("Blue")
- blueListItem.addImage(Ogre.Vector4(0.1,0.1,0.8,0.8),"demo.listitem.blue")
- blueListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_pbBlue) )
+ blueListItem.addImage(Ogre.Vector4(0.1,0.1,0.8,0.8),"listitem.blue.png")
+ blueListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_pbBlue) )
- otherList = topMenu.addMenuList("Other",0.49,0.1)
+ otherList = topMenu.addMenuList("Other",0.55,0.25)
textColorListItem = otherList.addListItem("Text Color")
- textColorListItem.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_setTextWhite) )
+ textColorListItem.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_setTextWhite) )
tcProperties = textColorListItem.addNStateButton(Ogre.Vector4(0.8,0.1,0.175,0.9))
- tcProperties.addState("OpenProperties","demo.listitem.textproperties")
- tcProperties.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_showSetTextDialog) )
+ tcProperties.addState("OpenProperties","properties.png")
+ tcProperties.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_showSetTextDialog) )
RenderStatsListItem = otherList.addListItem("Render Stats")
toggleRenderStats = RenderStatsListItem.addNStateButton(Ogre.Vector4(0.8,0.1,0.175,0.9))
- toggleRenderStats.addState("checked","qgui.unchecked")
- toggleRenderStats.addState("unchecked","qgui.checked")
- toggleRenderStats.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_toggleDebugDisplay))
+ toggleRenderStats.addState("checked","qgui.unchecked.png")
+ toggleRenderStats.addState("unchecked","qgui.checked.png")
+ toggleRenderStats.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_toggleDebugDisplay))
## Logos
-
logoImage = self.mSheet.createImage((0.02,0.07,0.3,0.3))
logoImage.setBorderWidth(10)
logoLabel = self.mSheet.createLabel((0.075,0.4,0.15,0.05))
- logoLabel.setText("Click Me >")
+ logoLabel.getText().setCaption("Click Me >")
imageToggleButton = self.mSheet.createNStateButton(Ogre.Vector4(0.225,0.4,0.05,0.05))
- imageToggleButton.addState("OgreLogo","qgui.checked")
- imageToggleButton.addState("QuickGUILogo","qgui.unchecked")
+ imageToggleButton.addState("OgreLogo","qgui.checked.png")
+ imageToggleButton.addState("QuickGUILogo","qgui.unchecked.png")
## RTT Example Use
rttImage = self.mSheet.createImage(Ogre.Vector4(0.75,0.07,0.2,0.15),"self.rttTex")
- rttImage.setBorderWidth(10)
- ninjaWindow = self.mSheet.createWindow(Ogre.Vector4(0.725,0.25,0.25,0.15))
+# rttImage.setBorderWidth(10)
+ ninjaWindow = self.mSheet.createWindow(Ogre.Vector4(0.75,0.25,0.2,0.2))
ninjaWindow.hideTitlebar()
animToggleButton = ninjaWindow.createNStateButton(Ogre.Vector4(0.05,0.033,0.9,0.3))
## populate NStateButton with States - robot animations
@@ -250,7 +263,7 @@
state = 0
while( casi.hasMoreElements() ):
animName = casi.getNext().getAnimationName()
- animToggleButton.addState("State"+str(state),"qgui.button",animName)
+ animToggleButton.addState("State"+str(state),"qgui.button.png",animName)
if state == 0:
self.robotAnimationState = self.robot.getAnimationState(animName)
self.robotAnimationState.setEnabled(True)
@@ -258,61 +271,73 @@
self.robotAnimationState.setLoop(True)
state+=1
# animToggleButton.addOnStateChangedEventHandler(self.evtHndlr_changeAnimations)
-# animToggleButton.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_changeAnimations) )
+# animToggleButton.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_changeAnimations) )
animToggleButton.addOnStateChangedEventHandler(self.MakeCallback(self.evtHndlr_changeAnimations) )
hurtButton = ninjaWindow.createButton(Ogre.Vector4(0.05,0.36,0.9,0.3))
- hurtButton.setText("Hurt")
- hurtButton.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_hurt) )
+ hurtButton.getText().setCaption("Hurt")
+ hurtButton.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_hurt) )
healButton = ninjaWindow.createButton(Ogre.Vector4(0.05,0.69,0.9,0.3))
- healButton.setText("Heal")
- healButton.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_heal) )
-
- ## Progress Bar Setup
- self.mSheet.createLabel((0.4,0.5125,0.07,0.07),"").setText("HP")
- self.lifeBarValueLabel = self.mSheet.createLabel((0.55,0.5125,0.07,0.07),"")
- self.lifeBarValueLabel.setText("100")
- self.lifeBar =self.mSheet.createProgressBar((0.4,0.55,0.2,0.03))
+ healButton.getText().setCaption("Heal")
+ healButton.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_heal) )
- self.lifeBar.setTexture("progressbar.red")
+ ## TrackBar Setup
+ tb1 = self.mSheet.createTrackBar(Ogre.Vector4(0.4,0.1,0.2,0.04))
+ tb1.setNumRegions(3)
+ tb1.setTickPosition(4) # Does not work! 3 regions -> ticks: 0/1/2/3
+ tb2 = self.mSheet.createTrackBar(Ogre.Vector4(0.4,0.15,0.03,0.2))
+ tb2.setNumTicks(10)
+ tb2.setTickPosition(9)
+ ## Progress Bar Setup
+ self.lifeBar = self.mSheet.createProgressBar(Ogre.Vector4(0.4,0.55,0.2,0.03))
+ self.lifeBar.setInitialPixelOffset(0)
+ HPLabel = self.mSheet.createLabel(Ogre.Vector4(0.4,0.5125,0.07,0.07),"")
+ HPLabel.getText().setCaption("HP")
+ HPLabel.appearOverWidget(self.lifeBar)
+ self.lifeBarValueLabel = self.mSheet.createLabel(Ogre.Vector4(0.55,0.5125,0.07,0.07),"")
+ self.lifeBarValueLabel.getText().setCaption("100")
+ self.lifeBarValueLabel.appearOverWidget(self.lifeBar)
+
## Mouse Over window
- mouseOverWindow = self.mSheet.createWindow("Mouse Over Window",Ogre.Vector4(0.7,0.7,0.3,0.1))
+ mouseOverWindow = self.mSheet.createWindow("Mouse Over Window",Ogre.Vector4(0.6,0.7,0.4,0.1))
mouseOverWindow.hideTitlebar()
mouseOverLabel = mouseOverWindow.createLabel(Ogre.Vector4(0,0,1,0.5))
- mouseOverLabel.setText("Mouse Over Widget:")
+ mouseOverLabel.getText().setCaption("Mouse Over Widget:")
mouseOverTB = mouseOverWindow.createTextBox(Ogre.Vector4(0,0.5,1,0.5))
mouseOverTB.setReadOnly(True)
## Login Portion
- self.mSheet.createLabel(Ogre.Vector4(0.02,0.6,0.2,0.05)).setText("User Name:")
- self.mSheet.createLabel(Ogre.Vector4(0.02,0.65,0.2,0.05)).setText("Password:")
+ self.mSheet.createLabel(Ogre.Vector4(0.02,0.6,0.2,0.05)).getText().setCaption("User Name:")
+ self.mSheet.createLabel(Ogre.Vector4(0.02,0.65,0.2,0.05)).getText().setCaption("Password:")
self.usernameTB = self.mSheet.createTextBox(Ogre.Vector4(0.225,0.6,0.2,0.05))
self.passwordTB = self.mSheet.createTextBox(Ogre.Vector4(0.225,0.65,0.2,0.05))
self.passwordTB.maskUserInput(ord('*'))
loginButton = self.mSheet.createButton(Ogre.Vector4(0.125,0.7,0.25,0.07))
- loginButton.setText("Login")
- loginButton.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_login) )
+ loginButton.getText().setCaption("Login")
+ loginButton.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_login) )
self.loginResultLabel = self.mSheet.createLabel(Ogre.Vector4(0.0,0.77,0.5,0.05), "")
## Set Text Window
self.stWindow = self.mSheet.createWindow(Ogre.Vector4(0.7,0.45,0.3,0.2))
self.stWindow.hide()
- self.stWindow.createLabel((0.05,0.3,0.3,0.25)).getText().setCaption("Color:")
-
- self.stWindow.createLabel(Ogre.Vector4(0.05,0.3,0.3,0.25)).setText("Color:")
+ self.stWindow.getTitleBar().setCaption("Set Text Color:")
+
+ self.stWindow.createLabel(Ogre.Vector4(0.05,0.3,0.3,0.25)).getText().setCaption("Color:")
colorCB = self.stWindow.createComboBox(Ogre.Vector4(0.4,0.3,0.55,0.25))
colorCBdropList = colorCB.getDropDownList()
-
+
colorCBdropList.addListItem("Red")
colorCBdropList.addListItem("Green")
colorCBdropList.addListItem("Blue")
colorCBdropList.addListItem("Black")
colorCBdropList.addListItem("White")
setTextButton = self.stWindow.createButton(Ogre.Vector4(0.05,0.6,0.9,0.3))
- setTextButton.setText("Apply")
- setTextButton.addEventHandler(gui.Widget.QGUI_EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_setTextColor) )
-
+ setTextButton.setCaption("Apply")
+ setTextButton.addEventHandler(gui.Widget.EVENT_MOUSE_BUTTON_UP,self.MakeCallback(self.evtHndlr_setTextColor) )
+ # colorCB->clearList();
+ colorCBdropList.removeListItem(2)
+
def evtHndlr_exitListItem(self, args):
## check if left mouse button is down
if(args.button == gui.MB_Left):
@@ -337,33 +362,39 @@
currentProgress = self.lifeBar.getProgress()
random = Ogre.Math.RangeRandom(currentProgress,1.0)
self.lifeBar.setProgress(random)
- self.lifeBarValueLabel.setText(str(int(random * 100)))
+ self.lifeBarValueLabel.getText().setCaption(str(int(random * 100)))
return True
def evtHndlr_hurt(self, args):
- if args.button == gui.MB_Left:
- currentProgress = self.lifeBar.getProgress()
- random = Ogre.Math.RangeRandom(0.0,currentProgress)
- self.lifeBar.setProgress(random)
- self.lifeBarValueLabel.setText(str(int(random * 100)))
+ currentProgress = self.lifeBar.getProgress()
+ random = Ogre.Math.RangeRandom(0.0,currentProgress)
+ self.lifeBar.setProgress(random)
+ self.lifeBarValueLabel.getText().setCaption(str(int(random * 100)))
return True
def evtHndlr_pbRed(self,args):
- self.lifeBar.setMaterial("progressbar.red")
+ self.lifeBar.setTexture("progressbar.red.png")
+ self.lifeBar.setProgress(1.0)
+ self.lifeBar.getText().setCaption("100")
+
return False
def evtHndlr_pbGreen(self, args):
- self.lifeBar.setMaterial("progressbar.green")
+ self.lifeBar.setTexture("progressbar.gree.png")
+ self.lifeBar.setProgress(1.0)
+ self.lifeBar.getText().setCaption("100")
return True
def evtHndlr_pbBlue(self, args):
- self.lifeBar.setMaterial("progressbar.blue")
+ self.lifeBar.setTexture("progressbar.blue.png")
+ self.lifeBar.setProgress(1.0)
+ self.lifeBar.getText().setCaption("100")
return True
def evtHndlr_login(self, args):
- if( self.usernameTB.getText() == self.passwordTB.getText() ) : s = "Login Successful."
+ if( self.usernameTB.getCaption() == self.passwordTB.getCaption() ) : s = "Login Successful."
else: s = "Username and/or Password do not match."
- self.loginResultLabel.setText(s)
+ self.loginResultLabel.getText().setCaption(s)
return True
def evtHndlr_toggleDebugDisplay(self, args):
@@ -372,7 +403,7 @@
return True
def evtHndlr_setTextWhite(self, args):
- self.stWindow.setTextColor(Ogre.ColourValue.White)
+ self.stWindow.getTitleBar().getText().setColor(Ogre.ColourValue.White)
return True
def evtHndlr_showSetTextDialog(self, args):
@@ -393,7 +424,7 @@
return True
def evtHndlr_setTextColor(self, args):
- s = self.stWindow.getComboBox(0).getText()
+ s = self.stWindow.getComboBox(0).getText().getCaption()
if( s == "Red" ): c = Ogre.ColourValue.Red
elif( s == "Green" ): c = Ogre.ColourValue.Green
@@ -401,7 +432,7 @@
elif( s == "Black" ): c = Ogre.ColourValue.Black
elif( s == "White" ): c = Ogre.ColourValue.White
- self.stWindow.setTextColor(c)
+ self.stWindow.getTitleBar().getText().setColor(c)
return True
def _createFrameListener(self):
Added: trunk/python-ogre/demos/gui/resources.cfg.quickgui
===================================================================
--- trunk/python-ogre/demos/gui/resources.cfg.quickgui (rev 0)
+++ trunk/python-ogre/demos/gui/resources.cfg.quickgui 2007-08-12 14:34:59 UTC (rev 372)
@@ -0,0 +1,15 @@
+# Resource locations to be added to the 'boostrap' path
+# This also contains the minimum you need to use the Ogre example framework
+[Bootstrap]
+Zip=../media/packs/OgreCore.zip
+
+# Resource locations to be added to the default path
+[General]
+FileSystem=../media
+FileSystem=../media/materials/scripts
+FileSystem=../media/materials/textures
+FileSystem=../media/models
+FileSystem=../media/Skins
+FileSystem=../media/Skins/qgui
+FileSystem=../media/Skins/qgui_demo
+Zip=../media/packs/cubemapsJS.zip
Modified: trunk/python-ogre/demos/nxogre/CakeFramework.py
===================================================================
--- trunk/python-ogre/demos/nxogre/CakeFramework.py 2007-08-11 05:55:18 UTC (rev 371)
+++ trunk/python-ogre/demos/nxogre/CakeFramework.py 2007-08-12 14:34:59 UTC (rev 372)
@@ -445,6 +445,7 @@
self.Camera.setNearClipDistance(0.1)
self.RMB=False
self.Effects=[] ## we need to keep effects around
+ self.objects=[] ## hold newly created objects
## Building stuff
self.BuildMode = Enum ('BM_NONE',
@@ -972,30 +973,30 @@
if (b.getPosition().x == 96 and self.mBuildMode == self.BuildMode.BM_ACTOR and c == 1) :
sz = self.BuildNode.getScale()
- b = None
if (self.BuildMesh == "cube.1m.mesh"):
- b = self.Scene.createBody(self.BuildMesh, nxogre.CubeShape(sz.x,sz.y,sz.z),
- mxogre.Pose(self.BuildNode.getPosition(), self.BuildNode.getOrientation()),
+ tempBody = self.Scene.createBody(self.BuildMesh, nxogre.CubeShape(sz.x,sz.y,sz.z),
+ nxogre.Pose(self.BuildNode.getPosition(), self.BuildNode.getOrientation()),
"Density: 100, node-scale:" + str(self.BuildNode.getScale()))
elif (self.BuildMesh == "sphere.50cm.mesh"):
- b = self.Scene.createBody(self.BuildMesh, nxogre.SphereShape(sz.x * 0.5),
+ tempBody = self.Scene.createBody(self.BuildMesh, nxogre.SphereShape(sz.x * 0.5),
nxogre.Pose(self.BuildNode.getPosition(), self.BuildNode.getOrientation()),
"Density: 100, node-scale:" + str(ogre.Vector3(sz.x,sz.x,sz.x)))
elif (self.BuildMesh == "convex1.mesh"):
- b = self.Scene.createBody(self.BuildMesh,
+ tempBody = self.Scene.createBody(self.BuildMesh,
nxogre.ConvexShape("convex1.mesh", "mesh-scale:" + str(sz)),
nxogre.Pose(self.BuildNode.getPosition(), self.BuildNode.getOrientation()),
"Density: 100, node-scale:" + str(ogre.Vector3(sz.x,sz.y,sz.z)))
self.BuildNode.setVisible(False)
self.BuildNode.detachAllObjects()
- b.getEntity().setMaterialName(self.BuildMaterials[self.CurrentBuildMaterial])
+ tempBody.getEntity().setMaterialName(self.BuildMaterials[self.CurrentBuildMaterial])
e=BetaGUI.AlphaEffect(self.WidgetEdit, 0.25, 1,0,0)
self.Gui.addEffect(e)
self.Effects.append(e)
self.mBuildMode = self.BuildMode.BM_NONE
-
+ self.objects.append(tempBody)
+
##////////////////////////////////////////////////////////////////////////////////
if (b.getPosition().x == 0) :
if (c == 1) :
Modified: trunk/python-ogre/setup.py
===================================================================
--- trunk/python-ogre/setup.py 2007-08-11 05:55:18 UTC (rev 371)
+++ trunk/python-ogre/setup.py 2007-08-12 14:34:59 UTC (rev 372)
@@ -57,13 +57,15 @@
demofiles = GetFileList ( os.path.join (base, "demos") )
PACKAGEDATA = {
- "packages": ['ogre', 'ogre.io', 'ogre.io.OIS', 'ogre.renderer', 'ogre.renderer.OGRE',
- 'ogre.gui', 'ogre.gui.CEGUI','ogre.sound', 'ogre.sound.OgreAL',
+ "packages": ['ogre',
+ 'ogre.io', 'ogre.io.OIS',
+ 'ogre.renderer', 'ogre.renderer.OGRE',
+ 'ogre.gui', 'ogre.gui.CEGUI','ogre.gui.QuickGUI', 'ogre.gui.betagui',
+ 'ogre.sound', 'ogre.sound.OgreAL',
'ogre.physics', 'ogre.physics.ODE', 'ogre.physics.OgreRefApp',
'ogre.physics.OgreOde', 'ogre.physics.OgreNewt', 'ogre.physics.Opcode',
- 'ogre.gui.QuickGUI', 'ogre.renderer.OGREdshow',
'ogre.physics.bullet','ogre.physics.PhysX','ogre.physics.NxOgre',
- 'ogre.gui.betagui','ogre.addons','ogre.addons.theora',
+ 'ogre.addons','ogre.addons.theora',
'ogre.addons.ogrevideoffmpeg', 'ogre.addons.ogredshow'],
"package_dir": {'': 'packages_'+ PythonVersionString },
"package_data": {'': ['*.pyd', '*.dll', '*.so']}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2007-08-11 05:55:16
|
Revision: 371
http://python-ogre.svn.sourceforge.net/python-ogre/?rev=371&view=rev
Author: andy_miller
Date: 2007-08-10 22:55:18 -0700 (Fri, 10 Aug 2007)
Log Message:
-----------
Changes/Updates for 1.0 Release
New Modules - NxOgre, PhysX, DirectShow Video, FFMPEG Video, BetaGui.cpp
Updates/Fixes for Ogre, QuickGUI
New Demos for ODE + New Modules
Modified Paths:
--------------
trunk/python-ogre/ChangeLog.txt
trunk/python-ogre/PythonOgreConfig_nt.py
trunk/python-ogre/PythonOgreConfig_posix.py
trunk/python-ogre/SConstruct
trunk/python-ogre/ThirdParty/vcredist_x86.exe
trunk/python-ogre/code_generators/bullet/generate_code.py
trunk/python-ogre/code_generators/cegui/customization_data.py
trunk/python-ogre/code_generators/cegui/generate_code.py
trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
trunk/python-ogre/code_generators/cegui/python_CEGUI_aliases.h
trunk/python-ogre/code_generators/common_utils/extract_documentation.py
trunk/python-ogre/code_generators/ogre/generate_code.py
trunk/python-ogre/code_generators/ogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogre/python_ogre_aliases.h
trunk/python-ogre/code_generators/ogre/python_ogre_sizeof.h
trunk/python-ogre/code_generators/ogreode/generate_code.py
trunk/python-ogre/code_generators/opcode/generate_code.py
trunk/python-ogre/code_generators/opcode/hand_made_wrappers.py
trunk/python-ogre/code_generators/quickgui/generate_code.py
trunk/python-ogre/code_generators/quickgui/python_quickgui.h
trunk/python-ogre/code_generators/quickgui/python_quickgui_aliases.h
trunk/python-ogre/demos/gui/Demo_QuickGUI01.py
trunk/python-ogre/demos/gui/plugins.cfg
trunk/python-ogre/demos/gui/tofix/MenuDemo.py
trunk/python-ogre/demos/media/gui/ogregui.layout
trunk/python-ogre/demos/media/materials/scripts/Example.material
trunk/python-ogre/demos/media/skins/SkinTemplate.material
trunk/python-ogre/demos/ogre/Demo_Basic.py
trunk/python-ogre/demos/ogre/Demo_Bezier.py
trunk/python-ogre/demos/ogre/Demo_CameraTracking.py
trunk/python-ogre/demos/ogre/Demo_Grass.py
trunk/python-ogre/demos/ogre/Demo_SkeletalAnimation.py
trunk/python-ogre/demos/ogre/Demo_SkeletonAnimation.py
trunk/python-ogre/demos/ogre/Demo_SkyBox.py
trunk/python-ogre/demos/ogre/Demo_SkyDome.py
trunk/python-ogre/demos/ogre/Demo_Smoke.py
trunk/python-ogre/demos/ogre/Demo_Spinner.py
trunk/python-ogre/demos/ogre/Demo_Terrain.py
trunk/python-ogre/demos/ogre/plugins.cfg
trunk/python-ogre/demos/ogre/tests/Test_Iterator.py
trunk/python-ogre/demos/ogre/tests/plugins.cfg
trunk/python-ogre/environment.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGRE/sf_OIS.py
trunk/python-ogre/scripts/epydoc_config
trunk/python-ogre/setup.py
Added Paths:
-----------
trunk/python-ogre/ThirdParty/betagui/
trunk/python-ogre/ThirdParty/betagui/BetaGUI.h
trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp
trunk/python-ogre/ThirdParty/betagui/BetaGui.py
trunk/python-ogre/ThirdParty/dshow/
trunk/python-ogre/ThirdParty/dshow/UtilsOgreDShow.cpp
trunk/python-ogre/ThirdParty/dshow/UtilsOgreDshow.h
trunk/python-ogre/ThirdParty/dshow/UtilsOgreDshow_private.h
trunk/python-ogre/ThirdParty/ffmpeg/
trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.cpp
trunk/python-ogre/ThirdParty/ffmpeg/videoPlayer.h
trunk/python-ogre/code_generators/betagui/
trunk/python-ogre/code_generators/betagui/customization_data.py
trunk/python-ogre/code_generators/betagui/generate_code.py
trunk/python-ogre/code_generators/betagui/hand_made_wrappers.py
trunk/python-ogre/code_generators/betagui/python_betagui.h
trunk/python-ogre/code_generators/betagui/python_betagui_aliases.h
trunk/python-ogre/code_generators/betagui/python_betagui_sizeof.h
trunk/python-ogre/code_generators/nxogre/
trunk/python-ogre/code_generators/nxogre/customization_data.py
trunk/python-ogre/code_generators/nxogre/generate_code.py
trunk/python-ogre/code_generators/nxogre/hand_made_wrappers.py
trunk/python-ogre/code_generators/nxogre/python_nxogre.h
trunk/python-ogre/code_generators/nxogre/python_nxogre_aliases.h
trunk/python-ogre/code_generators/nxogre/python_nxogre_sizeof.h
trunk/python-ogre/code_generators/nxogre/register_exceptions.py
trunk/python-ogre/code_generators/ogredshow/
trunk/python-ogre/code_generators/ogredshow/customization_data.py
trunk/python-ogre/code_generators/ogredshow/generate_code.py
trunk/python-ogre/code_generators/ogredshow/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogredshow/python_ogredshow.h
trunk/python-ogre/code_generators/ogredshow/python_ogredshow_aliases.h
trunk/python-ogre/code_generators/ogredshow/python_ogredshow_sizeof.h
trunk/python-ogre/code_generators/ogredshow/register_exceptions.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/
trunk/python-ogre/code_generators/ogrevideoffmpeg/PythonOgreConfig_posix.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/customization_data.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/generate_code.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/hand_made_wrappers.py
trunk/python-ogre/code_generators/ogrevideoffmpeg/python_ogrevideoffmpeg.h
trunk/python-ogre/code_generators/ogrevideoffmpeg/python_ogrevideoffmpeg_aliases.h
trunk/python-ogre/code_generators/ogrevideoffmpeg/python_ogrevideoffmpeg_sizeof.h
trunk/python-ogre/code_generators/theora/
trunk/python-ogre/code_generators/theora/customization_data.py
trunk/python-ogre/code_generators/theora/generate_code.py
trunk/python-ogre/code_generators/theora/hand_made_wrappers.py
trunk/python-ogre/code_generators/theora/python_theora.h
trunk/python-ogre/code_generators/theora/python_theora_aliases.h
trunk/python-ogre/code_generators/theora/python_theora_sizeof.h
trunk/python-ogre/code_generators/theora/register_exceptions.py
trunk/python-ogre/demos/dshow/
trunk/python-ogre/demos/dshow/Demo_Video.py
trunk/python-ogre/demos/dshow/SampleFramework.py
trunk/python-ogre/demos/dshow/plugins.cfg
trunk/python-ogre/demos/dshow/resources.cfg
trunk/python-ogre/demos/ffmpeg/
trunk/python-ogre/demos/ffmpeg/Demo_Video.py
trunk/python-ogre/demos/ffmpeg/SampleFramework.py
trunk/python-ogre/demos/ffmpeg/plugins.cfg
trunk/python-ogre/demos/ffmpeg/resources.cfg
trunk/python-ogre/demos/ffmpeg/test.wmv
trunk/python-ogre/demos/gui/MenuDemo.py
trunk/python-ogre/demos/media/Audio/clock.avi
trunk/python-ogre/demos/media/Audio/clock.ogg
trunk/python-ogre/demos/media/ComplexMeshes/
trunk/python-ogre/demos/media/ComplexMeshes/cloth.material
trunk/python-ogre/demos/media/ComplexMeshes/nx.flag.png
trunk/python-ogre/demos/media/Env/
trunk/python-ogre/demos/media/Env/nx.floor.material
trunk/python-ogre/demos/media/Env/nx.floor.mesh
trunk/python-ogre/demos/media/Env/nx.floor.png
trunk/python-ogre/demos/media/Env/nx.floor.shadowalpha.png
trunk/python-ogre/demos/media/Env/nx.skygrid.png
trunk/python-ogre/demos/media/Essential/
trunk/python-ogre/demos/media/Essential/BetaGUI/
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.button.active.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.button.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.material
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.pointer.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.textinput.active.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.textinput.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.window.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.window.resize.active.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.window.resize.png
trunk/python-ogre/demos/media/Essential/BetaGUI/bgui.window.titlebar.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/bgui.exit.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/bgui.exit.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/bgui.pause.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/bgui.pause.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/debug.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/debug.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/debugon.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/debugon.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.material.material
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.material.text.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.material.window.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.material.window.titlebar.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.confirm.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.confirm.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.do.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.do.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.up.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/editor.microtext.up.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/nxbgui.material
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/pause.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/pause.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/play.active.png
trunk/python-ogre/demos/media/Essential/BetaGUIExtended/play.png
trunk/python-ogre/demos/media/Essential/Boot/
trunk/python-ogre/demos/media/Essential/Boot/101.jpg
trunk/python-ogre/demos/media/Essential/Boot/102.jpg
trunk/python-ogre/demos/media/Essential/Boot/103.jpg
trunk/python-ogre/demos/media/Essential/Boot/any.jpg
trunk/python-ogre/demos/media/Essential/Boot/arrow1.png
trunk/python-ogre/demos/media/Essential/Boot/axis_x.png
trunk/python-ogre/demos/media/Essential/Boot/axis_y.png
trunk/python-ogre/demos/media/Essential/Boot/axis_z.png
trunk/python-ogre/demos/media/Essential/Boot/bodyguide1m.png
trunk/python-ogre/demos/media/Essential/Boot/boot.material
trunk/python-ogre/demos/media/Essential/Boot/debug.png
trunk/python-ogre/demos/media/Essential/Boot/gui.material
trunk/python-ogre/demos/media/Essential/Boot/gui_loading.png
trunk/python-ogre/demos/media/Essential/Boot/gui_loading_notice.png
trunk/python-ogre/demos/media/Essential/Boot/gui_options.png
trunk/python-ogre/demos/media/Essential/Boot/gui_options_selected.png
trunk/python-ogre/demos/media/Essential/Boot/gui_pause.png
trunk/python-ogre/demos/media/Essential/Boot/gui_save.png
trunk/python-ogre/demos/media/Essential/Boot/gui_save_selected.png
trunk/python-ogre/demos/media/Essential/Boot/gui_slowfast.png
trunk/python-ogre/demos/media/Essential/Boot/nx.body.axis.mesh
trunk/python-ogre/demos/media/Essential/Boot/nx.bodyguide.material
trunk/python-ogre/demos/media/Essential/Boot/nx.bodyguide.mesh
trunk/python-ogre/demos/media/Essential/Fonts/
trunk/python-ogre/demos/media/Essential/Fonts/MgOpen.license.txt
trunk/python-ogre/demos/media/Essential/Fonts/MgOpen.png
trunk/python-ogre/demos/media/Essential/Fonts/MgOpen.ttf
trunk/python-ogre/demos/media/Essential/Fonts/MgOpenAsBitmap.fontdef
trunk/python-ogre/demos/media/Essential/Fonts/MgOpenAsNxOgreFont.fontdef
trunk/python-ogre/demos/media/Essential/icon.cube.png
trunk/python-ogre/demos/media/Essential/icon.sphere.png
trunk/python-ogre/demos/media/Essential/widget.add.active.png
trunk/python-ogre/demos/media/Essential/widget.add.png
trunk/python-ogre/demos/media/Essential/widget.angle.over.png
trunk/python-ogre/demos/media/Essential/widget.angle.png
trunk/python-ogre/demos/media/Essential/widget.create.png
trunk/python-ogre/demos/media/Essential/widget.edit.png
trunk/python-ogre/demos/media/Essential/widget.material.over.png
trunk/python-ogre/demos/media/Essential/widget.material.png
trunk/python-ogre/demos/media/Essential/widget.mm.bodies.over.png
trunk/python-ogre/demos/media/Essential/widget.mm.bodies.png
trunk/python-ogre/demos/media/Essential/widget.mm.fx.over.png
trunk/python-ogre/demos/media/Essential/widget.mm.fx.png
trunk/python-ogre/demos/media/Essential/widget.mm.joints.over.png
trunk/python-ogre/demos/media/Essential/widget.mm.joints.png
trunk/python-ogre/demos/media/Essential/widget.mm.png
trunk/python-ogre/demos/media/Essential/widget.scale.over.png
trunk/python-ogre/demos/media/Essential/widget.scale.png
trunk/python-ogre/demos/media/Essential/widgets.material
trunk/python-ogre/demos/media/SimpleMeshes/
trunk/python-ogre/demos/media/SimpleMeshes/Example_BumpMapping.cg
trunk/python-ogre/demos/media/SimpleMeshes/capsule.50cmx1m.mesh
trunk/python-ogre/demos/media/SimpleMeshes/capsule.prefix.material
trunk/python-ogre/demos/media/SimpleMeshes/convex.prefix.material
trunk/python-ogre/demos/media/SimpleMeshes/convex1.mesh
trunk/python-ogre/demos/media/SimpleMeshes/cube.1m-2m-1m.mesh
trunk/python-ogre/demos/media/SimpleMeshes/cube.1m.h.mesh
trunk/python-ogre/demos/media/SimpleMeshes/cube.1m.mesh
trunk/python-ogre/demos/media/SimpleMeshes/cube.1m.smooth.mesh
trunk/python-ogre/demos/media/SimpleMeshes/cube.mesh
trunk/python-ogre/demos/media/SimpleMeshes/cube.prefix.material
trunk/python-ogre/demos/media/SimpleMeshes/fish.mesh
trunk/python-ogre/demos/media/SimpleMeshes/hilight.material
trunk/python-ogre/demos/media/SimpleMeshes/nx-cube-diffuse.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx-cube-normal.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx-cube-spec.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.70s1.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.block.material
trunk/python-ogre/demos/media/SimpleMeshes/nx.block.mesh
trunk/python-ogre/demos/media/SimpleMeshes/nx.convex2.material
trunk/python-ogre/demos/media/SimpleMeshes/nx.convex2.mesh
trunk/python-ogre/demos/media/SimpleMeshes/nx.convex2.mesh.xml
trunk/python-ogre/demos/media/SimpleMeshes/nx.cube.png
trunk/python-ogre/demos/media/SimpleMeshes/nx.flag.png
trunk/python-ogre/demos/media/SimpleMeshes/nx.lava.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.planet1.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.planet2.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.sphere.50cm.mesh
trunk/python-ogre/demos/media/SimpleMeshes/nx.sphere.50cm.mesh.xml
trunk/python-ogre/demos/media/SimpleMeshes/nx.sphere.material
trunk/python-ogre/demos/media/SimpleMeshes/nx.sphere1.png
trunk/python-ogre/demos/media/SimpleMeshes/nx.stone1.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.tartan.dds
trunk/python-ogre/demos/media/SimpleMeshes/nx.tube.material
trunk/python-ogre/demos/media/SimpleMeshes/nx.tube.mesh
trunk/python-ogre/demos/media/SimpleMeshes/nx.yellow1.png
trunk/python-ogre/demos/media/SimpleMeshes/prism.12x150cmx3m.mesh
trunk/python-ogre/demos/media/SimpleMeshes/prism.8x50cmx2m.mesh
trunk/python-ogre/demos/media/SimpleMeshes/racecar.material
trunk/python-ogre/demos/media/SimpleMeshes/racecar.mesh
trunk/python-ogre/demos/media/SimpleMeshes/racecar1.png
trunk/python-ogre/demos/media/SimpleMeshes/sandbox.material
trunk/python-ogre/demos/media/SimpleMeshes/sphere.2m.mesh
trunk/python-ogre/demos/media/SimpleMeshes/sphere.50cm.mesh
trunk/python-ogre/demos/media/SimpleMeshes/sphere.prefix.material
trunk/python-ogre/demos/media/SimpleMeshes/squirrel.mesh
trunk/python-ogre/demos/media/SimpleMeshes/squirrel.skeleton
trunk/python-ogre/demos/media/SimpleMeshes/tyre.png
trunk/python-ogre/demos/media/SimpleMeshes/wheel50cmx10cmx50cm.material
trunk/python-ogre/demos/media/SimpleMeshes/wheel50cmx10cmx50cm.mesh
trunk/python-ogre/demos/media/skins/qgui/qgui.image.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.horizontal.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.horizontal.slider.down.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.horizontal.slider.over.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.horizontal.slider.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.vertical.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.vertical.slider.down.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.vertical.slider.over.png
trunk/python-ogre/demos/media/skins/qgui/qgui.trackbar.vertical.slider.png
trunk/python-ogre/demos/media/skins/qgui/qgui_uv_test0.png
trunk/python-ogre/demos/media/times.ttf
trunk/python-ogre/demos/nxogre/
trunk/python-ogre/demos/nxogre/BetaGui.py
trunk/python-ogre/demos/nxogre/CakeFramework.py
trunk/python-ogre/demos/nxogre/Demo_101.py
trunk/python-ogre/demos/nxogre/Demo_102.py
trunk/python-ogre/demos/nxogre/Demo_103.py
trunk/python-ogre/demos/nxogre/Enums.py
trunk/python-ogre/demos/nxogre/SampleFramework.py
trunk/python-ogre/demos/nxogre/config.yaml
trunk/python-ogre/demos/nxogre/plugins.cfg
trunk/python-ogre/demos/nxogre/resources.cfg
trunk/python-ogre/demos/ogre/Demo_Shadows.py
trunk/python-ogre/demos/ogreode/GranTurismOgre.py
trunk/python-ogre/demos/opcode/Demo_OgreCollision01.py
trunk/python-ogre/demos/opcode/Demo_OpcodeCollision01.py
trunk/python-ogre/packages_2.5/ogre/addons/
trunk/python-ogre/packages_2.5/ogre/addons/__init__.py
trunk/python-ogre/packages_2.5/ogre/addons/ogredshow/
trunk/python-ogre/packages_2.5/ogre/addons/ogredshow/__init__.py
trunk/python-ogre/packages_2.5/ogre/addons/ogrevideoffmpeg/
trunk/python-ogre/packages_2.5/ogre/addons/ogrevideoffmpeg/__init__.py
trunk/python-ogre/packages_2.5/ogre/addons/theora/
trunk/python-ogre/packages_2.5/ogre/addons/theora/__init__.py
trunk/python-ogre/packages_2.5/ogre/gui/betagui/
trunk/python-ogre/packages_2.5/ogre/gui/betagui/__init__.py
trunk/python-ogre/packages_2.5/ogre/physics/NxOgre/
trunk/python-ogre/packages_2.5/ogre/physics/NxOgre/__init__.py
trunk/python-ogre/packages_2.5/ogre/physics/PhysX/
trunk/python-ogre/packages_2.5/ogre/physics/PhysX/__init__.py
trunk/python-ogre/packages_2.5/ogre/physics/bullet/
trunk/python-ogre/packages_2.5/ogre/physics/bullet/__init__.py
trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/
trunk/python-ogre/packages_2.5/ogre/renderer/OGREdshow/__init__.py
Removed Paths:
-------------
trunk/python-ogre/code_generators/ogrevideo/
trunk/python-ogre/demos/ogre/tests/ogre.cfg
trunk/python-ogre/demos/opcode/ogre.cfg
Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt 2007-07-25 04:47:51 UTC (rev 370)
+++ trunk/python-ogre/ChangeLog.txt 2007-08-11 05:55:18 UTC (rev 371)
@@ -1,12 +1,24 @@
-xxx 2007
+
+August 10 2007: Version 1.0 - Release
============================================
-* Updated to QuickGui 0.9.5
+* Added NxOgre Wrapper -- single demo with Cakewalk
+* Added PhysX Wrapper -- required for NxOgre -- you need to install the PhysX library
+* Added OgreDshow wrapper -- play videos (with sound) on textures using DirectShow
+* Added OgreVideoFfmpeg wrapper (thanks Dermont) -- plays video (without sound) vis ffmpeg
+* Added BetaGUI wrapper -- needed for the NxOgre Cakewalk conversion
+* Updated to QuickGui 0.9.5 -- using SVN version
* Added common_utils function to remove duplicate Properties which happened when there was a getXXX AND a hasXXX implemented
in the C++ code -- now we filter these are give the getXXX priority
* Implemented support for Ogre compiled with THREADS enabled - need to set value to True in ogre/generate_code.py
* Change implemented in Py++ to expose missing 'setters'
-* Added bullet physics to the library - no testing as of yet
+* Added castAsOverlayContainer function to Ogre -- needed for 'add2D' functionality
+* Added bullet physics to the library - no testing as of yet -- probably doesn't work
+* Fixed issue where we were exposing constructors with arguments that were pointers to fundemental types (int * etc)
+ could cause a crash if passing invalid parameters (None) to these constructors
* OIS compile has changed to use the static library instead of the dll
+* Updated Windows Help documentation
+* SVN and Tickets have been moved to SourceForge
+* Using "touch" on the release files to get some consistancy in the release
June 10 2007: Version 1.0 RC2(c) -- Release
============================================
Modified: trunk/python-ogre/PythonOgreConfig_nt.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_nt.py 2007-07-25 04:47:51 UTC (rev 370)
+++ trunk/python-ogre/PythonOgreConfig_nt.py 2007-08-11 05:55:18 UTC (rev 371)
@@ -36,9 +36,16 @@
PATH_raknet= os.path.join(BASE_DIR, 'RakNet')
PATH_OPCODE= os.path.join(BASE_DIR, 'Opcode')
PATH_quickgui= os.path.join(root_dir, 'ThirdParty','quickgui')
+PATH_quickgui= os.path.join(BASE_DIR, 'Quickgui') ## note test for Quickgui SVN version
+PATH_betagui= os.path.join(root_dir, 'ThirdParty','betagui')
PATH_NxOgre= os.path.join(BASE_DIR, 'nxogre/NxOgre')
PATH_Bullet= os.path.join(BASE_DIR, 'bullet-2.52')
PATH_PhysX= "c:/program files/AGEIA Technologies/SDK/v2.7.2/SDKs"
+PATH_Theora= os.path.join(PATH_OgreAddons,'videoplugin','TheoraVideo')
+PATH_Dshow= os.path.join(root_dir, 'ThirdParty','dshow')
+PATH_ogrevideoffmpeg = os.path.join(root_dir, 'ThirdParty','ffmpeg')
+PATH_ffmpeg= os.path.join(BASE_DIR, 'ffmpeg')
+PATH_ogredshow = os.path.join(root_dir, 'ThirdParty','dshow')
#
# it's time for the SDK version
if SDK:
@@ -76,11 +83,16 @@
PATH_LIB_OgreOdeLoader = os.path.join( PATH_OgreOde, 'loader/lib/Release' )
PATH_LIB_FMOD = os.path.join(PATH_FMOD, 'api/lib')
PATH_LIB_OgreAL = os.path.join(PATH_OGREAL, 'lib/Release' )
-PATH_LIB_quickgui = PATH_quickgui
+PATH_LIB_betagui = PATH_betagui
+PATH_LIB_quickgui = os.path.join(PATH_quickgui, 'bin')
PATH_LIB_raknet = os.path.join(PATH_raknet, 'Lib' )
-PATH_LIB_NxOgre= os.path.join(PATH_NxOgre, 'compiler','NxOgre.VC8','Release','lib')
-PATH_LIB_PhysX = ""
+PATH_LIB_NxOgre= os.path.join(PATH_NxOgre, 'lib')
+PATH_LIB_PhysX = os.path.join(PATH_PhysX,'lib/win32')
PATH_LIB_Bullet = os.path.join(PATH_Bullet, 'out/release8/libs' )
+PATH_LIB_Theora= os.path.join(PATH_Theora, 'bin', 'Release')
+PATH_LIB_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_LIB_ffmpeg= os.path.join(PATH_ffmpeg, 'lib')
+PATH_LIB_ogredshow = PATH_ogredshow
if SDK:
PATH_LIB_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'lib')
@@ -111,11 +123,24 @@
PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')
PATH_INCLUDE_FMOD = os.path.join(PATH_FMOD, 'api/inc')
PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples/Common/CEGUIRenderer/include')
-PATH_INCLUDE_quickgui = PATH_quickgui
+PATH_INCLUDE_quickgui = os.path.join(PATH_quickgui,'QuickGUI','include')
PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
PATH_INCLUDE_NxOgre= os.path.join(PATH_NxOgre, 'include')
PATH_INCLUDE_Bullet= os.path.join(PATH_Bullet, 'src')
+PATH_INCLUDE_freetype= os.path.join(PATH_INCLUDE_quickgui,'FreeType2.3.5')
+PATH_INCLUDE_betagui = PATH_betagui
+PATH_INCLUDE_Dshow= PATH_Dshow
+PATH_INCLUDE_Theora = os.path.join (PATH_Theora,'include')
+PATH_INCLUDE_ogrevideoffmpeg = PATH_ogrevideoffmpeg
+PATH_INCLUDE_ffmpeg = os.path.join (PATH_ffmpeg,'include')
+PATH_INCLUDE_ogredshow = PATH_ogredshow
+PATH_INCLUDE_OggVorbisTheora = [ os.path.join(BASE_DIR,'ogg','include')
+ ,os.path.join(BASE_DIR, 'vorbis', 'include')
+ ,os.path.join(PATH_OgreAddons,'videoplugin','theora','include')
+ ,os.path.join(PATH_OgreAddons,'videoplugin','ptypes-1.8.3','include')
+ ]
+
PATH_INCLUDE_PhysX= [ os.path.join(PATH_PhysX, 'Physics','include')
,os.path.join(PATH_PhysX, 'Cooking','include')
,os.path.join(PATH_PhysX, 'Foundation','include')
Modified: trunk/python-ogre/PythonOgreConfig_posix.py
===================================================================
--- trunk/python-ogre/PythonOgreConfig_posix.py 2007-07-25 04:47:51 UTC (rev 370)
+++ trunk/python-ogre/PythonOgreConfig_posix.py 2007-08-11 05:55:18 UTC (rev 371)
@@ -1,108 +1,107 @@
-import sys,os
-
-
-## Boost stuff
-## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
-module_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
-
-## lets assume that the base development directory is one level higher
-BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
-
-ROOT_DIR = os.path.join(BASE_DIR,'root')
-
-
-LOCAL_LIB = os.path.join(ROOT_DIR,'usr/lib')
-LOCAL_INCLUDE = os.path.join(ROOT_DIR, 'usr/include')
-PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost-1_34')
-print "**", PATH_Boost
-
-#
-PATH_LIB_Boost = LOCAL_LIB
-## and the name of the boost python library
-LIB_Boost = 'libboost_python-gcc41-1_34'
-
-#
-# Don't forget we need to call gccxml......
-gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin')
-# and the Py++ directory as sometimes we need access to the code repository there
-pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
-
-
-# # ## Parent directories of the libraries
-PATH_Ogre = os.path.join(BASE_DIR,'ogrenew')
-PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
-PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
-PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
-PATH_Newton = os.path.join(BASE_DIR, 'newtonSDK/sdk')
-# # PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
-PATH_ODE = os.path.join(BASE_DIR, 'ode-0.8')
-# # PATH_OGREAL= os.path.join(BASE_DIR, 'ogreal/trunk/OgreAL-Eihort')
-# # PATH_OGG = os.path.join(BASE_DIR, 'ogg')
-# # PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
-# # PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
-# # PATH_ALUT= os.path.join(BASE_DIR, 'freealut')
-PATH_OgreOde= os.path.join(BASE_DIR, 'ogreaddons','ogreode')
-#PATH_betagui= os.path.join(module_dir, 'ThirdParty','betagui')
-#PATH_raknet= os.path.join(BASE_DIR, 'RakNet')
-PATH_quickgui= os.path.join(module_dir, 'ThirdParty','quickgui')
-PATH_OPCODE= os.path.join(BASE_DIR, 'Opcode')
-
-
-
-# # # Overrides - this is needed as libs isn't defined in enirvonment for fmod..
-# # #class fmod:
-# # # version= "4.06"
-# # # libs=[LIB_Boost, 'fmodexL_vc']
-# # ##libs=[Config.LIB_Boost, 'libfmodex'] ##posix
-
-# # ###
-# # ### these paths assume you've left all the directory structure as standard
-# # ### Override anything that is different
-# # ###
-PATH_LIB_Ogre_CEGUIRenderer = os.path.join( LOCAL_LIB ) #, 'Samples/Common/CEGUIRenderer/lib')
-PATH_LIB_Ogre_OgreMain= os.path.join( LOCAL_LIB ) # PATH_Ogre, 'OgreMain/lib/Release' )
-PATH_LIB_Ogre_Dependencies = os.path.join( LOCAL_LIB ) # , 'Dependencies/lib/Release')
-
-
-
-PATH_LIB_OgreRefApp = os.path.join( LOCAL_LIB ) # PATH_Ogre, 'ReferenceApplication/ReferenceAppLayer/lib/Release')
-PATH_LIB_OgreNewt = os.path.join( LOCAL_LIB ) #PATH_OgreAddons, r'ogrenewt/OgreNewt_Main/lib/Release')
-PATH_LIB_Newton = PATH_Newton #os.path.join( LOCAL_LIB ) # PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
-PATH_LIB_OIS = os.path.join( LOCAL_LIB ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
-PATH_LIB_CEGUI = os.path.join ( LOCAL_LIB ) #PATH_Ogre, r'Dependencies/lib/Release' )
-PATH_LIB_ODE = os.path.join( LOCAL_LIB ) #PATH_ODE, 'lib/releasedll')## probable releaselib for posix
-PATH_LIB_OgreOde = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'lib/Release')
-PATH_LIB_OgreOdePrefab = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'prefab/lib/Release' )
-PATH_LIB_OgreOdeLoader = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'loader/lib/Release' )
-
-PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
-#PATH_LIB_betagui = PATH_betagui
-PATH_LIB_quickgui = PATH_quickgui
-#PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
-
-PATH_LIB_OPCODE = os.path.join( PATH_OPCODE, 'Release')
-PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
-
-PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
-PATH_INCLUDE_OIS = os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
-PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
-PATH_INCLUDE_OgreNewt = os.path.join(LOCAL_INCLUDE,'OgreNewt') #os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
-PATH_INCLUDE_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
-PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'') #os.path.join( PATH_ODE, 'include')
-PATH_INCLUDE_ODESOURCE = '' # os.path.join( PATH_ODE, 'ode/src')
-PATH_INCLUDE_OPCODE = PATH_OPCODE
-
-PATH_INCLUDE_OgreAL = ''# os.path.join( PATH_OGREAL, 'include' )
-PATH_INCLUDE_OPENAL = ''# os.path.join( PATH_OPENAL, 'include')
-PATH_INCLUDE_OGG= ''# os.path.join( PATH_OGG, r'include' )
-PATH_INCLUDE_VORBIS= ''# os.path.join( PATH_VORBIS, r'include' )
-PATH_INCLUDE_ALUT= ''# os.path.join( PATH_ALUT, 'include' )
-
-PATH_INCLUDE_OgreOde = os.path.join( PATH_OgreOde,'include')
-PATH_INCLUDE_OgreOdePrefab= os.path.join( PATH_OgreOde,'prefab/include')
-PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')
-PATH_INCLUDE_Newton = PATH_Newton # os.path.join(LOCAL_INCLUDE,'Newton')
-#PATH_INCLUDE_betagui = PATH_betagui
-PATH_INCLUDE_quickgui = PATH_quickgui
-#PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
-PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'Samples/Common/CEGUIRenderer/include')
+import sys,os
+
+
+## Boost stuff
+## path to the root of your boost dir, should have 'libs', 'boost' subdirectories
+module_dir = os.path.abspath(os.path.dirname(__file__) )## The root directory is where this module is located
+
+## lets assume that the base development directory is one level higher
+BASE_DIR,ignore = os.path.split(module_dir) ## r'/home/andy/development'
+
+ROOT_DIR = os.path.join(BASE_DIR,'root')
+
+
+LOCAL_LIB = os.path.join(ROOT_DIR,'/usr/lib')
+LOCAL_INCLUDE = os.path.join(ROOT_DIR, '/usr/include')
+PATH_Boost = os.path.join(LOCAL_INCLUDE, 'boost_1_34')
+
+#
+PATH_LIB_Boost = LOCAL_LIB
+## and the name of the boost python library
+LIB_Boost = 'libboost_python-gcc41-1_34'
+
+#
+# Don't forget we need to call gccxml......
+gccxml_bin = os.path.join(BASE_DIR,'gccxml-build/bin')
+# and the Py++ directory as sometimes we need access to the code repository there
+pyplusplus_install_dir = os.path.join(BASE_DIR,'pygccxml')
+
+
+# # ## Parent directories of the libraries
+PATH_Ogre = os.path.join(BASE_DIR,'ogrenew')
+# # PATH_OgreAddons = os.path.join(BASE_DIR, 'OgreAddons')
+# # PATH_CEGUI = os.path.join(BASE_DIR, 'CEGUI-0.5.0')
+# # PATH_OIS = os.path.join(BASE_DIR, 'ois-1.0RC1')
+# # PATH_Newton = os.path.join(BASE_DIR, 'newtonsdk/sdk')
+# # PATH_FMOD = os.path.join(BASE_DIR, 'fmod')
+# # PATH_ODE = os.path.join(BASE_DIR, 'opende/trunk')
+# # PATH_OGREAL= os.path.join(BASE_DIR, 'ogreal/trunk/OgreAL-Eihort')
+# # PATH_OGG = os.path.join(BASE_DIR, 'ogg')
+# # PATH_VORBIS= os.path.join(BASE_DIR, 'vorbis')
+# # PATH_OPENAL= os.path.join(BASE_DIR, 'openal')
+# # PATH_ALUT= os.path.join(BASE_DIR, 'freealut')
+PATH_OgreOde= os.path.join(BASE_DIR, 'OgreAddons/ogreode')
+# # PATH_betagui= os.path.join(BASE_DIR, 'betagui')
+# PATH_raknet= os.path.join(BASE_DIR, 'RakNet')
+PATH_simplegui= os.path.join(module_dir, 'ThirdParty/simplegui')
+
+
+
+
+# # # Overrides - this is needed as libs isn't defined in enirvonment for fmod..
+# # #class fmod:
+# # # version= "4.06"
+# # # libs=[LIB_Boost, 'fmodexL_vc']
+# # ##libs=[Config.LIB_Boost, 'libfmodex'] ##posix
+
+# # ###
+# # ### these paths assume you've left all the directory structure as standard
+# # ### Override anything that is different
+# # ###
+PATH_LIB_Ogre_CEGUIRenderer = os.path.join( LOCAL_LIB ) #, 'Samples/Common/CEGUIRenderer/lib')
+PATH_LIB_Ogre_OgreMain= os.path.join( LOCAL_LIB ) # PATH_Ogre, 'OgreMain/lib/Release' )
+PATH_LIB_Ogre_Dependencies = os.path.join( LOCAL_LIB ) # , 'Dependencies/lib/Release')
+
+
+
+PATH_LIB_OgreRefApp = os.path.join( LOCAL_LIB ) # PATH_Ogre, 'ReferenceApplication/ReferenceAppLayer/lib/Release')
+PATH_LIB_OgreNewt = os.path.join( LOCAL_LIB ) #PATH_OgreAddons, r'ogrenewt/OgreNewt_Main/lib/Release')
+PATH_LIB_Newton = os.path.join( LOCAL_LIB ) # PATH_Newton ,'dll') ##NOTE Posix platforms this lives in 'lib-mt'
+PATH_LIB_OIS = os.path.join( LOCAL_LIB ) #PATH_OIS, 'dll') ## NOTE Posix platforms this lives in'lib' not 'dll'
+PATH_LIB_CEGUI = os.path.join ( LOCAL_LIB ) #PATH_Ogre, r'Dependencies/lib/Release' )
+PATH_LIB_ODE = os.path.join( LOCAL_LIB ) #PATH_ODE, 'lib/releasedll')## probable releaselib for posix
+PATH_LIB_OgreOde = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'lib/Release')
+PATH_LIB_OgreOdePrefab = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'prefab/lib/Release' )
+PATH_LIB_OgreOdeLoader = os.path.join( LOCAL_LIB ) #PATH_OgreOde, 'loader/lib/Release' )
+
+PATH_LIB_OgreAL = os.path.join( LOCAL_LIB ) #PATH_OGREAL, 'lib/Release' )
+PATH_LIB_betagui = PATH_betagui
+PATH_LIB_simplegui = PATH_simplegui
+PATH_LIB_raknet = os.path.join( LOCAL_LIB ) #PATH_raknet, 'Lib' )
+
+
+PATH_INCLUDE_Ogre= os.path.join(LOCAL_INCLUDE,'OGRE') # os.path.join(PATH_Ogre,'OgreMain/include')
+
+PATH_INCLUDE_Ogre_Dependencies = PATH_INCLUDE_Ogre # os.path.join( PATH_Ogre, 'Dependencies/include')
+PATH_INCLUDE_OIS = os.path.join(LOCAL_INCLUDE,'OIS') #os.path.join(PATH_OIS,'includes') ## Note the plural include's
+PATH_INCLUDE_OgreRefApp = os.path.join(PATH_Ogre,'ReferenceApplication/ReferenceAppLayer/include')
+PATH_INCLUDE_OgreNewt = os.path.join(LOCAL_INCLUDE,'OgreNewt') #os.path.join(PATH_OgreAddons,'ogrenewt/OgreNewt_Main/inc')
+PATH_INCLUDE_CEGUI = os.path.join(LOCAL_INCLUDE,'CEGUI') #os.path.join(PATH_CEGUI, r'include/CEGUI')
+PATH_INCLUDE_ODE = os.path.join(LOCAL_INCLUDE,'ODE') #os.path.join( PATH_ODE, 'include')
+PATH_INCLUDE_ODESOURCE = '' # os.path.join( PATH_ODE, 'ode/src')
+
+
+PATH_INCLUDE_OgreAL = ''# os.path.join( PATH_OGREAL, 'include' )
+PATH_INCLUDE_OPENAL = ''# os.path.join( PATH_OPENAL, 'include')
+PATH_INCLUDE_OGG= ''# os.path.join( PATH_OGG, r'include' )
+PATH_INCLUDE_VORBIS= ''# os.path.join( PATH_VORBIS, r'include' )
+PATH_INCLUDE_ALUT= ''# os.path.join( PATH_ALUT, 'include' )
+
+PATH_INCLUDE_OgreOde = os.path.join( PATH_OgreOde,'include')
+PATH_INCLUDE_OgreOdePrefab= os.path.join( PATH_OgreOde,'prefab/include')
+PATH_INCLUDE_OgreOdeLoader= os.path.join( PATH_OgreOde,'loader/include')
+
+PATH_INCLUDE_betagui = PATH_betagui
+PATH_INCLUDE_simplegui = PATH_simplegui
+PATH_INCLUDE_raknet = os.path.join(PATH_raknet, 'Source' )
+PATH_INCLUDE_Ogre_CEGUIRenderer = os.path.join( PATH_Ogre, 'samples/Common/CEGUIRenderer/include')
Modified: trunk/python-ogre/SConstruct
===================================================================
--- trunk/python-ogre/SConstruct 2007-07-25 04:47:51 UTC (rev 370)
+++ trunk/python-ogre/SConstruct 2007-08-11 05:55:18 UTC (rev 371)
@@ -89,9 +89,11 @@
# Let us select the projects to build
possible_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
- 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet' ] # , 'raknet'
+ 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
+ 'ogrevideoffmpeg', 'ogredshow' ] # , 'raknet'
default_projects = ['ogre' , 'ois', 'ogrerefapp', 'ogrenewt', 'cegui', 'ode',\
- 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet' ]
+ 'ogreode', 'ogreal', 'quickgui', 'opcode', 'nxogre', 'bullet', 'physx', 'betagui','theora',\
+ 'ogrevideoffmpeg', 'ogredshow' ]
# This lets you call scons like: 'scons PROJECTS=ogre,cegui'
opts = Options('custom.py')
Added: trunk/python-ogre/ThirdParty/betagui/BetaGUI.h
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGUI.h (rev 0)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGUI.h 2007-08-11 05:55:18 UTC (rev 371)
@@ -0,0 +1,638 @@
+#ifndef BETAGUI_H
+#define BETAGUI_H
+
+/// Betajaen's GUI 016 Uncompressed
+/// Written by Robin "Betajaen" Southern 07-Nov-2006, http://www.ogre3d.org/wiki/index.php/BetaGUI
+/// This code is under the Whatevar! licence. Do what you want; but keep the original copyright header.
+
+#include "Ogre.h"
+#include "OgreTextAreaOverlayElement.h"
+
+#include <iostream>
+
+using namespace Ogre;
+using namespace std;
+
+namespace BetaGUI
+{
+ //------------------------------------------------------------------------------------------------
+ class GUI;
+
+ class Widget;
+ class Window;
+
+ class Button;
+ class BoolButton;
+ class MenuButton;
+ class RealButton;
+
+ class StaticText;
+ class TextInput;
+
+ class Callback;
+
+ class Effect;
+ class AlphaEffect;
+ class MoveEffect;
+ class SizeEffect;
+
+ //------------------------------------------------------------------------------------------------
+ enum WindowFeatureType
+ {
+ WFT_NONE = 0,
+ WFT_MOVE ,
+ WFT_RESIZE ,
+ WFT_RESIZE_AND_MOVE
+ };
+ //------------------------------------------------------------------------------------------------
+ enum WindowPlacementType
+ {
+ WPT_NONE = 0,
+ WPT_VERTICAL ,
+ WPT_HORIZONTAL
+ };
+ //------------------------------------------------------------------------------------------------
+ enum WindowActivity
+ {
+ WA_NONE = 0,
+ WA_MOVE ,
+ WA_RESIZE ,
+ WA_PRESS
+ };
+ //------------------------------------------------------------------------------------------------
+ class GUI
+ {
+ public:
+
+ friend class Window;
+
+ friend class Button;
+
+ friend class MenuButton;
+ friend class BoolButton;
+ friend class RealButton;
+
+ friend class StaticText;
+ friend class TextInput;
+
+ GUI(const Ogre::String &baseOverlay, const Ogre::String &font, int fontSize, Ogre::RenderWindow *win);
+
+ ~GUI();
+
+ void sortZOrder() ;
+
+ void setZRangeOrder(int nearZ, int FarZ);
+
+ bool injectMouse(int x, int y, bool LMB);
+ bool injectMouse(float x, float y, bool LMB);
+
+ bool injectKey(const Ogre::String &key, int x, int y);
+
+ void injectBackspace(int x, int y);
+
+ Window* createWindow(
+ const Ogre::Vector4 &Dimensions,
+ const Ogre::String &Material,
+ WindowFeatureType type,
+ const Ogre::String &caption = "");
+
+ void destroyWindow(Window *window) {
+ mNextWindowToDestroy=window;
+ }
+ Ogre::OverlayContainer* createOverlay(const Ogre::String &name,
+ const Ogre::Vector2 &position,
+ const Ogre::Vector2 &dimensions,
+ const Ogre::String &material = "",
+ const Ogre::String &caption = "");
+
+ Ogre::OverlayContainer* createMousePointer(Ogre::Vector2 dimensions,
+ const Ogre::String &material);
+
+
+
+ Window *addMenuWindow(const Ogre::Vector2 dimensions);
+
+ void update(Ogre::Real timeElapsed);
+ void addEffect (Effect* e);
+ Ogre::Real getUpTime() const {return mUpTime;}
+
+ protected:
+ //Ogre::Overlay* mGuiOverlay; // Main sheet overlay
+ std::vector<Window*> mWindows; // Windows
+ Window * mNextWindowToDestroy; // Window to destroy
+ Ogre::OverlayContainer* mMousePointerOverlay; // Mouse Pointer Overlay
+
+ Ogre::String mFont;
+ int mFontSize;
+ int mWindowCount, mButtonCount, mTextCaptionCount, mTextCaptionCountArea, mButtonCountTextArea;
+
+
+ Ogre::uint mDragWindowAction;
+
+ int mDragX, mDragY;
+ int mDragWindowX, mDragWindowY;
+
+ Window * mActiveDraggedWindow;
+ TextInput * mActiveTextInput;
+ Button * mActiveButton;
+
+ Ogre::Vector2 mNextMenuWindowPos;
+ Window * mMenuWindow;
+ Ogre::RenderWindow * mRenderWindow;
+
+ std::list<Effect*> mActiveEffects;
+
+ Ogre::Real mUpTime;
+ Ogre::String mName;
+ int mFarZ;
+ int mNearZ;
+ };
+ //------------------------------------------------------------------------------------------------
+ class Widget
+ {
+ public:
+
+ friend class GUI;
+
+ Widget(const Ogre::Vector4 &Dimension,
+ const Ogre::String &materialNameNormal,
+ bool hasOverState = true,
+ bool hasActiveState = true);
+
+ virtual ~Widget();
+
+ Ogre::Vector2 getPosition() const{return Ogre::Vector2(mPosX,mPosY);}
+ Ogre::Vector2 getSize() const {return Ogre::Vector2(mWidth,mHeight); }
+
+ void setPosition(const Ogre::Vector2 &position);
+ void setSize(const Ogre::Vector2 &size);
+
+ virtual void show(){setAlpha (1.0, true);};
+ virtual void hide(){setAlpha (0.0, true);};
+
+ virtual bool isVisible() {return mMainOverlay->isVisible ();};
+
+ virtual void over(const bool a);
+ virtual void activate(const bool a);
+
+ virtual void adjustSizeToContent();
+
+ virtual void setPosition(float X,float Y);
+ virtual void setPosition(int X,int Y);
+ virtual void setSize(int X,int Y);
+ virtual void setAlpha(const Ogre::Real alpha, const bool isContainer);
+ virtual void setMaterialBlendFactor(const Ogre::Real blendFactor, const bool isContainer);
+
+ // mUnderEffect getter
+ bool getUnderEffect() const { return mUnderEffect; }
+ // mUnderEffect setter
+ void setUnderEffect(bool val);
+
+ // mOver getter
+ bool getOver() const { return mOver; }
+ // mOver setter
+ void setOver(bool val) { mOver = val; }
+ // mActive getter
+ bool getActive() const { return mActive; }
+ // mActive setter
+ void setActive(bool val) { mActive = val; }
+
+ // mActive setter
+ void setMainMaterial(const Ogre::String& mat) {
+ mMainOverlay->setMaterialName(mat);
+ }
+
+ void setCaptionMaterial(const Ogre::String& mat) {
+ mCaptionOverlay->setMaterialName(mat);
+ }
+
+ void setText(const Ogre::String& t) {
+ mCaptionOverlay->setCaption(t);
+ }
+
+ Ogre::String getText() const {
+ return mCaptionOverlay->getCaption();
+ }
+
+ protected:
+ //------------------------------------------------------------------------------------------------
+ inline bool isOut (const int x, const int y) const
+ {
+ return (x < mPosX) || (y < mPosY)
+ || (x > (mPosX + mWidth)) ||
+ (y > (mPosY + mHeight));
+ }
+ //------------------------------------------------------------------------------------------------
+ inline bool isIn (const int x, const int y) const
+ {
+ return (x >= mPosX) && (y >= mPosY)
+ && (x <= (mPosX + mWidth)) &&
+ (y <= (mPosY + mHeight));
+ }
+
+ void instantiateMaterial(Ogre::OverlayContainer * const oc, bool reset) const;
+ void setOverlayAlpha(Ogre::OverlayContainer * const oc, const Ogre::Real alpha) const;
+ void setOverlayMaterialBlendFactor(Ogre::OverlayContainer * const oc, const Ogre::Real blendFactor) const;
+
+ int mPosX, mPosY, mWidth, mHeight;
+
+ std::vector<Widget *> mChildren;
+ Ogre::OverlayContainer* mMainOverlay;
+ Ogre::OverlayContainer* mCaptionOverlay;
+ Ogre::String mMaterialName;
+
+ bool mHasMaterial;
+ bool mHasOverState;
+ bool mHasActiveState;
+ bool mUnderEffect;
+ bool mOver;
+ bool mActive;
+ };
+ //------------------------------------------------------------------------------------------------
+ class Window : public Widget
+ {
+ public:
+ friend class Button;
+ friend class TextInput;
+ friend class StaticText;
+ friend class GUI;
+
+ Window(const Ogre::Vector4 &Dimensions, const Ogre::String &Material, WindowFeatureType type, const Ogre::String &caption, GUI *gui);
+ virtual ~Window();
+
+ Button* createButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
+ const Ogre::String &Text, Callback callback);
+
+ TextInput* createTextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
+ const Ogre::String & Value, int length);
+
+ StaticText* createStaticText(const Ogre::Vector4 &Dimensions, const Ogre::String &Text);
+
+ void setSize(int X,int Y);
+
+ MenuButton *addMenuButton(Window *target, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+ BoolButton *addBoolButton(bool value, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+ RealButton *addRealButton(Ogre::Real value, const Ogre::Vector4 &SliderMoves, const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+ StaticText* addStaticText(const Ogre::String &label, WindowPlacementType wpt = WPT_NONE);
+
+ Window *addMenuWindowTab(const Ogre::String &label,
+ bool titleBarWin = true,
+ WindowPlacementType wpt = WPT_VERTICAL);
+
+ MenuButton* createMenuButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, Window *t);
+ BoolButton* createBoolButton(const Ogre::Vector4 &D, const Ogre::String &M, const Ogre::String &T, Callback C, bool boolValue);
+
+ RealButton *Window::createRealButton(Ogre::Real value,
+ const Ogre::Vector4 &SliderMoves,
+ const Ogre::String &label,
+ const Ogre::Vector2 &pos);
+
+ GUI* getGUI() const {return mGUI;}
+
+ void setFadeOut(bool f){mFadeOut = f;}
+ void setZOrder(int zOrder){mGuiOverlay->setZOrder (zOrder);}
+ protected:
+
+
+ bool check(int x, int y, bool LMB);
+ bool checkKey(const Ogre::String &key, int x, int y);
+
+ TextInput* mActiveTextInput; // Active TextInput
+
+ Button
+ *mCloseButton,
+ *mResizerButton,
+ *mActiveButton,
+ *mTitleBarButton; // Resizer, ActiveButton, Title bar
+
+ GUI *mGUI; // mGUI pointer
+
+ std::vector<Button*> mButtons; // Buttons
+ std::vector<TextInput*> mTextInput; // TextInputs
+
+ Ogre::Overlay *mGuiOverlay;
+
+ void addWidget(const Widget * const w, WindowPlacementType wpt);
+ Ogre::Vector2 mNextWidgetPos;
+ WindowActivity mDragType;
+
+ bool mFadeOut;
+
+ };
+ //------------------------------------------------------------------------------------------------
+ class BetaGUIListener
+ {
+ public:
+ virtual void onButtonPress(Button*, unsigned char) = 0;
+ };
+ //------------------------------------------------------------------------------------------------
+ class Callback
+ {
+ public:
+ friend class Window;
+ friend class Button;
+
+ Callback() {
+ mCallbackType=0;
+ }
+
+ Callback( void(*functionPointer)(BetaGUI::Button*, bool) ) {
+ mCallbackType=1;
+ fp = functionPointer;
+ }
+
+ Callback(BetaGUIListener *l){
+ mCallbackType = 2;
+ mListener = l;
+ }
+ protected:
+ unsigned char mCallbackType; // Type of callback: 0 - None, 1 - FunctionPointer 2 - GUIListener, 3 - Move Window, 4 - Resize
+ void(*fp)(BetaGUI::Button*, bool); // Function pointer (if 1)
+ BetaGUIListener *mListener; // GuiListener (if 2)
+ };
+ //------------------------------------------------------------------------------------------------
+ class Button : public Widget
+ {
+ public:
+ friend class Window;
+ friend class GUI;
+
+ Button(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
+ const Ogre::String &Text, Callback callback, Window *parent);
+ virtual ~Button() {}
+
+ protected:
+ Callback mCallback; // Callback to use
+ };
+ //------------------------------------------------------------------------------------------------
+ class MenuButton : public Button
+ {
+ public:
+ MenuButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
+ const Ogre::String &Text, Callback callback, Window *parent,
+ Window *target) :
+ Button(Dimensions, Material, Text, callback, parent),
+ mTarget(target)
+ {};
+ virtual ~MenuButton(){};
+ protected:
+ void activate(const bool a) ;
+
+ Window *mTarget;
+ };
+ //------------------------------------------------------------------------------------------------
+ class BoolButton : public Button
+ {
+ public:
+ BoolButton(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
+ const Ogre::String &Text, Callback callback, Window *parent, bool boolValue):
+ Button(Dimensions, Material, Text, callback, parent),
+ mBoolValue(boolValue)
+ {}
+ virtual ~BoolButton(){};
+
+ protected:
+ void activate(const bool a) ;
+
+ bool mBoolValue;
+ };
+ //------------------------------------------------------------------------------------------------
+ class TextInput : public Widget
+ {
+ public:
+ friend class Window;
+ friend class GUI;
+
+ TextInput(const Ogre::Vector4 &Dimensions, const Ogre::String &Material,
+ const Ogre::String &Value, unsigned int length, Window *parent);
+ virtual ~TextInput(){}
+ const Ogre::String &getValue() const {return mValueText;}
+ void setValue(const Ogre::String &v) {mCaptionOverlay->setCaption(mValueText = v);}
+
+ protected:
+ unsigned int length;
+ Ogre::String mValueText;// MaterialName Normal, MaterialName Active
+
+ };
+ //------------------------------------------------------------------------------------------------
+ class StaticText : public Widget
+ {
+ public:
+ friend class Window;
+
+ StaticText(const Ogre::Vector4 &Dimensions,
+ const Ogre::String &Value,
+ Window *parent);
+ virtual ~StaticText(){}
+
+ const Ogre::String &getValue() const
+ {return mValueText;}
+
+ void setValue(const Ogre::String &v)
+ {
+ mCaptionOverlay->setCaption(mValueText = v);
+ mWidth = static_cast<int> (mValueText.size () * 7);
+ mParent->adjustSizeToContent ();
+ }
+
+ protected:
+
+ int length;
+ Ogre::String mValueText;
+ Window *mParent;
+ };
+ //------------------------------------------------------------------------------------------------
+ class RealButton : public BetaGUIListener, public Widget
+ {
+ public:
+ friend class Window;
+
+ RealButton(BetaGUI::Window *window,
+ Ogre::Real value,
+ const Ogre::Vector4 &SliderMoves,
+ const Ogre::String &label,
+ const Ogre::Vector2 &pos);
+
+ virtual ~RealButton(){};
+
+ Ogre::Real getValue() const {return mValue;}
+
+ void setValue(const Ogre::Real v);
+
+ void onButtonPress(BetaGUI::Button *ref, Ogre::uchar type);
+ protected:
+
+ int length;
+
+ BetaGUI::TextInput *mtextValueInput;
+ BetaGUI::Button *mForward, *mFastForward, *mRewind, *mFastRewind;
+
+ Ogre::Real mValue;
+ Ogre::String mValueText;
+
+ Ogre::Real mLowSlideUnit;
+ Ogre::Real mFastSlideUnit;
+ Ogre::Real mMinValue;
+ Ogre::Real mMaxValue;
+
+ };
+ //------------------------------------------------------------------------------------------------
+ class Effect
+ {
+ public:
+ enum EffectInterpolatorType
+ {
+ EFFECT_LINEAR = 0,
+ EFFECT_LINEARX2,
+ EFFECT_LINEARX4,
+ EFFECT_SIN
+ };
+ public:
+ Effect(Widget * const widget, const Ogre::Real duration,
+ const Ogre::Real startTime, const Ogre::Real currTime = 0, const bool repeat = false,
+ EffectInterpolatorType type = EFFECT_LINEARX4) :
+ mWidget(widget),
+ mStartTime(startTime),
+ mDuration(duration),
+ mRepeat(repeat),
+ mCurrTime(currTime),
+ mType(type)
+ {
+ assert (duration != 0);
+ }
+ virtual ~Effect(){};
+
+ virtual void updateValue(const Ogre::Real factor) = 0;
+
+ bool update(Ogre::Real timeElapsed);
+ Ogre::Real getTimeFactor() ;
+ bool getTimeOrIsFinished();
+// Ogre::Real linearInterpolate(const Ogre::Real start,
+// const Ogre::Real end,
+// const Ogre::Real timeFactor) const;
+ Ogre::Real interpolate(const Ogre::Real start,
+ const Ogre::Real end,
+ const Ogre::Real timeFactor) const;
+
+ protected:
+ Widget * const mWidget;
+ const Ogre::Real mStartTime;
+ const Ogre::Real mDuration;
+ const bool mRepeat;
+
+ Ogre::Real mCurrTime;
+ const EffectInterpolatorType mType;
+ };
+ //------------------------------------------------------------------------------------------------
+ class AlphaEffect : public Effect
+ {
+ public:
+
+ AlphaEffect(Widget * const widget,
+ const Ogre::Real duration,
+ const Ogre::Real startAlpha,
+ const Ogre::Real endAlpha,
+ const Ogre::Real startTime,
+ const Ogre::Real currTime = 0,
+ const bool repeat = false,
+ EffectInterpolatorType type = EFFECT_LINEARX4) :
+ Effect(widget, duration, startTime, currTime, repeat),
+ mStartAlpha(startAlpha),
+ mEndAlpha(endAlpha)
+ {
+ assert(mStartAlpha >= 0.0 && mStartAlpha <= 1.0);
+ assert(mEndAlpha >= 0.0 && mEndAlpha <= 1.0);
+ }
+ virtual ~AlphaEffect(){};
+
+ void updateValue(const Ogre::Real factor);
+ private:
+ const Ogre::Real mStartAlpha;
+ const Ogre::Real mEndAlpha;
+ };
+ //------------------------------------------------------------------------------------------------
+ class MoveEffect : public Effect
+ {
+ public:
+ MoveEffect(Widget * const widget,
+ const Ogre::Real duration,
+ const Ogre::Vector2 &startPosition,
+ const Ogre::Vector2 &endPosition,
+ const Ogre::Real startTime,
+ const Ogre::Real currTime = 0,
+ const bool repeat = false,
+ EffectInterpolatorType type = EFFECT_LINEARX4) :
+ Effect(widget, duration, startTime, currTime, repeat),
+ mStartPosition(startPosition),
+ mEndPosition(endPosition)
+ {}
+ virtual ~MoveEffect(){};
+ void updateValue(const Ogre::Real factor);
+
+ private:
+ const Ogre::Vector2 mStartPosition;
+ const Ogre::Vector2 mEndPosition;
+ };
+ //------------------------------------------------------------------------------------------------
+ class SizeEffect : public Effect
+ {
+ public:
+ SizeEffect(Widget * const widget,
+ const Ogre::Real duration,
+ const Ogre::Vector2 &startSize,
+ const Ogre::Vector2 &endSize,
+ const Ogre::Real startTime,
+ const Ogre::Real currTime = 0,
+ const bool repeat = false,
+ EffectInterpolatorType type = EFFECT_LINEARX4) :
+ Effect(widget, duration, startTime, currTime, repeat),
+ mStartSize(startSize),
+ mEndSize(endSize)
+ {}
+ virtual ~SizeEffect(){};
+ void updateValue(const Ogre::Real factor);
+
+ private:
+ const Ogre::Vector2 mStartSize;
+ const Ogre::Vector2 mEndSize;
+ };
+ //------------------------------------------------------------------------------------------------
+ class ActivateEffect : public Effect
+ {
+ public:
+ ActivateEffect(Widget * const widget,
+ const Ogre::Real duration,
+ const Ogre::Real startTime,
+ const Ogre::Real currTime = 0,
+ const bool repeat = false,
+ EffectInterpolatorType type = EFFECT_LINEARX4):
+ Effect(widget, duration, startTime, currTime, repeat)
+ {};
+ virtual ~ActivateEffect(){};
+ void updateValue(const Ogre::Real factor);
+
+ };
+ //------------------------------------------------------------------------------------------------
+ class OverEffect : public Effect
+ {
+ public:
+ OverEffect(Widget * const widget,
+ const Ogre::Real duration,
+ const Ogre::Real startTime,
+ const Ogre::Real currTime = 0,
+ const bool repeat = false,
+ EffectInterpolatorType type = EFFECT_LINEARX4):
+ Effect(widget, duration, startTime, currTime, repeat)
+ {};
+ virtual ~OverEffect(){};
+ void updateValue(const Ogre::Real factor);
+
+ };
+ //------------------------------------------------------------------------------------------------
+
+
+} // End of Namespace
+
+///////////////////////////////////////////////////////////////////////////////
+#endif
+
Added: trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp
===================================================================
--- trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp (rev 0)
+++ trunk/python-ogre/ThirdParty/betagui/BetaGui.cpp 2007-08-11 05...
[truncated message content] |
