From 229ffed964bd5bd8322ba500689a03ba38377c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20H=C3=B6gler?= Date: Sat, 26 Mar 2022 14:16:35 +0100 Subject: [PATCH] Auto stash before rebase of "origin/master" --- external/boost | 2 +- external/slang | 2 +- src/Engine/Window/SceneView.cpp | 27 +++++++++++++-------------- src/Engine/main.cpp | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/external/boost b/external/boost index 238fe94..4d8de5a 160000 --- a/external/boost +++ b/external/boost @@ -1 +1 @@ -Subproject commit 238fe946c1d304f6e065a313610c2ef999239637 +Subproject commit 4d8de5a695430fec0856bf667b6c73855428d83b diff --git a/external/slang b/external/slang index c479030..627fc97 160000 --- a/external/slang +++ b/external/slang @@ -1 +1 @@ -Subproject commit c4790309ec46ae2f4f7c49eb50699a950ee7a9a4 +Subproject commit 627fc976bac5c2381dbace9c7925cb6a68b8de12 diff --git a/src/Engine/Window/SceneView.cpp b/src/Engine/Window/SceneView.cpp index 3026efd..468f30d 100644 --- a/src/Engine/Window/SceneView.cpp +++ b/src/Engine/Window/SceneView.cpp @@ -20,22 +20,21 @@ Seele::SceneView::SceneView(Gfx::PGraphics graphics, PWindow owner, const Viewpo { scene = new Scene(graphics); scene->addActor(activeCamera); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Avatar_Girl_Sword_Ayaka_Tex_Body_Diffuse.png"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Avatar_Girl_Sword_Ayaka_Tex_Body_Lightmap.png"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Avatar_Girl_Sword_Ayaka_Tex_Face_Diffuse.png"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Avatar_Girl_Sword_Ayaka_Tex_Hair_Diffuse.png"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Avatar_Girl_Sword_Ayaka_Tex_Hair_Lightmap.png"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Avatar_Girl_Tex_FaceLightmap.png"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ayaka\\Ayaka.fbx"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Ely\\Ely.fbx"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Cube\\cube.obj"); - AssetRegistry::importFile("C:\\Users\\Dynamitos\\TestSeeleProject\\Assets\\Plane\\plane.fbx"); - + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Avatar_Girl_Sword_Ayaka_Tex_Body_Diffuse.png"); + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Avatar_Girl_Sword_Ayaka_Tex_Body_Lightmap.png"); + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Avatar_Girl_Sword_Ayaka_Tex_Face_Diffuse.png"); + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Avatar_Girl_Sword_Ayaka_Tex_Hair_Diffuse.png"); + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Avatar_Girl_Sword_Ayaka_Tex_Hair_Lightmap.png"); + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Avatar_Girl_Tex_FaceLightmap.png"); + AssetRegistry::importFile("/home/dynamitos/TestSeeleProject/Assets/Ayaka/Ayaka.fbx"); PPrimitiveComponent ayaka = new PrimitiveComponent(AssetRegistry::findMesh("Ayaka")); - ayaka->setRelativeLocation(Vector(0, 0, 0)); - ayaka->setRelativeScale(Vector(10, 10, 10)); - //scene->addPrimitiveComponent(ayaka); + ayaka->addWorldTranslation(Vector(0, 0, 0)); + ayaka->setWorldScale(Vector(10, 10, 10)); + scene->addPrimitiveComponent(ayaka); + //AssetRegistry::importFile("D:\\Private\\Programming\\Unreal Engine\\Assets\\Ely\\Ely.fbx"); + //AssetRegistry::importFile("D:\\Private\\Programming\\Unreal Engine\\Assets\\Cube\\cube.obj"); + //AssetRegistry::importFile("D:\\Private\\Programming\\Unreal Engine\\Assets\\Plane\\plane.fbx"); PPrimitiveComponent plane = new PrimitiveComponent(AssetRegistry::findMesh("plane")); plane->setRelativeScale(Vector(100, 100, 100)); scene->addPrimitiveComponent(plane); diff --git a/src/Engine/main.cpp b/src/Engine/main.cpp index 4c29747..51f7ca7 100644 --- a/src/Engine/main.cpp +++ b/src/Engine/main.cpp @@ -9,7 +9,7 @@ using namespace Seele; int main() { PWindowManager windowManager = new WindowManager(); - AssetRegistry::init("C:\\Users\\Dynamitos\\TestSeeleProject"); + AssetRegistry::init("/home/dynamitos/TestSeeleProject/"); WindowCreateInfo mainWindowInfo; mainWindowInfo.title = "SeeleEngine"; mainWindowInfo.width = 1280;