iche033

cmake_minimum_required(VERSION 2.8 FATAL_ERROR)

find_package (Qt4)
find_package(Protobuf REQUIRED)
find_package(gazebo REQUIRED)

include (${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})

include_directories(SYSTEM ${GAZEBO_INCLUDE_DIRS})

iche033

diff -r f7d9beae4a9c gazebo/physics/Actor.cc
--- a/gazebo/physics/Actor.cc	Fri Apr 01 09:37:55 2016 -0700
+++ b/gazebo/physics/Actor.cc	Fri Apr 01 12:25:23 2016 -0700
@@ -818,6 +818,17 @@
       this->skinScale, this->skinScale));
 }
 
+/////////////////////////////////////////////////
+void Actor::SetSelfCollide(bool /*_self_collide*/)
+{

iche033

$ tree pr2

pr2
├── materials
│   └── textures
│       ├── base_color.png
│       ├── base_normals.png
│       ├── elbow_flex_color.png
│       ├── elbow_flex_normals.png
│       ├── finger_H_Color_100430.png

iche033

diff -r 108ab0bcc696 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jul 15 02:11:59 2016 +0200
+++ b/CMakeLists.txt	Mon Oct 24 10:27:30 2016 -0700
@@ -510,7 +510,9 @@
 endif ()
 
 # Setup samples
-add_subdirectory(Samples)
+if (OGRE_BUILD_SAMPLES)
+  add_subdirectory(Samples)

iche033

diff -r 108ab0bcc696 CMake/Dependencies.cmake
--- a/CMake/Dependencies.cmake	Fri Jul 15 02:11:59 2016 +0200
+++ b/CMake/Dependencies.cmake	Mon Oct 24 11:20:07 2016 -0700
@@ -126,6 +126,8 @@
 	macro_log_feature(DirectX11_FOUND "DirectX11" "Support for the DirectX11 render system" "http://msdn.microsoft.com/en-us/directx/" FALSE "" "")
 endif()
 
+findpkg_framework(AGL)
+
 #######################################################################

iche033

diff -r 108ab0bcc696 RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Fri Jul 15 02:11:59 2016 +0200
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Fri Oct 28 16:47:45 2016 -0700
@@ -246,8 +246,8 @@
         mActive = true;
         mClosed = false;
         mName = [windowTitle cStringUsingEncoding:NSUTF8StringEncoding];
-        mWidth = width;
-        mHeight = height;
+        mWidth = width * mContentScalingFactor;

iche033

diff -r 108ab0bcc696 RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Fri Jul 15 02:11:59 2016 +0200
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm	Thu Dec 22 17:18:10 2016 -0800
@@ -86,7 +86,7 @@
             mWindowDelegate = nil;
         }
     }
-	
+
 	void OSXCocoaWindow::create(const String& name, unsigned int width, unsigned int height,

iche033

// The input texture, which is set up by the Ogre Compositor infrastructure.
uniform sampler2D RT;

// Mapping of undistorted to distorted uv coordinates.
uniform sampler2D distortionMap;

// Scale the input texture if necessary to crop black border
uniform vec3 scale;

void main()

iche033

require 'formula'

class Ogre19 < Formula
  homepage 'http://www.ogre3d.org/'

  stable do
    url 'https://bitbucket.org/sinbad/ogre/get/v1-9-0.tar.gz'
    version '1.9.0'
    sha256 'ead2baa807903b740e726ebf2f205ad2de9f9aacaeeae0a38fc3e29184f50f5d'

iche033

diff -r 108ab0bcc696 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jul 15 02:11:59 2016 +0200
+++ b/CMakeLists.txt	Thu Dec 15 18:58:54 2016 -0800
@@ -326,6 +326,7 @@
 
   # 10.7 is the minimum for libc++ support
   set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 
   # Make sure that the OpenGL render system is selected for non-iOS Apple builds