Skip to content

Commit bfea516

Browse files
committed
Added gizmo static mesh to render example scene
1 parent 43bc64f commit bfea516

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

engine/render/renderer/platform/vulkan/LogicalDevice.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ LogicalDevice::LogicalDevice(const Surface& surface, PhysicalDevice& physDevice)
8181
GET_UNIQUE_QUEUES(queueCreateInfos, graphicsIdx, presentIdx)
8282

8383
auto deviceExtensions = Vulkan::Config::deviceExtensions;
84-
auto layers = Vulkan::Config::validationLayers;
8584

8685
CREATE_LOGICAL_DEVICE(
8786
vkPhysicalDevice,
13.1 KB
Binary file not shown.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
SOURCE_PATH:assets/models/gizmo.glb;
2+
MATERIAL_PATH:assets/models/cube.mat;
3+
NODE_PATH:/;
4+
FLIP_AXES:zy;

examples/render/src/main.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,16 @@ int main()
8787
Siege::Vulkan::StaticMesh cubeObjModel("assets/models/cube.sm", &testMaterial);
8888
Siege::Vulkan::StaticMesh vaseObjModel("assets/models/smooth_vase.sm", &testMaterial);
8989
Siege::Vulkan::StaticMesh cubeSetObjModel("assets/models/cube_set.sm", &testMaterial);
90+
Siege::Vulkan::StaticMesh gizmoObjModel("assets/models/gizmo.sm", &testMaterial);
9091

9192
// Create shapes for use
9293
Siege::MHArray<GameObject> objects3D = {GameObject(&cubeObjModel),
9394
GameObject(&cubeObjModel),
9495
GameObject(&cubeObjModel),
9596
GameObject(&cubeObjModel),
9697
GameObject(&vaseObjModel),
97-
GameObject(&cubeSetObjModel)};
98+
GameObject(&cubeSetObjModel),
99+
GameObject(&gizmoObjModel)};
98100

99101
objects3D[0].SetPosition({0.f, -.5f, 0.f});
100102
objects3D[0].SetScale({.5f, .5f, .5f});
@@ -123,6 +125,10 @@ int main()
123125
objects3D[5].SetScale({1.f, 1.f, 1.f});
124126
objects3D[5].SetColour({0, 0, 128, 255});
125127

128+
objects3D[6].SetPosition({-5.f, 0.f, 0.f});
129+
objects3D[6].SetScale({1.f, 1.f, 1.f});
130+
objects3D[6].SetColour({0, 0, 128, 255});
131+
126132
FPSCamera camera3D = FPSCamera({0.f, -1.f, -2.5f},
127133
{0.f, 0.f, 1.f},
128134
Siege::Float::Radians(60.f),

0 commit comments

Comments
 (0)