r68824 - in /trunk/libogre-perl: ./ Ogre/ debian/ examples/ xs/
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Wed Feb 16 20:09:45 UTC 2011
Author: gregoa
Date: Wed Feb 16 20:09:33 2011
New Revision: 68824
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68824
Log:
New upstream release.
Modified:
trunk/libogre-perl/Changes
trunk/libogre-perl/META.yml
trunk/libogre-perl/Makefile.PL
trunk/libogre-perl/Ogre.pm
trunk/libogre-perl/Ogre/ExampleFrameListener.pm
trunk/libogre-perl/Ogre/Node.pm
trunk/libogre-perl/Ogre/ResourceGroupManager.pm
trunk/libogre-perl/README.txt
trunk/libogre-perl/debian/changelog
trunk/libogre-perl/examples/README.txt
trunk/libogre-perl/examples/animate.pl
trunk/libogre-perl/xs/ControllerManager.xs
trunk/libogre-perl/xs/GpuProgram.xs
trunk/libogre-perl/xs/Material.xs
trunk/libogre-perl/xs/Mesh.xs
trunk/libogre-perl/xs/MovableObject.xs
trunk/libogre-perl/xs/Node.xs
trunk/libogre-perl/xs/RenderSystem.xs
trunk/libogre-perl/xs/ResourceGroupManager.xs
trunk/libogre-perl/xs/Root.xs
trunk/libogre-perl/xs/SceneNode.xs
trunk/libogre-perl/xs/SceneQuery.xs
Modified: trunk/libogre-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/Changes?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/Changes (original)
+++ trunk/libogre-perl/Changes Wed Feb 16 20:09:33 2011
@@ -1,3 +1,8 @@
+0.50 2010-12-14 | support Ogre >= 1.7.2
+- dropping support for versions of Ogre before 1.7.2 (released 2010-11-03)
+- removed Readonly (optional) dependence (for one example)
+- ported to 1.7.2
+
0.40 2009-10-07 | fixed GTK support, kinda
- minor API improvements
- added Ogre::Timer
Modified: trunk/libogre-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/META.yml?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/META.yml (original)
+++ trunk/libogre-perl/META.yml Wed Feb 16 20:09:33 2011
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Ogre
-version: 0.40
+version: 0.50
abstract: Perl binding for the OGRE C++ graphics library
author:
- Scott Lanning <slanning at cpan.org>
@@ -8,13 +8,18 @@
distribution_type: module
configure_requires:
ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
Test::More: 0
no_index:
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.48
+ - t
+ - examples
+ - genscripts
+generated_by: ExtUtils::MakeMaker version 6.55_02
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libogre-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/Makefile.PL?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/Makefile.PL (original)
+++ trunk/libogre-perl/Makefile.PL Wed Feb 16 20:09:33 2011
@@ -1,13 +1,12 @@
-use Config;
-use ExtUtils::MakeMaker;
use strict;
use warnings;
+use ExtUtils::MakeMaker;
-my $OGRE_REQ_VERSION = '1.6.1';
-my $OIS_REQ_VERSION = '0.04';
+my $OGRE_REQ_VERSION = '1.7.2';
+my $OIS_REQ_VERSION = '0.05';
main();
-exit 0;
+exit;
sub main {
my $fixed_args = fixed_args('Ogre');
@@ -18,10 +17,9 @@
}
sub gpp_warn_args {
- # If you're using gcc >= 4.2, you'll probably
- # get warnings like this during `make` :
+ # If you're using gcc >= 4.2, you'd get warnings like this during `make` :
# OIS.c:1835: warning: deprecated conversion from string constant to 'char*'
- # The C code generated by `xsubpp` uses literal strings (string constants)
+ # The C code generated by `xsubpp` uses literal string constants
# as args to functions expecting char*. This disables those warnings....
if (my_compiler() eq 'g++') {
@@ -39,10 +37,6 @@
return {};
}
-sub my_compiler {
- return $ENV{'CXX'} || 'g++';
-}
-
sub fixed_args {
my ($pkg) = @_;
@@ -56,32 +50,34 @@
'MAN3PODS' => {},
'XSOPT' => '-C++',
'TYPEMAPS' => ['perlobject.map'],
+ 'META_MERGE' => {
+ no_index => {
+ directory => [ qw/t examples genscripts / ],
+ },
+ },
};
}
sub varied_args {
+ my (@errors, @cflags, @libs, @defines) = ();
+
# Make sure OGRE libs are known by pkg-config
my $pkgname = 'OGRE';
- my @errors = ();
+
push @errors, check_pkg_config($pkgname, $OGRE_REQ_VERSION);
+
if (@errors) {
die(map { "$_$/" } @errors);
}
# Get include dirs and defines
- my @cflags = ();
push @cflags, pkg_config($pkgname, 'cflags');
# Get lib dirs
- my @libs = ();
push @libs, pkg_config($pkgname, 'libs');
- my @defines = ();
-
-
# Check if Gtk+ is installed
- # (don't know what version is actually required, gtk2-perl uses 2.0.0)
$pkgname = 'gtk+-2.0';
@errors = check_pkg_config($pkgname, '2.0.0');
@@ -118,19 +114,6 @@
print "\nOIS >= $OIS_REQ_VERSION added to prerequisites.\n";
}
}
- # xxx: should remove the Readonly dependency....
- unless (eval { require Readonly }) {
- my $msg = "\nNote: the Perl module Readonly is not installed,\n"
- . "so you won't be able to run some examples.\n"
- . "I recommend installing this module (and Readonly::XS if possible).\n"
- . "It's fine to install it after installing Ogre.\n\n"
- . "Do you want to install Readonly now?";
- my $val = ExtUtils::MakeMaker::prompt($msg, 'n');
- if ($val =~ /^y/i) {
- $prereqs{'Readonly'} = '0';
- print "\nReadonly added to prerequisites.\n";
- }
- }
return {
'PREREQ_PM' => \%prereqs,
@@ -139,6 +122,10 @@
'LIBS' => join(' ', @libs),
(@defines ? ('DEFINE' => join(' ', @defines)) : ()),
};
+}
+
+sub my_compiler {
+ return $ENV{'CXX'} || 'g++';
}
sub check_pkg_config {
@@ -171,13 +158,11 @@
}
sub pkg_config {
- my ($pkg, $option, $pc) = @_;
+ my ($pkg, $option) = @_;
- $pc = 'pkg-config' unless defined $pc;
-
- my $str = `$pc --$option $pkg`;
+ my $str = `pkg-config --$option $pkg`;
if ($?) {
- die "$pc --$option $pkg: $str\n";
+ die "pkg-config --$option $pkg: $str\n";
}
else {
chomp $str;
Modified: trunk/libogre-perl/Ogre.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/Ogre.pm?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/Ogre.pm (original)
+++ trunk/libogre-perl/Ogre.pm Wed Feb 16 20:09:33 2011
@@ -7,7 +7,7 @@
require DynaLoader;
our @ISA = qw(DynaLoader);
-our $VERSION = '0.40';
+our $VERSION = '0.50';
# use all files under Ogre/ - probably not a good idea
## BEGIN USES
Modified: trunk/libogre-perl/Ogre/ExampleFrameListener.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/Ogre/ExampleFrameListener.pm?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/Ogre/ExampleFrameListener.pm (original)
+++ trunk/libogre-perl/Ogre/ExampleFrameListener.pm Wed Feb 16 20:09:33 2011
@@ -16,7 +16,7 @@
our $VERSION = 0.38;
BEGIN {
- if (eval { require OIS && $OIS::VERSION >= 0.04 }) {
+ if (eval { require OIS && $OIS::VERSION >= 0.05 }) {
require OIS::InputManager;
OIS::InputManager->import();
# xxx: these constants don't export right...
@@ -26,7 +26,7 @@
OIS::Mouse->import(qw(:MouseButtonID));
}
else {
- die(__PACKAGE__ . " requires OIS 0.04 or greater\n");
+ die(__PACKAGE__ . " requires OIS 0.05 or greater\n");
}
}
Modified: trunk/libogre-perl/Ogre/Node.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/Ogre/Node.pm?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/Ogre/Node.pm (original)
+++ trunk/libogre-perl/Ogre/Node.pm Wed Feb 16 20:09:33 2011
@@ -2,11 +2,6 @@
use strict;
use warnings;
-
-use Ogre::Renderable;
-require Exporter;
-our @ISA = qw(Ogre::Renderable);
-
########## GENERATED CONSTANTS BEGIN
require Exporter;
Modified: trunk/libogre-perl/Ogre/ResourceGroupManager.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/Ogre/ResourceGroupManager.pm?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/Ogre/ResourceGroupManager.pm (original)
+++ trunk/libogre-perl/Ogre/ResourceGroupManager.pm Wed Feb 16 20:09:33 2011
@@ -14,8 +14,8 @@
qw(
DEFAULT_RESOURCE_GROUP_NAME
INTERNAL_RESOURCE_GROUP_NAME
- BOOTSTRAP_RESOURCE_GROUP_NAME
AUTODETECT_RESOURCE_GROUP_NAME
+ RESOURCE_SYSTEM_NUM_REFERENCE_COUNTS
)
],
);
Modified: trunk/libogre-perl/README.txt
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/README.txt?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/README.txt (original)
+++ trunk/libogre-perl/README.txt Wed Feb 16 20:09:33 2011
@@ -4,7 +4,7 @@
This is a Perl binding for OGRE, Object-Oriented Graphics Rendering Engine,
a C++ library found at http://www.ogre3d.org/ .
-The wrapping is currently incomplete, but there are several interesting
+The wrapping is currently incomplete, but there are interesting
examples working now (see examples/README.txt).
See TODO.txt for the things I'd like to do. Suggest more things
(preferably submitted with patches) if you like.
@@ -16,12 +16,10 @@
DEPENDENCIES
-Only versions >= 1.6.1 of OGRE are currently supported, so you need to install
+Only versions >= 1.7.2 of OGRE are supported, so you need to install
that either by building from source or by installing a package.
-(In fact, I have version 1.6.3, and I'm just assuming that 1.6.1 will work.)
-If you use Ubuntu, I have some notes below that might help.
-You need to install the "dev" versions of packages, since this module
-links against the libraries.
+You need to install the "dev" versions of packages,
+since this module links against the libraries.
Makefile.PL uses pkg-config to get information about the libraries and header
files needed to build against OGRE, so you should be able to do this:
@@ -30,10 +28,10 @@
pkg-config --cflags OGRE
pkg-config --modversion OGRE
-The last one should say at least 1.6.1.
+The last one should say at least 1.7.2.
The C++ compiler used by default is `g++`, but you can specify a different
-C++ compiler by setting the CXX environmental variable. Anything more,
+C++ compiler by setting the "CXX" environmental variable. Anything more,
and you'll have to hack at Makefile.PL.
I have the impression that OGRE doesn't install pkg-config on Windows
@@ -51,6 +49,7 @@
pkg-config --modversion gtk+-2.0
+(Ubuntu package "libgtk2.0-dev")
then a static method, Ogre->getWindowHandleString, will be built.
The string returned can be passed to the `params' argument of
Ogre::Root::createRenderWindow in order to use a window (widget)
@@ -62,18 +61,9 @@
Some scripts under examples/ require these Perl modules:
- OIS
- - Readonly (I'm going to remove that..)
-I recommend installing both of them, but you don't have to.
-
-It would be best to install at least version 0.05 of my OIS module,
-which works with version 1.2 of libois.
-
-It would be a good idea to make sure you also have installed CEGUI, OIS,
-libdevil, and nVidia Cg, if those aren't already installed. This Perl module
-currently only provides support for OGRE and OIS, however.
-The reason I recommend installing those libraries, is mainly just so
-you can run the (C++) tutorials for comparison.
+I recommend installing it, but you don't have to.
+(I have other OGRE-related modules: Ogre::AL and Ogre::BetaGUI .)
INSTALLATION
@@ -91,75 +81,73 @@
INSTALLING OGRE UNDER UBUNTU
-Here's how I got setup on Ubuntu Jaunty
+Here's how I got things set up on Ubuntu Maverick.
-There is a nice howto for compiling things manually at
-http://ubuntuforums.org/archive/index.php/t-1144592.html
+Go to the OGRE download page:
+ http://www.ogre3d.org/download/sdk
+There is a link to Ubuntu packages:
+ https://launchpad.net/~ogre-team/+archive/ogre
-That may be fulfilling for some people,
-but there are also updated packages at
-https://launchpad.net/~andrewfenn/+archive/ogredev
+Do this to set things up:
+ sudo add-apt-repository ppa:ogre-team/ogre
+ sudo apt-get update
+Install OGRE development packages:
+ sudo apt-get install libogre-dev
- sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 6FED7057
+Optionally install these:
+ sudo apt-get install \
+ libogremain1.7.2-dbg \
+ libogrepaging1.7.2-dbg libogreproperty1.7.2-dbg \
+ libogrertshadersystem1.7.2-dbg libogreterrain1.7.2-dbg \
+ ogre-samples-bin ogre-samples-media ogre-samples-source \
+ ogre-tools ogre-doc \
+ libdevil-dev libdevil1c2
- sudo gedit /etc/apt/sources.list
+(This also installs libois-1.2.0 and libois-dev, for OIS.)
+I notice that plugins.cfg, Samples, and docs are in /etc/share/OGRE/ .
+$ pkg-config --modversion OGRE
+1.7.2
+$ pkg-config --modversion OIS
+1.2.0
-add these lines
-
- deb http://ppa.launchpad.net/andrewfenn/ogredev/ubuntu jaunty main
- deb-src http://ppa.launchpad.net/andrewfenn/ogredev/ubuntu jaunty main
-
-then install the Ogre-related packages
-
- sudo apt-get update
- sudo apt-get install \
- blender-ogrexml \
- cegui-layout-editor \
- libcegui \
- libmygui \
- libmygui-dev \
- libogre-dev \
- libogremain-1.6.3 \
- libois-dev \
- libois1 \
- libsilly0 \
- nvidia-cg-toolkit \
- ogre-doc \
- ogre-tools
-
-and remove any lingering "old" packages:
-
- sudo apt-get remove ogre-doc-nonfree
- sudo apt-get autoremove
-
-Make sure that OIS is version 1.2.0 and ogre libs are 1.6.3.
-
-You might also want the official Ogre sources at
-http://www.ogre3d.org/developers/subversion
-
-I checked out both trunk and the 1.6 branch with:
-
- cd ~/ogre/src/
- svn co https://svn.ogre3d.org/svnroot/ogre/trunk \
- https://svn.ogre3d.org/svnroot/ogre/branches/v1-6 \
- ogre
-
-To build it yourself, see:
-http://www.ogre3d.org/wiki/index.php/CMake_Quick_Start_Guide#Linux_.2F_Unix
-
-and good luck....
+It would be a good idea to install CEGUI, OIS, libdevil, and nVidia Cg
+if those aren't already installed. (I'm not sure if libdevil is needed anymore.)
COPYRIGHT AND LICENCE
-Please report any bugs/suggestions to <slanning at cpan.org>.
+Please report any patches/bugs/suggestions to <slanning at cpan.org>.
-Copyright 2007-2009, Scott Lanning. All rights reserved.
+Copyright 2007-2010, Scott Lanning. All rights reserved.
-This program is free software; you can redistribute it and/or modify
+This Perl library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
-Note that OGRE itself is under an LGPL license. See http://www.ogre3d.org/
-for more (and probably more accurate) information.
-(Further note: they announced just today that version 1.7 on will be
-under the MIT license.)
+The license for OGRE follows
+(from http://ogre.svn.sourceforge.net/viewvc/ogre/trunk/COPYING ):
+
+--------------8<-----------------------------------------------------------
+
+OGRE (www.ogre3d.org) is made available under the MIT License.
+
+Copyright (c) 2000-2009 Torus Knot Software Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+--------------8<-----------------------------------------------------------
Modified: trunk/libogre-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/debian/changelog?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/debian/changelog (original)
+++ trunk/libogre-perl/debian/changelog Wed Feb 16 20:09:33 2011
@@ -1,3 +1,9 @@
+libogre-perl (0.50-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregoa at debian.org> Wed, 16 Feb 2011 21:07:00 +0100
+
libogre-perl (0.40-1) unstable; urgency=low
* Initial release (closes: #556196).
Modified: trunk/libogre-perl/examples/README.txt
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/examples/README.txt?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/examples/README.txt (original)
+++ trunk/libogre-perl/examples/README.txt Wed Feb 16 20:09:33 2011
@@ -5,8 +5,9 @@
in the current directory: plugins.cfg and resources.cfg.
plugins.cfg might be a pointer to a system-wide file;
-for example, on Ubuntu you should `ln -s /etc/OGRE/plugins.cfg`.
+for example, on Ubuntu you should `ln -s /usr/share/OGRE/plugins.cfg`.
+[XXX: needs updated for 1.7.2]
resources.cfg is taken from the Samples/Common/bin directory in OGRE,
but I put it here also. For resources.cfg, you need to make sure
it points to the Samples directory from OGRE 1.6.
@@ -18,7 +19,8 @@
ln -s $HOME/ogre/src/ogre/v1-6/Samples
-Here are brief descriptions of the examples.
+
+Brief descriptions of the examples
- robot.pl: very minimal, just shows a robot that's been rotated
and scaled a bit (taken from one of the basic OGRE tutorials;
@@ -69,4 +71,5 @@
- manualobject.pl: use ManualObject to draw arbitrary shapes
(taken from several wiki articles)
-- sdlrobot.pl: render Ogre in an SDL-Perl application
+#- sdlrobot.pl: render Ogre in an SDL-Perl application
+# needs updating
Modified: trunk/libogre-perl/examples/animate.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/examples/animate.pl?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/examples/animate.pl (original)
+++ trunk/libogre-perl/examples/animate.pl Wed Feb 16 20:09:33 2011
@@ -9,15 +9,6 @@
use strict;
use warnings;
-BEGIN {
- if (eval { require Readonly }) {
- Readonly->import();
- }
- else {
- die("Please install the 'Readonly' Perl module from CPAN.\n");
- }
-}
-
use Ogre::ExampleFrameListener;
@MoveDemoListener::ISA = qw(Ogre::ExampleFrameListener);
@@ -25,13 +16,9 @@
use Ogre::Quaternion;
use Ogre::Vector3;
-# I made this readonly because I ended up accidentally
-# changing it (it's a reference) in a previous tutorial,
-# and chaos ensued. (Note: I hope to fix the constants in XS some day...)
-my $zerovec = Ogre::Vector3->new(0, 0, 0);
-Readonly my $ZERO => $zerovec;
-my $xvec = Ogre::Vector3->new(1, 0, 0);
-Readonly my $UNIT_X => $xvec;
+# these are readonly, don't change them
+my $ZERO = Ogre::Vector3->new(0, 0, 0);
+my $UNIT_X = Ogre::Vector3->new(1, 0, 0);
sub new {
@@ -99,9 +86,7 @@
else {
# rotate the robot
my $orient = $self->{mNode}->getOrientation;
- # xxx: this caused it to crash, somehow because of the ReadOnly.... :/
- # my $src = $orient * $UNIT_X;
- my $src = $orient * $xvec;
+ my $src = $orient * $UNIT_X;
my $quat = $src->getRotationTo($self->{mDirection});
$self->{mNode}->rotate($quat);
}
Modified: trunk/libogre-perl/xs/ControllerManager.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/ControllerManager.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/ControllerManager.xs (original)
+++ trunk/libogre-perl/xs/ControllerManager.xs Wed Feb 16 20:09:33 2011
@@ -71,6 +71,11 @@
ControllerReal *
ControllerManager::createGpuProgramTimerParam(GpuProgramParameters *params, size_t paramIndex, Real timeFactor=1.0f)
+ CODE:
+ GpuProgramParametersSharedPtr paramsPtr = GpuProgramParametersSharedPtr(params);
+ RETVAL = THIS->createGpuProgramTimerParam(paramsPtr, paramIndex, timeFactor);
+ OUTPUT:
+ RETVAL
## xxx: would need a manager (like for the Listeners) for the Perl-created objects
## in order to make this work; for now you have to call clear Controllers, I guess
Modified: trunk/libogre-perl/xs/GpuProgram.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/GpuProgram.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/GpuProgram.xs (original)
+++ trunk/libogre-perl/xs/GpuProgram.xs Wed Feb 16 20:09:33 2011
@@ -73,11 +73,14 @@
bool
GpuProgram::hasDefaultParameters()
-void
-GpuProgram::setSurfaceAndPassLightStates(bool state)
+bool
+GpuProgram::getPassSurfaceAndLightStates()
bool
-GpuProgram::getPassSurfaceAndLightStates()
+GpuProgram::getPassFogStates()
+
+bool
+GpuProgram::getPassTransformStates()
String
GpuProgram::getLanguage()
Modified: trunk/libogre-perl/xs/Material.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/Material.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/Material.xs (original)
+++ trunk/libogre-perl/xs/Material.xs Wed Feb 16 20:09:33 2011
@@ -224,9 +224,6 @@
unsigned short
Material::getLodIndex(Real d)
-unsigned short
-Material::getLodIndexSquaredDepth(Real squaredDepth)
-
void
Material::touch()
Modified: trunk/libogre-perl/xs/Mesh.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/Mesh.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/Mesh.xs (original)
+++ trunk/libogre-perl/xs/Mesh.xs Wed Feb 16 20:09:33 2011
@@ -117,9 +117,10 @@
unsigned short
Mesh::getLodIndex(Real depth)
-
-unsigned short
-Mesh::getLodIndexSquaredDepth(Real squaredDepth)
+ CODE:
+ RETVAL = THIS->getLodStrategy()->transformUserValue(depth);
+ OUTPUT:
+ RETVAL
bool
Mesh::isLodManual()
Modified: trunk/libogre-perl/xs/MovableObject.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/MovableObject.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/MovableObject.xs (original)
+++ trunk/libogre-perl/xs/MovableObject.xs Wed Feb 16 20:09:33 2011
@@ -15,9 +15,8 @@
bool
MovableObject::isAttached()
-## sic
void
-MovableObject::detatchFromParent()
+MovableObject::detachFromParent()
bool
MovableObject::isInScene()
Modified: trunk/libogre-perl/xs/Node.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/Node.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/Node.xs (original)
+++ trunk/libogre-perl/xs/Node.xs Wed Feb 16 20:09:33 2011
@@ -313,22 +313,6 @@
## void Node::setListener(Listener *listener)
## Listener * Node::getListener()
-
-Material *
-Node::getMaterial()
- CODE:
- RETVAL = THIS->getMaterial().getPointer();
- OUTPUT:
- RETVAL
-
-# note: returned instead of gotten by reference
-void
-Node::getRenderOperation(OUTLIST RenderOperation *op)
- C_ARGS:
- *op
-
-## xxx: is xform an array?
-## void Node::getWorldTransforms(Matrix4 *xform)
##Quaternion *
##Node::getWorldOrientation()
Modified: trunk/libogre-perl/xs/RenderSystem.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/RenderSystem.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/RenderSystem.xs (original)
+++ trunk/libogre-perl/xs/RenderSystem.xs Wed Feb 16 20:09:33 2011
@@ -115,12 +115,13 @@
RenderSystem::bindGpuProgram(GpuProgram *prg)
void
-RenderSystem::bindGpuProgramParameters(gptype, params)
+RenderSystem::bindGpuProgramParameters(gptype, params, variabilityMask)
int gptype
GpuProgramParameters * params
+ uint16 variabilityMask
CODE:
GpuProgramParametersSharedPtr paramsPtr = GpuProgramParametersSharedPtr(params);
- THIS->bindGpuProgramParameters((GpuProgramType)gptype, paramsPtr);
+ THIS->bindGpuProgramParameters((GpuProgramType)gptype, paramsPtr, variabilityMask);
void
RenderSystem::bindGpuProgramPassIterationParameters(int gptype)
Modified: trunk/libogre-perl/xs/ResourceGroupManager.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/ResourceGroupManager.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/ResourceGroupManager.xs (original)
+++ trunk/libogre-perl/xs/ResourceGroupManager.xs Wed Feb 16 20:09:33 2011
@@ -19,14 +19,14 @@
DEFAULT_RESOURCE_GROUP_NAME()
ALIAS:
INTERNAL_RESOURCE_GROUP_NAME = 1
- BOOTSTRAP_RESOURCE_GROUP_NAME = 2
- AUTODETECT_RESOURCE_GROUP_NAME = 3
+ AUTODETECT_RESOURCE_GROUP_NAME = 2
+ RESOURCE_SYSTEM_NUM_REFERENCE_COUNTS = 3
CODE:
switch (ix) {
case 0: RETVAL = Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME; break;
case 1: RETVAL = Ogre::ResourceGroupManager::INTERNAL_RESOURCE_GROUP_NAME; break;
- case 2: RETVAL = Ogre::ResourceGroupManager::BOOTSTRAP_RESOURCE_GROUP_NAME; break;
- case 3: RETVAL = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME; break;
+ case 2: RETVAL = Ogre::ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME; break;
+ case 3: RETVAL = Ogre::ResourceGroupManager::RESOURCE_SYSTEM_NUM_REFERENCE_COUNTS; break;
}
OUTPUT:
RETVAL
Modified: trunk/libogre-perl/xs/Root.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/Root.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/Root.xs (original)
+++ trunk/libogre-perl/xs/Root.xs Wed Feb 16 20:09:33 2011
@@ -46,7 +46,7 @@
void
Root::addRenderSystem(RenderSystem *newRend)
-# RenderSystemList *
+# RenderSystemList &
# Root::getAvailableRenderers()
RenderSystem *
@@ -279,12 +279,10 @@
unsigned long
Root::getNextFrameNumber()
-SceneManager *
-Root::_getCurrentSceneManager()
-
-void
-Root::_setCurrentSceneManager(sm)
- SceneManager * sm
+## internal
+##SceneManager *
+##Root::_getCurrentSceneManager()
+
## RenderQueueInvocationSequence * createRenderQueueInvocationSequence (const String &name)
## RenderQueueInvocationSequence * getRenderQueueInvocationSequence (const String &name)
Modified: trunk/libogre-perl/xs/SceneNode.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/SceneNode.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/SceneNode.xs (original)
+++ trunk/libogre-perl/xs/SceneNode.xs Wed Feb 16 20:09:33 2011
@@ -124,7 +124,7 @@
OUTPUT:
RETVAL
-## virtual void findLights (LightList &destList, Real radius) const
+## virtual void findLights (LightList &destList, Real radius, uint32 lightMask=0xFFFFFFFF) const
void
SceneNode::setFixedYawAxis(useFixed, fixedAxis)
Modified: trunk/libogre-perl/xs/SceneQuery.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libogre-perl/xs/SceneQuery.xs?rev=68824&op=diff
==============================================================================
--- trunk/libogre-perl/xs/SceneQuery.xs (original)
+++ trunk/libogre-perl/xs/SceneQuery.xs Wed Feb 16 20:09:33 2011
@@ -20,13 +20,13 @@
int
SceneQuery::getWorldFragmentType()
-## const std::set< WorldFragmentType > * SceneQuery::getSupportedWorldFragmentTypes()
+## virtual const set<WorldFragmentType>::type* Ogre::SceneQuery::getSupportedWorldFragmentTypes(void) const
## note: this just returns a list
void
SceneQuery::getSupportedWorldFragmentTypes()
PPCODE:
- const std::set<SceneQuery::WorldFragmentType> *wfts = THIS->getSupportedWorldFragmentTypes();
- std::set<SceneQuery::WorldFragmentType>::const_iterator it;
+ const Ogre::set<SceneQuery::WorldFragmentType>::type *wfts = THIS->getSupportedWorldFragmentTypes();
+ Ogre::set<SceneQuery::WorldFragmentType>::type::const_iterator it;
for (it = wfts->begin(); it != wfts->end(); it++) {
mXPUSHi((int) *it);
}
More information about the Pkg-perl-cvs-commits
mailing list