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

Fix 3D physics module #700

Open
wants to merge 4 commits into
base: goodbye_cmake
Choose a base branch
from
Open

Fix 3D physics module #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b92df6
Fix 3D physics module
Aug 8, 2016
064ffac
Added workaround for enabling lights in SceneEntityInstances
Aug 8, 2016
b9ee5b2
Have the studio entity editor specify a parent scene so lights loaded…
Aug 8, 2016
29bf9c8
Revert "Added workaround for enabling lights in SceneEntityInstances"
Aug 24, 2016
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
7 changes: 7 additions & 0 deletions build/osx/polybuild/polybuild.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions ...x/polybuild/polybuild.xcodeproj/project.xcworkspace/xcshareddata/polybuild.xcscmblueprint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93" : 0,
"72C5045D78C89EEFD7A049056C14811D40BE1635" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "9C3A538F-B4BA-4880-B18A-0C7CFEACCF8B",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93" : "Polycode\/",
"72C5045D78C89EEFD7A049056C14811D40BE1635" : "Polycode\/lib\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "polybuild",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "build\/osx\/polybuild\/polybuild.xcodeproj",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/ivansafrin\/PolycodeDepBinaries",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "72C5045D78C89EEFD7A049056C14811D40BE1635"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:ivansafrin\/Polycode.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "BA7B57CFFA0E2C9A820883F90A39AA6329AE6D93"
}
]
}
2 changes: 1 addition & 1 deletion include/polycode/modules/physics3D/PolyCollisionScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ struct CollisionResult {
/**
* Creates a collision scene.
*/
CollisionScene(Vector3 size = Vector3(2000), bool virtualScene = false, bool deferInitCollision = false);
CollisionScene(Core* core, Vector3 size = Vector3(2000), bool deferInitCollision = false);
virtual ~CollisionScene();

void initCollisionScene(Vector3 size);
Expand Down
2 changes: 1 addition & 1 deletion include/polycode/modules/physics3D/PolyPhysicsScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ namespace Polycode {
/**
* Main constructor.
*/
PhysicsScene(int maxSubSteps = 0, Vector3 size = Vector3(200), bool virtualScene = false);
PhysicsScene(Core* core, int maxSubSteps = 0, Vector3 size = Vector3(200));
virtual ~PhysicsScene();

void fixedUpdate();
Expand Down
2 changes: 1 addition & 1 deletion src/ide/PolycodeEntityEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2147,7 +2147,7 @@ PolycodeEntityEditor::~PolycodeEntityEditor() {
bool PolycodeEntityEditor::openFile(OSFileEntry filePath) {
PolycodeEditor::openFile(filePath);
// return true;
loadedInstance = new SceneEntityInstance(core, filePath.fullPath);
loadedInstance = new SceneEntityInstance(core, mainView->getMainScene(), filePath.fullPath);

// disable sounds :)
for(int i=0; i < loadedInstance->getNumChildren(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/physics3D/PolyCollisionScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ THE SOFTWARE.

using namespace Polycode;

CollisionScene::CollisionScene(Vector3 size, bool virtualScene, bool deferInitCollision) : Scene(Scene::SCENE_3D, virtualScene), world(NULL), collisionConfiguration(NULL), dispatcher(NULL), axisSweep(NULL) {
CollisionScene::CollisionScene(Core* core, Vector3 size, bool deferInitCollision) : Scene(core, Scene::SCENE_3D), world(NULL), collisionConfiguration(NULL), dispatcher(NULL), axisSweep(NULL) {
if(!deferInitCollision) {
initCollisionScene(size);
}
Expand Down
3 changes: 1 addition & 2 deletions src/modules/physics3D/PolyPhysicsScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ THE SOFTWARE.
#include "polycode/modules/physics3D/PolyCollisionScene.h"
#include "polycode/modules/physics3D/PolyPhysicsSceneEntity.h"

#include "polycode/core/PolyCoreServices.h"
#include "polycode/core/PolyVector3.h"
#include "polycode/core/PolyCore.h"

Expand All @@ -47,7 +46,7 @@ PhysicsSceneEvent::~PhysicsSceneEvent() {
}


PhysicsScene::PhysicsScene(int maxSubSteps, Vector3 size, bool virtualScene) : CollisionScene(size, virtualScene, true), physicsWorld(NULL), solver(NULL), broadphase(NULL), ghostPairCallback(NULL) {
PhysicsScene::PhysicsScene(Core* core, int maxSubSteps, Vector3 size) : CollisionScene(core, size, true), physicsWorld(NULL), solver(NULL), broadphase(NULL), ghostPairCallback(NULL) {
this->maxSubSteps = maxSubSteps;
pausePhysics = false;
initPhysicsScene(size);
Expand Down