Revision: 8530
http://playerstage.svn.sourceforge.net/playerstage/?rev=8530&view=rev
Author: natepak
Date: 2010-01-26 23:24:14 +0000 (Tue, 26 Jan 2010)
Log Message:
-----------
removed audio.world
Modified Paths:
--------------
code/gazebo/trunk/examples/libgazebo/openal/openal.cc
Removed Paths:
-------------
code/gazebo/trunk/worlds/audio.world
Modified: code/gazebo/trunk/examples/libgazebo/openal/openal.cc
===================================================================
--- code/gazebo/trunk/examples/libgazebo/openal/openal.cc 2010-01-26
21:56:00 UTC (rev 8529)
+++ code/gazebo/trunk/examples/libgazebo/openal/openal.cc 2010-01-26
23:24:14 UTC (rev 8530)
@@ -1,5 +1,6 @@
+#include <stdio.h>
+#include <iostream>
#include <gazebo/gazebo.h>
-#include <gazebo/GazeboError.hh>
gazebo::Client *client = NULL;
gazebo::SimulationIface *simIface = NULL;
@@ -18,7 +19,7 @@
{
client->ConnectWait(serverId, GZ_CLIENT_ID_USER_FIRST);
}
- catch (gazebo::GazeboError e)
+ catch (std::string e)
{
std::cout << "Gazebo error: Unable to connect\n" << e << "\n";
return -1;
@@ -29,7 +30,7 @@
{
simIface->Open(client, "default");
}
- catch (gazebo::GazeboError e)
+ catch (std::string e)
{
std::cout << "Gazebo error: Unable to connect to the sim interface\n" << e
<< "\n";
return -1;
@@ -38,7 +39,7 @@
/// Open the OpenAL interface
try
{
- audioIface->Open(client, "audio_iface_1");
+ audioIface->Open(client, "sphere1_model::audio_iface_1");
}
catch (std::string e)
{
Deleted: code/gazebo/trunk/worlds/audio.world
===================================================================
--- code/gazebo/trunk/worlds/audio.world 2010-01-26 21:56:00 UTC (rev
8529)
+++ code/gazebo/trunk/worlds/audio.world 2010-01-26 23:24:14 UTC (rev
8530)
@@ -1,156 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Highly experimental new feature: audio. It is not supposed to work -->
-<gazebo:world
- xmlns:gazebo="http://playerstage.sourceforge.net/gazebo/xmlschema/#gz";
- xmlns:model="http://playerstage.sourceforge.net/gazebo/xmlschema/#model";
- xmlns:sensor="http://playerstage.sourceforge.net/gazebo/xmlschema/#sensor";
- xmlns:body="http://playerstage.sourceforge.net/gazebo/xmlschema/#body";
- xmlns:geom="http://playerstage.sourceforge.net/gazebo/xmlschema/#geom";
- xmlns:joint="http://playerstage.sourceforge.net/gazebo/xmlschema/#joint";
-
xmlns:interface="http://playerstage.sourceforge.net/gazebo/xmlschema/#interface";
-
xmlns:rendering="http://playerstage.sourceforge.net/gazebo/xmlschema/#rendering";
-
xmlns:controller="http://playerstage.sourceforge.net/gazebo/xmlschema/#controller";
- xmlns:physics="http://playerstage.sourceforge.net/gazebo/xmlschema/#physics";
>
-
- <verbosity>5</verbosity>
-
- <physics:ode>
- <stepTime>0.03</stepTime>
- <gravity>0 0 -9.8</gravity>
- <cfm>10e-5</cfm>
- <erp>0.3</erp>
- </physics:ode>
-
- <rendering:gui>
- <type>fltk</type>
- <size>800 600</size>
- <pos>0 0</pos>
- </rendering:gui>
-
- <rendering:ogre>
- <ambient>1.0 1.0 1.0 1.0</ambient>
- <sky>
- <material>Gazebo/CloudySky</material>
- </sky>
- </rendering:ogre>
-
- <rendering:audio>
- <background>test.ogg</background>
- </rendering:audio>
-
- <model:physical name="sphere1_model">
- <xyz>1 0 1.5</xyz>
- <rpy>0.0 0.0 0.0</rpy>
- <static>false</static>
-
- <body:sphere name="sphere1_body">
- <geom:sphere name="sphere1_geom">
- <size>0.5</size>
- <mass>1.0</mass>
-
- <visual>
- <scale>0.5 0.5 0.5</scale>
- <mesh>unit_sphere</mesh>
- <material>Gazebo/Rocky</material>
- </visual>
- </geom:sphere>
- </body:sphere>
- </model:physical>
-
- <model:physical name="box1_model">
- <xyz>1 1.5 0.5</xyz>
- <canonicalBody>box1_body</canonicalBody>
- <static>false</static>
-
- <controller:audio name="talking_box">
- <loop>false</loop>
- <stream>false</stream>
- <interface:audio name="audio_iface_0"/>
- </controller:audio>
-
- <body:box name="box1_body">
-
- <geom:box name="box1_geom">
- <size>1 1 1</size>
- <mass>1.0</mass>
- <visual>
- <mesh>unit_box</mesh>
- <material>Gazebo/BumpyMetal</material>
- </visual>
- </geom:box>
- </body:box>
- </model:physical>
-
- <model:physical name="cylinder1_model">
- <xyz>1 -1.5 0.5</xyz>
- <rpy>0.0 0.0 0.0</rpy>
-
- <body:cylinder name="cylinder1_body">
- <!--<sensor:microphone name="microphone_sensor">
- <gain>1.0</gain>
- </sensor:microphone>
- -->
- <geom:cylinder name="cylinder1_geom">
- <size>0.5 1</size>
- <mass>1.0</mass>
- <visual>
- <mesh>unit_cylinder</mesh>
- <material>Gazebo/RustyBarrel</material>
- </visual>
- </geom:cylinder>
- </body:cylinder>
- </model:physical>
-
- <!-- Ground Plane -->
- <model:physical name="plane1_model">
- <xyz>0 0 0</xyz>
- <rpy>0 0 0</rpy>
- <static>true</static>
-
- <body:plane name="plane1_body">
- <geom:plane name="plane1_geom">
- <normal>0 0 1</normal>
- <size>2000 2000</size>
- <segments>10 10</segments>
- <uvTile>100 100</uvTile>
- <material>Gazebo/GrassFloor</material>
- </geom:plane>
- </body:plane>
- </model:physical>
-
- <model:physical name="cam1_model">
- <xyz>-6 0 3.5</xyz>
- <rpy>0 28 0</rpy>
- <static>true</static>
-
- <body:empty name="cam1_body">
- <sensor:camera name="cam1_sensor">
- <imageSize>800 600</imageSize>
- <hfov>60</hfov>
- <nearClip>0.1</nearClip>
- <farClip>100</farClip>
- <saveFrames>false</saveFrames>
- <saveFramePath>frames</saveFramePath>
- </sensor:camera>
- </body:empty>
- </model:physical>
-
- <!-- White Point light -->
- <model:renderable name="point_white">
- <xyz>0 2 2</xyz>
- <static>true</static>
-
- <light>
- <type>point</type>
- <diffuseColor>0.8 0.8 0.8</diffuseColor>
- <specularColor>0.1 0.1 0.1</specularColor>
- <range>20</range>
-
- <!-- Constant(0-1) Linear(0-1) Quadratic -->
- <attenuation>0.5 0.1 0</attenuation>
- </light>
- </model:renderable>
-
-
-</gazebo:world>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
