Thread: [Yake-svn] SF.net SVN: yake: [1609] trunk/yake/samples/physics/demo/yakeDemo.cpp
Status: Beta
Brought to you by:
psyclonist
Menu
▾
▴
yake-svn
|
From: <psy...@us...> - 2007-01-22 21:37:52
|
Revision: 1609
http://svn.sourceforge.net/yake/?rev=1609&view=rev
Author: psyclonist
Date: 2007-01-22 13:37:49 -0800 (Mon, 22 Jan 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/yake/samples/physics/demo/yakeDemo.cpp
Modified: trunk/yake/samples/physics/demo/yakeDemo.cpp
===================================================================
--- trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-01-22 21:37:23 UTC (rev 1608)
+++ trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-01-22 21:37:49 UTC (rev 1609)
@@ -196,7 +196,7 @@
}
void onCollisionEntered()
{
- YAKE_LOG("demo: collision!");
+ //YAKE_LOG("demo","collision!");
}
void setupLights()
{
@@ -225,7 +225,7 @@
// physics 1
- SharedPtr<base::Library> pLib = loadLib("physicsOde" );
+ SharedPtr<base::Library> pLib = loadLib(YAKE_DYNLIB_NAME("physicsOde") );
YAKE_ASSERT( pLib ).debug("Cannot load physics plugin 1.");
mPhysics1 = templates::create< physics::IPhysicsSystem >("ode");
@@ -249,7 +249,7 @@
#endif
// graphics
- pLib = loadLib("graphicsOgre" );
+ pLib = loadLib(YAKE_DYNLIB_NAME("graphicsOgre"));
YAKE_ASSERT( pLib ).debug("Cannot load graphics plugin.");
mGraphics = templates::create_default< graphics::IGraphicsSystem >();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-09-15 23:44:14
|
Revision: 1863
http://yake.svn.sourceforge.net/yake/?rev=1863&view=rev
Author: psyclonist
Date: 2007-09-15 16:44:18 -0700 (Sat, 15 Sep 2007)
Log Message:
-----------
* [demo] physics1: Vector3->Point3
Modified Paths:
--------------
trunk/yake/samples/physics/demo/yakeDemo.cpp
Modified: trunk/yake/samples/physics/demo/yakeDemo.cpp
===================================================================
--- trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-09-15 23:42:12 UTC (rev 1862)
+++ trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-09-15 23:44:18 UTC (rev 1863)
@@ -80,7 +80,7 @@
}
void createSimpleGraphicalObject( Simple & rSimple,
const String & rkMesh,
- const Vector3 & rkPosition = Vector3::kZero,
+ const Point3 & rkPosition = Point3::kZero,
const Vector3 & rkScale = Vector3(1,1,1))
{
rSimple.pSN.reset( mGWorld->createSceneNode() );
@@ -91,9 +91,9 @@
rSimple.pSN->setScale( rkScale );
}
void createSimpleActor( SharedPtr<physics::IWorld> pPWorld,
- Simple & rSimple,
- physics::IShape::Desc & rkDesc,
- const Vector3 & rkPosition,
+ Simple & rSimple,
+ const physics::IShape::Desc & rkDesc,
+ const Point3 & rkPosition,
const real mass = 2 )
{
rSimple.pActor = pPWorld->createActor(physics::ACTOR_DYNAMIC);
@@ -106,30 +106,30 @@
rSimple.pActor->subscribeToCollisionEntered( boost::bind(&MiniApp::onCollisionEntered,this));
}
- bool createBall( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Vector3 & rkPosition, const real radius )
+ bool createBall( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Point3 & rkPosition, const real radius )
{
// graphics
- createSimpleGraphicalObject( rSimple, "sphere_d1.mesh", Vector3(0,0,0), radius*Vector3(2,2,2) );
+ createSimpleGraphicalObject( rSimple, "sphere_d1.mesh", Point3::kZero, radius*Vector3(2,2,2) );
// physics
createSimpleActor( pPWorld, rSimple, physics::IShape::SphereDesc(real(radius)), rkPosition );
return true;
}
- bool createCapsule( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Vector3 & rkPosition, const real height, const real radius )
+ bool createCapsule( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Point3 & rkPosition, const real height, const real radius )
{
// graphics
- createSimpleGraphicalObject( rSimple, "box_1x1x1.mesh", Vector3(0,0,0), Vector3(radius,height,radius) );
+ createSimpleGraphicalObject( rSimple, "box_1x1x1.mesh", Point3::kZero, Vector3(radius,height,radius) );
// physics
createSimpleActor( pPWorld, rSimple, physics::IShape::CapsuleDesc(real(height), real(radius)), rkPosition );
return true;
}
- bool createBox( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Vector3 & rkPosition, const Vector3 & rkDimensions )
+ bool createBox( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Point3 & rkPosition, const Vector3 & rkDimensions )
{
// graphics
- createSimpleGraphicalObject( rSimple, "box_1x1x1.mesh", Vector3(0,0,0), 2*rkDimensions );
+ createSimpleGraphicalObject( rSimple, "box_1x1x1.mesh", Point3::kZero, 2*rkDimensions );
// physics
createSimpleActor( pPWorld, rSimple, physics::IShape::BoxDesc(rkDimensions), rkPosition );
@@ -169,7 +169,7 @@
pE->setCastsShadow( true );
- pSN->setPosition( Vector3(0,0,-100) );
+ pSN->setPosition( Point3(0,0,-100) );
}
void createPositionedLight()
{
@@ -179,7 +179,7 @@
mSceneNodes.push_back( pSN );
pL->setType( graphics::ILight::LT_POINT );
pL->setDiffuseColour( Color(1,1,1,1) );
- pSN->setPosition( Vector3(0,50,0) );
+ pSN->setPosition( Point3(0,50,0) );
pL->setDiffuseColour(Color(0.35, 0.35, 0.38));
pL->setSpecularColour(Color(0.9, 0.9, 1));
pL->setAttenuation( 8000, 1, 0.0005, 0 );
@@ -205,13 +205,13 @@
graphics::ILight* pL = mGWorld->createLight();
SharedPtr<graphics::ISceneNode> pNode( mGWorld->createSceneNode() );
pNode->attachLight( pL );
-
+
mSceneNodes.push_back(pNode);
pL->setType(ILight::LT_DIRECTIONAL);
- pNode->setPosition(Vector3(-1000,1250,500));
+ pNode->setPosition(Point3(-1000,1250,500));
Vector3 dir;
- dir = -pNode->getPosition();
+ dir = -pNode->getPosition().asVector();
dir.normalise();
pL->setDirection(dir);
pL->setDiffuseColour(Color(0.35, 0.35, 0.38));
@@ -266,8 +266,8 @@
graphics::ICamera* pC = mGWorld->createCamera();
pC->setNearClipDistance( 1 );
pC->setFarClipDistance( 1000 );
- pC->setPosition( Vector3(0,2,10) );
- pC->lookAt( Vector3(0,4,0) );
+ pC->setPosition( Point3(0,2,10) );
+ pC->lookAt( Point3(0,4,0) );
graphics::IViewport* pV = mGWorld->createViewport( pC );
pV->setDimensions( 0.7, 0, 0.3, 0.3 );
pV->setZ( 102 );
@@ -281,8 +281,8 @@
graphics::ICamera* pC = mGWorld->createCamera();
pC->setNearClipDistance( 1 );
pC->setFarClipDistance( 1000 );
- pC->setPosition( Vector3(0,10,50) );
- pC->lookAt( Vector3(0,1,0) );
+ pC->setPosition( Point3(0,10,50) );
+ pC->lookAt( Point3(0,1,0) );
graphics::IViewport* pV = mGWorld->createViewport( pC );
pV->setDimensions( 0, 0, 0.3, 0.3 );
pV->setZ( 101 );
@@ -297,8 +297,8 @@
graphics::ICamera* pC = mGWorld->createCamera();
pC->setNearClipDistance( 1 );
pC->setFarClipDistance( 1000 );
- pC->setPosition( Vector3(25,20,25) );
- pC->lookAt( Vector3(0,1,0) );
+ pC->setPosition( Point3(25,20,25) );
+ pC->lookAt( Point3(0,1,0) );
graphics::IViewport* pV = mGWorld->createViewport( pC );
pV->setDimensions( 0, 0, 1, 1 );
pV->setZ( 100 );
@@ -318,7 +318,7 @@
DequeIterator<Views> it(mViews.begin(), mViews.end());
while (it.hasMoreElements())
{
- SharedPtr<View> & pView = it.getNext();
+ SharedPtr<View> pView = it.getNext();
YAKE_ASSERT( pView );
YAKE_SAFE_DELETE( pView->pViewport );
YAKE_SAFE_DELETE( pView->pCamera );
@@ -342,7 +342,7 @@
std::ostream& operator << (std::ostream & o, const physics::IActor & rhs)
{
- Vector3 pos = rhs.getPosition();
+ Point3 pos = rhs.getPosition();
o << "(" << pos.x << ", " << pos.y << ", " << pos.z << ")";
return o;
}
@@ -435,19 +435,19 @@
SharedPtr<physics::IWorld> pPWorld = mPWorld1;
#endif
// spawn the object
- const Vector3 spawnOffset = bUseWorldOne ? Vector3(-5,0,0) : Vector3(5,0,0);
- const Vector3 spawnPos = spawnOffset + Vector3(randomiser.randReal()*0.5,10,randomiser.randReal()*0.5);
+ const Point3 spawnOffset = bUseWorldOne ? Point3(-5,0,0) : Point3(5,0,0);
+ const Point3 spawnPos = spawnOffset + Vector3(randomiser.randReal()*0.5,10,randomiser.randReal()*0.5);
objs.push_back( SharedPtr<Simple>( new Simple( pPWorld ) ) );
SharedPtr<Simple> last = objs.back();
std::cout << randomiser.randReal() << "\n";
if (randomiser.randReal() < 0.5)
- createBox( pPWorld, *objs.back(),
+ createBox( pPWorld, *objs.back(),
spawnPos, // position
Vector3(randomiser.randReal()*3,1,randomiser.randReal()*2) ); // dimensions
else
- createBall( pPWorld, *objs.back(),
+ createBall( pPWorld, *objs.back(),
spawnPos, // position
randomiser.randReal()*2 ); //dimension/radius
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <psy...@us...> - 2007-11-05 22:26:08
|
Revision: 1886
http://yake.svn.sourceforge.net/yake/?rev=1886&view=rev
Author: psyclonist
Date: 2007-11-05 14:26:03 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
* [demo] fixed scaling issue in physics demo #1
Modified Paths:
--------------
trunk/yake/samples/physics/demo/yakeDemo.cpp
Modified: trunk/yake/samples/physics/demo/yakeDemo.cpp
===================================================================
--- trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-10-29 22:01:34 UTC (rev 1885)
+++ trunk/yake/samples/physics/demo/yakeDemo.cpp 2007-11-05 22:26:03 UTC (rev 1886)
@@ -129,7 +129,7 @@
bool createBox( SharedPtr<physics::IWorld> pPWorld, Simple & rSimple, const Point3 & rkPosition, const Vector3 & rkDimensions )
{
// graphics
- createSimpleGraphicalObject( rSimple, "box_1x1x1.mesh", Point3::kZero, 2*rkDimensions );
+ createSimpleGraphicalObject( rSimple, "box_1x1x1.mesh", Point3::kZero, rkDimensions );
// physics
createSimpleActor( pPWorld, rSimple, physics::IShape::BoxDesc(rkDimensions), rkPosition );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X