Skip to content

Commit

Permalink
Merge pull request #34 from assimp/kimkulling/refactorings
Browse files Browse the repository at this point in the history 
Kimkulling/refactorings
  • Loading branch information
@kimkulling
kimkulling authored Aug 4, 2024
2 parents 35cdb95 + 9080ddc commit 14a839a
Show file tree
Hide file tree
Showing 4 changed files with 214 additions and 124 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ link_directories(
)

set(assimpview_main_src
src/main.cpp
src/ModelLoadingApp.h
src/ModelLoading.cpp
src/SceneData.h
)
Expand Down
242 changes: 118 additions & 124 deletions src/ModelLoading.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------------------------------*/
#include "ModelLoadingApp.h"
#include "App/App.h"
#include "App/Scene.h"
#include "IO/Uri.h"
Expand All @@ -31,6 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "RenderBackend/RenderCommon.h"

#include <assimp/scene.h>
#include <assimp/Exporter.hpp>

using namespace ::OSRE;
using namespace ::OSRE::App;
Expand All @@ -40,161 +42,153 @@ using namespace ::OSRE::RenderBackend;
/// @brief The log-tag
static constexpr c8 Tag[] = "Assimp-Viewer";

//-------------------------------------------------------------------------------------------------
/// @ingroup Editor
///
/// @brief
//-------------------------------------------------------------------------------------------------

/// @brief The example application, will create the renderer and loads a model.
class ModelLoadingApp : public App::AppBase {
String mAssetFolder; ///< The asset folder, here we will locate our assets.
App::CameraComponent *mCamera; ///< The camera component.
TransformMatrixBlock mTransformMatrix; ///< The tansform block.
TransformComponent::NodePtr mModelNode; ///< The mode node.
int mIntention;

public:
ModelLoadingApp(int argc, char *argv[]) :
AppBase(argc, (const char **)argv, "api", "The render API"),
mAssetFolder(),
mCamera(nullptr),
mTransformMatrix(),
mModelNode(),
mIntention(0) {
// empty
}
ModelLoadingApp::ModelLoadingApp(int argc, char *argv[]) :
AppBase(argc, (const char **)argv, "api", "The render API"),
mAssetFolder(),
mCamera(nullptr),
mTransformMatrix(),
mModelNode(),
mIntention(0),
mAssimpWrapper(nullptr) {
// empty
}

~ModelLoadingApp() override = default;
ModelLoadingApp::~ModelLoadingApp() {
delete mAssimpWrapper;
}

bool hasModel() const {
return mModelNode.isValid();
}
bool ModelLoadingApp::hasModel() const {
return mModelNode.isValid();
}

void pushIntention() {
mIntention++;
}
void ModelLoadingApp::pushIntention() {
mIntention++;
}

void popIntention() {
mIntention--;
}
void ModelLoadingApp::popIntention() {
mIntention--;
}

void checkName(String &name) {
if (name.empty()) {
name = "No Name";
}
void ModelLoadingApp::checkName(String &name) {
if (name.empty()) {
name = "No Name";
}
}

void dumpNode(aiNode &node) {
String name = node.mName.C_Str();
checkName(name);
for (int i=0; i<mIntention; ++i) {
std::cout << " ";
}

std::cout << "Node name: " << name << "\n";
for (unsigned int i=0; i < node.mNumChildren; ++i) {
pushIntention();
dumpNode(*node.mChildren[i]);
popIntention();
}
void ModelLoadingApp::dumpNode(aiNode &node) {
String name = node.mName.C_Str();
checkName(name);
for (int i=0; i<mIntention; ++i) {
std::cout << " ";
}

std::cout << "Node name: " << name << "\n";
for (unsigned int i=0; i < node.mNumChildren; ++i) {
pushIntention();
dumpNode(*node.mChildren[i]);
popIntention();
}
}

void showStatistics(const aiScene &scene) {
std::cout << "Modelname: " << scene.mName.C_Str() << "\n";
std::cout << "=============================================================\n";
void ModelLoadingApp::showStatistics(const aiScene &scene) {
std::cout << "Modelname: " << scene.mName.C_Str() << "\n";
std::cout << "=============================================================\n";

if (scene.mRootNode != nullptr) {
dumpNode(*scene.mRootNode);
}
if (scene.mRootNode != nullptr) {
dumpNode(*scene.mRootNode);
}

std::cout << "Number of meshes : " << scene.mNumMeshes << "\n";
std::cout << "Number of materials : " << scene.mNumMaterials << "\n";
std::cout << "Number of meshes : " << scene.mNumMeshes << "\n";
std::cout << "Number of materials : " << scene.mNumMaterials << "\n";
}

void ModelLoadingApp::importAsset(const IO::Uri &modelLoc) {
mAssimpWrapper = new AssimpWrapper(*getIdContainer(), getStage()->getActiveWorld(0));
if (!mAssimpWrapper->importAsset(modelLoc, 0)) {
return;
}

protected:
void loadAsset(const IO::Uri &modelLoc) {
AssimpWrapper assimpWrapper(*getIdContainer(), getStage()->getActiveWorld(0));
if (!assimpWrapper.importAsset(modelLoc, 0)) {
return;
}
RenderBackendService *rbSrv = ServiceProvider::getService<RenderBackendService>(ServiceType::RenderService);
if (nullptr == rbSrv) {
return;
}
Platform::AbstractWindow *rootWindow = getRootWindow();
if (nullptr == rootWindow) {
return;
}

RenderBackendService *rbSrv = ServiceProvider::getService<RenderBackendService>(ServiceType::RenderService);
if (nullptr == rbSrv) {
return;
}
Platform::AbstractWindow *rootWindow = getRootWindow();
if (nullptr == rootWindow) {
return;
}
Rect2ui windowsRect;
rootWindow->getWindowsRect(windowsRect);
World *world = getStage()->addActiveWorld("model");
Entity *entity = mAssimpWrapper->getEntity();
Entity *camEntity = new Entity("camera", *getIdContainer(), world);
mCamera = (CameraComponent*)camEntity->createComponent(ComponentType::CameraComponentType);
mCamera->setProjectionParameters(60.f, (f32)windowsRect.width, (f32)windowsRect.height, 0.01f, 1000.f);
world->setActiveCamera(mCamera);

Rect2ui windowsRect;
rootWindow->getWindowsRect(windowsRect);
World *world = getStage()->addActiveWorld("model");
Entity *entity = assimpWrapper.getEntity();
Entity *camEntity = new Entity("camera", *getIdContainer(), world);
mCamera = (CameraComponent*)camEntity->createComponent(ComponentType::CameraComponentType);
mCamera->setProjectionParameters(60.f, (f32)windowsRect.width, (f32)windowsRect.height, 0.01f, 1000.f);
world->setActiveCamera(mCamera);
world->addEntity(entity);
mCamera->observeBoundingBox(entity->getAABB());
mModelNode = entity->getNode();

world->addEntity(entity);
mCamera->observeBoundingBox(entity->getAABB());
mModelNode = entity->getNode();
showStatistics(*mAssimpWrapper->getScene());
}

showStatistics(*assimpWrapper.getScene());
void ModelLoadingApp::exportAsset(const IO::Uri &modelLoc) {
if (modelLoc.isEmpty()) {
return;
}

void onUpdate() override {
if (AppBase::isKeyPressed(Platform::KEY_O) || AppBase::isKeyPressed(Platform::KEY_o)) {
IO::Uri modelLoc;
Platform::PlatformOperations::getFileOpenDialog("Choose asset for import", "*", modelLoc);
if ( modelLoc.isValid()) {
loadAsset(modelLoc);
}
}

glm::mat4 rot(1.0);
if (AppBase::isKeyPressed(Platform::KEY_A)) {
mTransformMatrix.mModel *= glm::rotate(rot, 0.01f, glm::vec3(1, 0, 0));
if (!hasModel()) {
return;
}

}
if (AppBase::isKeyPressed(Platform::KEY_S)) {
mTransformMatrix.mModel *= glm::rotate(rot, -0.01f, glm::vec3(1, 0, 0));
}
Assimp::Exporter exporter;
exporter.Export(mAssimpWrapper->getScene(), "obj", modelLoc.getAbsPath().c_str());
}

if (AppBase::isKeyPressed(Platform::KEY_W)) {
mTransformMatrix.mModel *= glm::rotate(rot, 0.01f, glm::vec3(0, 1, 0));
void ModelLoadingApp::onUpdate() {
if (AppBase::isKeyPressed(Platform::KEY_I) || AppBase::isKeyPressed(Platform::KEY_i)) {
IO::Uri modelLoc;
Platform::PlatformOperations::getFileOpenDialog("Choose asset for import", "*", modelLoc);
if ( modelLoc.isValid()) {
importAsset(modelLoc);
}
}

if (AppBase::isKeyPressed(Platform::KEY_D)) {
mTransformMatrix.mModel *= glm::rotate(rot, -0.01f, glm::vec3(0, 1, 0));
if (AppBase::isKeyPressed(Platform::KEY_E) || AppBase::isKeyPressed(Platform::KEY_e)) {
IO::Uri modelLoc;
Platform::PlatformOperations::getFileSaveDialog("Choose asset for export", "*", modelLoc);
if ( modelLoc.isValid()) {
exportAsset(modelLoc);
}
RenderBackendService *rbSrv = ServiceProvider::getService<RenderBackendService>(ServiceType::RenderService);

rbSrv->beginPass(RenderPass::getPassNameById(RenderPassId));
rbSrv->beginRenderBatch("b1");

rbSrv->setMatrix(MatrixType::Model, mTransformMatrix.mModel);
}

rbSrv->endRenderBatch();
rbSrv->endPass();
glm::mat4 rot(1.0);
if (AppBase::isKeyPressed(Platform::KEY_A) || AppBase::isKeyPressed(Platform::KEY_a)) {
mTransformMatrix.mModel *= glm::rotate(rot, 0.01f, glm::vec3(1, 0, 0));

AppBase::onUpdate();
}
};
if (AppBase::isKeyPressed(Platform::KEY_S) || AppBase::isKeyPressed(Platform::KEY_s)) {
mTransformMatrix.mModel *= glm::rotate(rot, -0.01f, glm::vec3(1, 0, 0));
}

int main(int argc, char *argv[]) {
ModelLoadingApp myApp(argc, argv);
if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press o to import an Asset", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
return 1;
if (AppBase::isKeyPressed(Platform::KEY_W) || AppBase::isKeyPressed(Platform::KEY_w)) {
mTransformMatrix.mModel *= glm::rotate(rot, 0.01f, glm::vec3(0, 1, 0));
}

while (myApp.handleEvents()) {
myApp.update();
myApp.requestNextFrame();
if (AppBase::isKeyPressed(Platform::KEY_D) || AppBase::isKeyPressed(Platform::KEY_d)) {
mTransformMatrix.mModel *= glm::rotate(rot, -0.01f, glm::vec3(0, 1, 0));
}
RenderBackendService *rbSrv = ServiceProvider::getService<RenderBackendService>(ServiceType::RenderService);

rbSrv->beginPass(RenderPass::getPassNameById(RenderPassId));
rbSrv->beginRenderBatch("b1");

myApp.destroy();
rbSrv->setMatrix(MatrixType::Model, mTransformMatrix.mModel);

return 0;
rbSrv->endRenderBatch();
rbSrv->endPass();

AppBase::onUpdate();
}

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

/*-----------------------------------------------------------------------------------------------
The MIT License (MIT)
Copyright (c) 2015-2024 OSRE ( Open Source Render Engine ) by Kim Kulling
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-----------------------------------------------------------------------------------------------*/

#include "App/App.h"
#include "App/Scene.h"
#include "IO/Uri.h"
#include "Common/BaseMath.h"
#include "Platform/AbstractWindow.h"
#include "Platform/PlatformOperations.h"
#include "Properties/Settings.h"
#include "RenderBackend/RenderBackendService.h"
#include "RenderBackend/RenderCommon.h"

using namespace ::OSRE;
using namespace ::OSRE::App;
using namespace ::OSRE::Common;
using namespace ::OSRE::RenderBackend;

namespace OSRE {
namespace App {
class AssimpWrapper;
} // Namespace App
} // Namespace OSRE


/// @brief The loader application, will create the renderer and loads a model.
class ModelLoadingApp final : public App::AppBase {
public:
ModelLoadingApp(int argc, char *argv[]);
~ModelLoadingApp() override;
bool hasModel() const;
void pushIntention();
void popIntention();
void checkName(String &name);
void dumpNode(aiNode &node);
void showStatistics(const aiScene &scene);

protected:
void importAsset(const IO::Uri &modelLoc);
void exportAsset(const IO::Uri &modelLoc);
void onUpdate() override;

private:
String mAssetFolder; ///< The asset folder, here we will locate our assets.
App::CameraComponent *mCamera; ///< The camera component.
TransformMatrixBlock mTransformMatrix; ///< The tansform block.
TransformComponent::NodePtr mModelNode; ///< The mode node.
int mIntention;
OSRE::App::AssimpWrapper *mAssimpWrapper;
};
22 changes: 22 additions & 0 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#include "ModelLoadingApp.h"

using namespace ::OSRE;
using namespace ::OSRE::App;
using namespace ::OSRE::Common;
using namespace ::OSRE::RenderBackend;

int main(int argc, char *argv[]) {
ModelLoadingApp myApp(argc, argv);
if (!myApp.initWindow(10, 10, 1024, 768, "Assimp-Vewer! Press i to import, e to export", false, false, App::RenderBackendType::OpenGLRenderBackend)) {
return 1;
}

while (myApp.handleEvents()) {
myApp.update();
myApp.requestNextFrame();
}

myApp.destroy();

return 0;
}

0 comments on commit 14a839a

Please sign in to comment.