Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small updates/fixes for 2.8.2 #29

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
+215,928 −3,256
Open

Small updates/fixes for 2.8.2 #29

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b39fbdc
remove debug output on shape destroy
aknoerig Mar 25, 2015
9f8e9c1
shape creation overload with collision filter
aknoerig Mar 25, 2015
09c729a
custom shape creation overload with collision filter
aknoerig Mar 25, 2015
453294b
fix conflict with mouse events
aknoerig Mar 25, 2015
6828660
update vs example project settings for 2.8.2
aknoerig Mar 25, 2015
9b5d2e5
more updated vs example project settings for 2.8.2
aknoerig Mar 25, 2015
fd78f09
Empty Example for 009
NickHardeman Sep 12, 2015
e264d30
ignore shared space in xcode
NickHardeman Sep 12, 2015
6a1b9cc
update cloth example to 009
NickHardeman Sep 12, 2015
3ef922e
remove deprecated draw calls
NickHardeman Sep 12, 2015
73927ce
new bullet 2.83.6 libs
NickHardeman Sep 12, 2015
ab1d555
clean up only libs that have been built
NickHardeman Sep 12, 2015
515f768
update project files for 009
NickHardeman Sep 12, 2015
f60e687
fix for of to bullet quaternions
NickHardeman Sep 12, 2015
2b82fcd
rotation exampls
NickHardeman Sep 12, 2015
dfb44f0
up
NickHardeman Sep 12, 2015
3578010
ios libs
NickHardeman Sep 12, 2015
4ec2811
clean up extra libs
NickHardeman Sep 12, 2015
d0c77a8
osx libs
NickHardeman Sep 14, 2015
4ef25d4
extra util
NickHardeman Sep 14, 2015
cf9b80a
remove ds store
NickHardeman Sep 14, 2015
7a2e6e7
remove ds store
NickHardeman Sep 14, 2015
c2420e2
fix for bug in new libs to remove collision object
NickHardeman Sep 14, 2015
0ffc864
fix for deleting user data
NickHardeman Sep 14, 2015
a16599c
simpler call for updating mesh shape
NickHardeman Sep 14, 2015
8176ff6
batching of lines for debug drawing, much faster
NickHardeman Sep 16, 2015
2dbc839
proper call of remove function so that it happens in appropriate rigi…
NickHardeman Sep 16, 2015
a0051e3
collision event batching
NickHardeman Sep 16, 2015
7f2d54c
Merge remote-tracking branch 'refs/remotes/NickHardeman/master'
aknoerig Oct 21, 2015
8d6dea6
Merge remote-tracking branch 'refs/remotes/NickHardeman/develop-009'
aknoerig Oct 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rotation exampls
@NickHardeman
NickHardeman committed Sep 12, 2015
commit 2b82fcd6c0cc2bfb759fac0568aff222e18511a8
9 changes: 9 additions & 0 deletions RotationExample/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifneq ($(wildcard config.make),)
include config.make
endif

ifndef OF_ROOT
OF_ROOT=../../..
endif

include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk
28 changes: 28 additions & 0 deletions RotationExample/Project.xcconfig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//THE PATH TO THE ROOT OF OUR OF PATH RELATIVE TO THIS PROJECT.
//THIS NEEDS TO BE DEFINED BEFORE CoreOF.xcconfig IS INCLUDED
OF_PATH = ../../..

//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"

BULLET_LIB_PATH = $(OF_PATH)/addons/ofxBullet/libs/bullet2.83.6

OFX_BULLET_HEADERS = "$(BULLET_LIB_PATH)/include/**"

LIB_BULLET_COLLISION_RELEASE = "$(BULLET_LIB_PATH)/lib/osx/fat/libBulletCollision.a"
LIB_BULLET_DYNAMICS_RELEASE = "$(BULLET_LIB_PATH)/lib/osx/fat/libBulletDynamics.a"
LIB_BULLET_MATH_RELEASE = "$(BULLET_LIB_PATH)/lib/osx/fat/libLinearMath.a"
LIB_BULLET_SOFT_BODY_RELEASE = "$(BULLET_LIB_PATH)/lib/osx/fat/libBulletSoftBody.a"

OFX_BULLET_LIBS = $(LIB_BULLET_COLLISION_RELEASE) $(LIB_BULLET_DYNAMICS_RELEASE) $(LIB_BULLET_MATH_RELEASE) $(LIB_BULLET_SOFT_BODY_RELEASE)

//ICONS - NEW IN 0072
ICON_NAME_DEBUG = icon-debug.icns
ICON_NAME_RELEASE = icon.icns
ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/

//IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to:
//ICON_FILE_PATH = bin/data/

OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS) $(OFX_BULLET_LIBS)
HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) $(OFX_BULLET_HEADERS)
37 changes: 37 additions & 0 deletions RotationExample/SimpleExample.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleExample", "SimpleExample.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
233 changes: 233 additions & 0 deletions RotationExample/SimpleExample.vcxproj
View file

Large diffs are not rendered by default.

282 changes: 282 additions & 0 deletions RotationExample/SimpleExample.vcxproj.filters
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\ofxBulletWorldRigid.cpp">
<Filter>addons\ofxBullet\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCustomShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCylinder.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSphere.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletStaticPlane.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBaseShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBox.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCapsule.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCone.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletConvexShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\render\GLDebugDrawer.cpp">
<Filter>addons\ofxBullet\src\render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\joints\ofxBulletJoint.cpp">
<Filter>addons\ofxBullet\src\joints</Filter>
</ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ofApp.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\joints\ofxBulletJoint.cpp">
<Filter>addons\ofxBullet\src\joints</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\ofxBulletWorldRigid.cpp">
<Filter>addons\ofxBullet\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\ofxBulletWorldSoft.cpp">
<Filter>addons\ofxBullet\src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\render\GLDebugDrawer.cpp">
<Filter>addons\ofxBullet\src\render</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBaseShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBox.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCapsule.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCone.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletConvexShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCustomShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCylinder.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletEllipsoid.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletPatch.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletRigidBody.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletRope.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSoftBody.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSoftTriMesh.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSphere.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletStaticPlane.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletTriMeshShape.cpp">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{d8376475-7454-4a24-b08a-aac121d3ad6f}</UniqueIdentifier>
</Filter>
<Filter Include="addons">
<UniqueIdentifier>{99ff1d6e-74c8-4187-a726-1a91f4742e8d}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxBullet">
<UniqueIdentifier>{09a96ece-b32e-4feb-88ea-f94208fe5467}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxBullet\src">
<UniqueIdentifier>{da6e86fc-c55a-402b-b261-2fd836caae70}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxBullet\src\events">
<UniqueIdentifier>{e8889fea-b3cc-4c18-b71e-17465fe55171}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxBullet\src\joints">
<UniqueIdentifier>{0861882f-11b1-4cc4-9599-a24f9696c808}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxBullet\src\render">
<UniqueIdentifier>{e8324d24-e03e-49c7-a8bc-87b91aa9045e}</UniqueIdentifier>
</Filter>
<Filter Include="addons\ofxBullet\src\shapes">
<UniqueIdentifier>{df56df09-bbd1-462a-ae35-1080fbe8d682}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletConstants.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletUserData.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletUtils.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletWorldRigid.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBullet.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletConvexShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCustomShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCylinder.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSphere.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletStaticPlane.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBaseShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBox.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCapsule.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCone.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\render\GLDebugDrawer.h">
<Filter>addons\ofxBullet\src\render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\joints\ofxBulletJoint.h">
<Filter>addons\ofxBullet\src\joints</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\events\ofxBulletMousePickEvent.h">
<Filter>addons\ofxBullet\src\events</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\events\ofxBulletRaycastData.h">
<Filter>addons\ofxBullet\src\events</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\events\ofxBulletCollisionData.h">
<Filter>addons\ofxBullet\src\events</Filter>
</ClInclude>
<ClInclude Include="src\ofApp.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\events\ofxBulletCollisionData.h">
<Filter>addons\ofxBullet\src\events</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\events\ofxBulletMousePickEvent.h">
<Filter>addons\ofxBullet\src\events</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\events\ofxBulletRaycastData.h">
<Filter>addons\ofxBullet\src\events</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\joints\ofxBulletJoint.h">
<Filter>addons\ofxBullet\src\joints</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBullet.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletConstants.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletUserData.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletUtils.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletWorldRigid.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\ofxBulletWorldSoft.h">
<Filter>addons\ofxBullet\src</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\render\GLDebugDrawer.h">
<Filter>addons\ofxBullet\src\render</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBaseShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletBox.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCapsule.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCone.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletConvexShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCustomShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletCylinder.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletEllipsoid.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletPatch.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletRigidBody.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletRope.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSoftBody.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSoftTriMesh.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletSphere.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletStaticPlane.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
<ClInclude Include="..\..\..\addons\ofxBullet\src\shapes\ofxBulletTriMeshShape.h">
<Filter>addons\ofxBullet\src\shapes</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="icon.rc" />
</ItemGroup>
</Project>
129 changes: 129 additions & 0 deletions RotationExample/SimpleLinux.cbp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="Simple" />
<Option makefile_is_custom="1" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Option virtualFolders="addons/;src/;build config/;addons/ofxBullet/;addons/ofxBullet/src/;addons/ofxBullet/src/joints/;addons/ofxBullet/src/render/;addons/ofxBullet/src/shapes/;addons/ofxBullet/src/events/;" />
<Build>
<Target title="Debug">
<Option output="bin/$(PROJECT_NAME)_debug" prefix_auto="1" extension_auto="1" />
<Option working_dir="bin" />
<Option object_output="obj/Debug/" />
<Option external_deps="../../../libs/openFrameworksCompiled/lib/linux64/libopenFrameworksDebug.a;" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectLinkerOptionsRelation="2" />
</Target>
<Target title="Release">
<Option output="bin/$(PROJECT_NAME)" prefix_auto="1" extension_auto="1" />
<Option working_dir="bin" />
<Option object_output="obj/Release/" />
<Option external_deps="../../../libs/openFrameworksCompiled/lib/linux64/libopenFrameworks.a;" />
<Option type="1" />
<Option compiler="gcc" />
<Option projectLinkerOptionsRelation="2" />
</Target>
</Build>
<Unit filename="config.make">
<Option virtualFolder="build config" />
</Unit>
<Unit filename="src/main.cpp">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="src/testApp.cpp">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="src/testApp.h">
<Option virtualFolder="src/" />
</Unit>
<Unit filename="../../src/events/ofxBulletCollisionData.h">
<Option virtualFolder="addons/ofxBullet/src/events/" />
</Unit>
<Unit filename="../../src/events/ofxBulletMousePickEvent.h">
<Option virtualFolder="addons/ofxBullet/src/events/" />
</Unit>
<Unit filename="../../src/events/ofxBulletRaycastData.h">
<Option virtualFolder="addons/ofxBullet/src/events/" />
</Unit>
<Unit filename="../../src/joints/ofxBulletJoint.cpp">
<Option virtualFolder="addons/ofxBullet/src/joints/" />
</Unit>
<Unit filename="../../src/joints/ofxBulletJoint.h">
<Option virtualFolder="addons/ofxBullet/src/joints/" />
</Unit>
<Unit filename="../../src/ofxBullet.h">
<Option virtualFolder="addons/ofxBullet/src/" />
</Unit>
<Unit filename="../../src/ofxBulletConstants.h">
<Option virtualFolder="addons/ofxBullet/src/" />
</Unit>
<Unit filename="../../src/ofxBulletUserData.h">
<Option virtualFolder="addons/ofxBullet/src/" />
</Unit>
<Unit filename="../../src/ofxBulletUtils.h">
<Option virtualFolder="addons/ofxBullet/src/" />
</Unit>
<Unit filename="../../src/ofxBulletWorldRigid.cpp">
<Option virtualFolder="addons/ofxBullet/src/" />
</Unit>
<Unit filename="../../src/ofxBulletWorldRigid.h">
<Option virtualFolder="addons/ofxBullet/src/" />
</Unit>
<Unit filename="../../src/render/GLDebugDrawer.cpp">
<Option virtualFolder="addons/ofxBullet/src/render/" />
</Unit>
<Unit filename="../../src/render/GLDebugDrawer.h">
<Option virtualFolder="addons/ofxBullet/src/render/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletBaseShape.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletBaseShape.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletBox.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletBox.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCapsule.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCapsule.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCone.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCone.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCustomShape.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCustomShape.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCylinder.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletCylinder.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletSphere.cpp">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Unit filename="../../src/shapes/ofxBulletSphere.h">
<Option virtualFolder="addons/ofxBullet/src/shapes/" />
</Unit>
<Extensions>
<code_completion />
<envvars />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>
9 changes: 9 additions & 0 deletions RotationExample/SimpleLinux.workspace
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<CodeBlocks_workspace_file>
<Workspace title="SimpleLinux">
<Project filename="SimpleLinux.cbp" active="1">
<Depends filename="../../../libs/openFrameworksCompiled/project/linux64/libopenFrameworks.cbp"/>
</Project>
<Project filename="../../../libs/openFrameworksCompiled/project/linux64/libopenFrameworks.cbp"/>
</Workspace>
</CodeBlocks_workspace_file>
1 change: 1 addition & 0 deletions RotationExample/addons.make
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ofxBullet
34 changes: 34 additions & 0 deletions RotationExample/config.make
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# add custom variables to this file

# OF_ROOT allows to move projects outside apps/* just set this variable to the
# absoulte path to the OF root folder

OF_ROOT = ../../..


# USER_CFLAGS allows to pass custom flags to the compiler
# for example search paths like:
# USER_CFLAGS = -I src/objects

USER_CFLAGS = -DUSE_MINICL


# USER_LDFLAGS allows to pass custom flags to the linker
# for example libraries like:
# USER_LD_FLAGS = libs/libawesomelib.a

USER_LDFLAGS =


# use this to add system libraries for example:
# USER_LIBS = -lpango

USER_LIBS =


# change this to add different compiler optimizations to your project

USER_COMPILER_OPTIMIZATION = -march=native -mtune=native -Os


EXCLUDE_FROM_SOURCE="bin,.xcodeproj,obj,.git"
8 changes: 8 additions & 0 deletions RotationExample/icon.rc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// Icon Resource Definition
#define MAIN_ICON 102

#if defined(_DEBUG)
MAIN_ICON ICON "..\..\..\libs\openFrameworksCompiled\project\vs\icon_debug.ico"
#else
MAIN_ICON ICON "..\..\..\libs\openFrameworksCompiled\project\vs\icon.ico"
#endif
537 changes: 537 additions & 0 deletions RotationExample/ofxBulletRotationExample.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions RotationExample/openFrameworks-Info.plist
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>cc.openFrameworks.ofapp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleIconFile</key>
<string>${ICON}</string>
</dict>
</plist>
14 changes: 14 additions & 0 deletions RotationExample/src/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#include "ofMain.h"
#include "ofApp.h"

//========================================================================
int main( ){

ofSetupOpenGL(1024,768, OF_WINDOW); // <-------- setup the GL context

// this kicks off the running of my app
// can be OF_WINDOW or OF_FULLSCREEN
// pass in width and height too:
ofRunApp( new ofApp() );

}
158 changes: 158 additions & 0 deletions RotationExample/src/ofApp.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
#include "ofApp.h"

//--------------------------------------------------------------
void ofApp::setup() {
ofSetFrameRate(60);
ofSetVerticalSync(true);
ofBackground( 10, 10, 10);

camera.disableMouseInput();
camera.setAutoDistance( false );
camera.setPosition(ofVec3f(0, -7.f, -10.f));
camera.lookAt(ofVec3f(0, 0, 0), ofVec3f(0, -1, 0));

world.setup();
world.enableGrabbing();
world.setCamera(&camera);

ground.create( world.world, ofVec3f(0., 5.5, 0.), 0., 100.f, 1.f, 100.f );
ground.setProperties(.25, .95);
ground.add();

anchor.set( 0, 0, 0 );
end.set( 4, 0, 0 );

bAdd = false;
}

//--------------------------------------------------------------
void ofApp::update() {
world.update();
ofSetWindowTitle(ofToString(ofGetFrameRate(), 0));

end.rotate( ofGetLastFrameTime() * 2.6 * 60., ofVec3f(0,1,0) );

float tlen = ((sin( ofGetElapsedTimef() * 2.5 ) * 0.5 + 0.5) + 0.5) * 4.5;
end.normalize();
end *= tlen;

if( bAdd ) {
shared_ptr< ofxBulletCapsule > capsule( new ofxBulletCapsule() );
// get the mid pt, since position is the center of the object //
ofVec3f pos = (end + anchor) * 0.5;
// figure out the rotation //
// the up vector of the capsule object is 0,1,0
ofVec3f localCapsuleAxis( 0, 1, 0 );
// now make a vector that points along the line we are making from anchor to end
ofVec3f direction = (end + anchor) - anchor;

float radius = ofRandom(0.2, 0.4 );
float height = 5.;
float mass = radius;

height = direction.length();
// reduce the height to account for the rounded caps that bullet adds //
height -= radius * 2.;

direction.normalize();

ofQuaternion rotation;
rotation.makeRotate( localCapsuleAxis, direction );
capsule->create( world.world, pos, rotation, mass, radius, height );
capsule->add();

bodies.push_back( capsule );
bAdd = false;
}

if( bodies.size() > 500 ) {
bodies.erase( bodies.begin() );
}
}

//--------------------------------------------------------------
void ofApp::draw() {
ofEnableDepthTest();
camera.begin();

ofSetLineWidth(1.f);
ofSetColor(255, 0, 200);
world.drawDebug();

ofSetColor(100, 100, 100);
ground.draw();

ofSetColor(225, 225, 225);
for( int i = 0; i < bodies.size(); i++ ) {
bodies[i]->draw();
}

ofSetColor( 255 );
ofDrawSphere( anchor, 0.15 );
ofDrawSphere( end, 0.15 );
ofSetColor( 220, 0, 0 );
ofDrawLine( end, anchor );

camera.end();
ofDisableDepthTest();

stringstream ss;
ss << "enable camera move (hold spacebar and drag mouse) " << endl;
ss << "add capsule (a): " << bodies.size() << endl;

ofDrawBitmapStringHighlight( ss.str(), 20, 20 );
}

//--------------------------------------------------------------
void ofApp::keyPressed(int key) {
if( key == 'a' ) {
bAdd = true;
}
if( key == ' ' ) {
world.disableGrabbing();
camera.enableMouseInput();
}
}

//--------------------------------------------------------------
void ofApp::keyReleased(int key) {
if( key == ' ' ) {
world.enableGrabbing();
camera.disableMouseInput();
}
}

//--------------------------------------------------------------
void ofApp::mouseMoved(int x, int y) {

}

//--------------------------------------------------------------
void ofApp::mouseDragged(int x, int y, int button) {

}

//--------------------------------------------------------------
void ofApp::mousePressed(int x, int y, int button) {

}

//--------------------------------------------------------------
void ofApp::mouseReleased(int x, int y, int button){

}

//--------------------------------------------------------------
void ofApp::windowResized(int w, int h) {

}

//--------------------------------------------------------------
void ofApp::gotMessage(ofMessage msg) {

}

//--------------------------------------------------------------
void ofApp::dragEvent(ofDragInfo dragInfo) {

}
33 changes: 33 additions & 0 deletions RotationExample/src/ofApp.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#pragma once

#include "ofMain.h"
#include "ofxBullet.h"

class ofApp : public ofBaseApp{

public:
void setup();
void update();
void draw();

void keyPressed (int key);
void keyReleased(int key);
void mouseMoved(int x, int y );
void mouseDragged(int x, int y, int button);
void mousePressed(int x, int y, int button);
void mouseReleased(int x, int y, int button);
void windowResized(int w, int h);
void dragEvent(ofDragInfo dragInfo);
void gotMessage(ofMessage msg);

ofxBulletWorldRigid world;
ofxBulletBox ground;

vector< shared_ptr< ofxBulletRigidBody > > bodies;

ofEasyCam camera;

ofVec3f anchor, end;
bool bAdd;

};