[sdformat] 01/03: Imported Upstream version 3.1.1

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository sdformat.

commit a3acf14b51fb1c5d2494befcbf2a43a571a5188f
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 24 17:56:14 2015 +0200

    Imported Upstream version 3.1.1
---
 .hg_archival.txt           |  4 ++--
 .hgtags                    |  2 ++
 CMakeLists.txt             |  4 ++--
 Changelog.md               |  9 ++++++++-
 sdf/1.5/CMakeLists.txt     |  1 +
 sdf/1.5/logical_camera.sdf | 19 +++++++++++++++++++
 sdf/1.5/sensor.sdf         |  2 ++
 src/CMakeLists.txt         |  5 ++++-
 8 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
index 3335e97..6025a28 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,5 +1,5 @@
 repo: 17049bd77df5bd6cd56a76edba4a54afb5647740
-node: 0825b2d6a1ca4658b22213b9c79010bf043b3576
+node: 3739cf5051a6ddf7e8e13696c1ba1aeed8e2b80b
 branch: sdf3
-latesttag: sdformat3-prerelease_3.0.7
+latesttag: sdformat3_3.1.0
 latesttagdistance: 7
diff --git a/.hgtags b/.hgtags
index 3644f47..ff6434b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -93,3 +93,5 @@ a86c5d1fd79620b9e5c6558cec394d656c361e48 sdformat3-prerelease_3.0.2
 53a99cd74784e59e1c52955199a4f431204cba22 sdformat3-prerelease_3.0.5
 1c186b0edcf8e733f25ee8d149559640f3627148 sdformat3-prerelease_3.0.6
 345d293c0dd73bd2c35a0f92083d28fc250db355 sdformat3-prerelease_3.0.7
+0825b2d6a1ca4658b22213b9c79010bf043b3576 sdformat3_3.0.0
+c59a46c0e8f0869d84a0ee1fd9807f1e3b70f2cc sdformat3_3.1.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 161f0cf..5489e40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,8 +28,8 @@ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
 set (SDF_PROTOCOL_VERSION 1.5)
 
 set (SDF_MAJOR_VERSION 3)
-set (SDF_MINOR_VERSION 0)
-set (SDF_PATCH_VERSION 0)
+set (SDF_MINOR_VERSION 1)
+set (SDF_PATCH_VERSION 1)
 
 set (SDF_VERSION ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION})
 set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION})
diff --git a/Changelog.md b/Changelog.md
index 9a41601..0b2beb9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,13 @@
 ## SDFormat 3.0
 
-### SDFormat 3.0.0 (xxxx-xx-xx)
+### SDFormat 3.x.x (xxxx-xx-xx)
+
+### SDFormat 3.1.0 (2015-08-02)
+
+1. Added logical camera sensor to SDF
+     * [Pull request 207](https://bitbucket.org/osrf/sdformat/pull-request/207)
+
+### SDFormat 3.0.0 (2015-07-24)
 
 1. Added altimeter sensor to SDF
      * [Pull request 197](https://bitbucket.org/osrf/sdformat/pull-request/197)
diff --git a/sdf/1.5/CMakeLists.txt b/sdf/1.5/CMakeLists.txt
index 1a85835..751a378 100644
--- a/sdf/1.5/CMakeLists.txt
+++ b/sdf/1.5/CMakeLists.txt
@@ -20,6 +20,7 @@ set (sdfs
   joint.sdf
   light.sdf
   link.sdf
+  logical_camera.sdf
   magnetometer.sdf
   material.sdf
   mesh_shape.sdf
diff --git a/sdf/1.5/logical_camera.sdf b/sdf/1.5/logical_camera.sdf
new file mode 100644
index 0000000..de47703
--- /dev/null
+++ b/sdf/1.5/logical_camera.sdf
@@ -0,0 +1,19 @@
+<element name="logical_camera" required="0">
+  <description>These elements are specific to logical camera sensors. A logical camera reports objects that fall within a frustum. Computation should be performed on the CPU.</description>
+
+  <element name="near" type="double" default="0" required="1">
+    <description>Near clipping distance of the view frustum</description>
+  </element>
+
+  <element name="far" type="double" default="1" required="1">
+    <description>Far clipping distance of the view frustum</description>
+  </element>
+
+  <element name="aspect_ratio" type="double" default="1" required="1">
+    <description>Aspect ratio of the near and far planes. This is the width divided by the height of the near or far planes.</description>
+  </element>
+
+  <element name="horizontal_fov" type="double" default="1" required="1">
+    <description>Horizontal field of view of the frustum, in radians. This is the angle between the frustum's vertex and the edges of the near or far plane.</description>
+  </element>
+</element>
diff --git a/sdf/1.5/sensor.sdf b/sdf/1.5/sensor.sdf
index ee1ac66..d8feb3f 100644
--- a/sdf/1.5/sensor.sdf
+++ b/sdf/1.5/sensor.sdf
@@ -16,6 +16,7 @@
                   gps,
                   gpu_ray,
                   imu,
+                  logical_camera,
                   magnetometer,
                   multicamera,
                   ray,
@@ -52,6 +53,7 @@
   <include filename="contact.sdf" required="0"/>
   <include filename="gps.sdf" required="0"/>
   <include filename="imu.sdf" required="0"/>
+  <include filename="logical_camera.sdf" required="0"/>
   <include filename="magnetometer.sdf" required="0"/>
   <include filename="ray.sdf" required="0"/>
   <include filename="rfid.sdf" required="0"/>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0659265..b15bd68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,10 @@ if (USE_EXTERNAL_URDF)
   link_directories(${URDF_LIBRARY_DIRS})
 endif()
 
+if (USE_EXTERNAL_TINYXML)
+  link_directories(${tinyxml_LIBRARY_DIRS})
+endif()
+
 set (sources
   Assert.cc
   Console.cc
@@ -74,7 +78,6 @@ sdf_add_library(sdformat ${sources})
 target_link_libraries(sdformat ${Boost_LIBRARIES} ${IGNITION-MATH_LIBRARIES})
 
 if (USE_EXTERNAL_TINYXML)
-  link_directories(${tinyxml_LIBRARY_DIRS})
   target_link_libraries(sdformat ${tinyxml_LIBRARIES})
 endif()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdformat.git