Skip to content
Snippets Groups Projects
Commit 294616cc authored by Susanne Dötsch's avatar Susanne Dötsch
Browse files

[#63] First Scene WIP

Also added some test files
parent d6fd47f1
No related branches found
No related tags found
1 merge request!51Resolve "Laden mehrer Meshes mit Materials und Textures"
Showing
with 58 additions and 1 deletion
...@@ -12,7 +12,8 @@ enum class PrimitiveType : uint32_t { ...@@ -12,7 +12,8 @@ enum class PrimitiveType : uint32_t {
UNDEFINED = 0, UNDEFINED = 0,
POSITION = 1, POSITION = 1,
NORMAL = 2, NORMAL = 2,
TEXCOORD_0 = 3 TEXCOORD_0 = 3,
TEXCOORD_1 = 4
}; };
/* These integer values are used the same way in OpenGL, Vulkan and glTF. This /* These integer values are used the same way in OpenGL, Vulkan and glTF. This
......
...@@ -354,6 +354,8 @@ int loadScene(const std::string &path, Scene &scene){ ...@@ -354,6 +354,8 @@ int loadScene(const std::string &path, Scene &scene){
attribute.type = PrimitiveType::NORMAL; attribute.type = PrimitiveType::NORMAL;
} else if (attrib.first == "TEXCOORD_0") { } else if (attrib.first == "TEXCOORD_0") {
attribute.type = PrimitiveType::TEXCOORD_0; attribute.type = PrimitiveType::TEXCOORD_0;
} else if (attrib.first == "TEXCOORD_1") {
attribute.type = PrimitiveType::TEXCOORD_1;
} else { } else {
return 0; return 0;
} }
......
projects/first_scene/resources/Cutlery/Paris_LiquorBottle_01_Caps_Normal.png

132 B

projects/first_scene/resources/Cutlery/Plates_Ceramic_BaseColor.png

128 B

projects/first_scene/resources/Cutlery/Plates_Ceramic_Normal.png

130 B

projects/first_scene/resources/Cutlery/Plates_Details_Normal.png

131 B

projects/first_scene/resources/Cutlery/ToffeeJar_Label_BaseColor.png

132 B

projects/first_scene/resources/Cutlery/ToffeeJar_Label_Normal.png

132 B

projects/first_scene/resources/Cutlery/TransparentGlass_BaseColor.png

128 B

projects/first_scene/resources/Cutlery/TransparentGlass_Normal.png

127 B

File added
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment