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

Jump to bottom

Refactor PhysicsTest.cpp: add PhysicsManagerTest feature #397

Merged
merged 4 commits into from
Jan 6, 2020
Merged

Refactor PhysicsTest.cpp: add PhysicsManagerTest feature #397

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9463fe2
Refactor PhysicsTest.cpp to extract world/scene settup from individua…
aclegg3 Dec 20, 2019
b3dcd9f
Refactor PhysicsTestWorld to gtest test fixture PhysicsManagerTest
aclegg3 Dec 20, 2019
dc36e24
Merge remote-tracking branch 'origin/master' into physics-test-world
aclegg3 Jan 3, 2020
d7d6bfa
Removed unused variable sceneFile_
aclegg3 Jan 6, 2020
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
53 changes: 34 additions & 19 deletions src/tests/PhysicsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,44 +26,59 @@ const std::string physicsConfigFile =
Cr::Utility::Directory::join(SCENE_DATASETS,
"../default.phys_scene_config.json");

TEST(PhysicsTest, JoinCompound) {
LOG(INFO) << "Starting physics test";
// must create a context and renderer first
esp::gfx::WindowlessContext::uptr context_ =
esp::gfx::WindowlessContext::create_unique(0);
std::shared_ptr<esp::gfx::Renderer> renderer_ = esp::gfx::Renderer::create();
class PhysicsManagerTest : public testing::Test {
protected:
void SetUp() override {
context_ = esp::gfx::WindowlessContext::create_unique(0);
renderer_ = esp::gfx::Renderer::create();

sceneID_ = sceneManager_.initSceneGraph();
};

void initScene(const std::string sceneFile) {
const esp::assets::AssetInfo info =
esp::assets::AssetInfo::fromPath(sceneFile);

auto& sceneGraph = sceneManager_.getSceneGraph(sceneID_);
esp::scene::SceneNode* navSceneNode =
&sceneGraph.getRootNode().createChild();
auto& drawables = sceneManager_.getSceneGraph(sceneID_).getDrawables();
resourceManager_.loadScene(info, physicsManager_, navSceneNode, &drawables,
physicsConfigFile);
}

// must declare these in this order due to avoid deallocation errors
ResourceManager resourceManager;
esp::gfx::WindowlessContext::uptr context_;
esp::gfx::Renderer::ptr renderer_;

ResourceManager resourceManager_;
SceneManager sceneManager_;
std::shared_ptr<PhysicsManager> physicsManager_;
PhysicsManager::ptr physicsManager_;

int sceneID_;
};

TEST_F(PhysicsManagerTest, JoinCompound) {
LOG(INFO) << "Starting physics test: JoinCompound";

std::string sceneFile =
Cr::Utility::Directory::join(dataDir, "test_assets/scenes/plane.glb");
std::string objectFile = Cr::Utility::Directory::join(
dataDir, "test_assets/objects/nested_box.glb");

int sceneID = sceneManager_.initSceneGraph();
auto& sceneGraph = sceneManager_.getSceneGraph(sceneID);
esp::scene::SceneNode* navSceneNode = &sceneGraph.getRootNode().createChild();
auto& drawables = sceneManager_.getSceneGraph(sceneID).getDrawables();
const esp::assets::AssetInfo info =
esp::assets::AssetInfo::fromPath(sceneFile);

resourceManager.loadScene(info, physicsManager_, navSceneNode, nullptr,
physicsConfigFile);
initScene(sceneFile);

if (physicsManager_->getPhysicsSimulationLibrary() !=
PhysicsManager::PhysicsSimulationLibrary::NONE) {
// if we have a simulation implementation then test a joined vs. unjoined
// object
esp::assets::PhysicsObjectAttributes physicsObjectAttributes;
physicsObjectAttributes.setString("renderMeshHandle", objectFile);
resourceManager.loadObject(physicsObjectAttributes, objectFile);
resourceManager_.loadObject(physicsObjectAttributes, objectFile);

// get a reference to the stored template to edit
esp::assets::PhysicsObjectAttributes& objectTemplate =
resourceManager.getPhysicsObjectAttributes(objectFile);
resourceManager_.getPhysicsObjectAttributes(objectFile);

for (int i = 0; i < 2; i++) {
// mark the object not joined
Expand Down