added ak47 model
This commit is contained in:
OusmBlueNinja
parent
2c432f7229
commit
d24505877e
66252
assets/models/Ak-47.obj
Normal file
66252
assets/models/Ak-47.obj
Normal file
File diff suppressed because it is too large
Load Diff
@ -6,10 +6,6 @@ local ticks = 0
|
||||
local new_rotation = 0
|
||||
local speed = 50
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function OnInit()
|
||||
-- Log a message with a custom red color
|
||||
Engine.Log("This is a red message.", {1.0, 0.0, 0.0, 1.0})
|
||||
@ -38,12 +34,14 @@ function OnUpdate(deltaTime)
|
||||
|
||||
|
||||
-- Log the player's name with a white color
|
||||
-- local pos = transform:GetPosition()
|
||||
-- local pos = transform:GetRotation()
|
||||
-- local x = string.format("%.2f", pos.x)
|
||||
-- local y = string.format("%.2f", pos.y)
|
||||
-- local z = string.format("%.2f", pos.z)
|
||||
|
||||
-- Engine.Log("Player Pos: (" .. x .. ", " .. y .. ", " .. z .. ")", {1, 1, 1, 1})
|
||||
-- Engine.Log("Player Rot: (" .. x .. ", " .. y .. ", " .. z .. ")", {1, 1, 1, 1})
|
||||
|
||||
|
||||
|
||||
--local position = {x = 0.0, y = 2.0, z = -12.0} -- Define the new position
|
||||
--transform:SetPosition(position) -- Call the SetPosition method
|
||||
@ -53,8 +51,7 @@ function OnUpdate(deltaTime)
|
||||
new_rotation = 0
|
||||
end
|
||||
|
||||
local rotation = {x = -180.0, y = new_rotation, z = 0.0} -- Define the new position
|
||||
|
||||
local rotation = {x = new_rotation, y = new_rotation, z = new_rotation,} -- Define the new position
|
||||
transform:SetRotation(rotation) -- Call the SetPosition method
|
||||
|
||||
|
||||
|
||||
BIN
assets/textures/ak-47.jpg
Normal file
BIN
assets/textures/ak-47.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 220 KiB |
26
imgui.ini
26
imgui.ini
@ -4,7 +4,7 @@ Size=1920,1177
|
||||
Collapsed=0
|
||||
|
||||
[Window][Debug##Default]
|
||||
Pos=468,672
|
||||
Pos=468,549
|
||||
Size=400,400
|
||||
Collapsed=0
|
||||
|
||||
@ -27,10 +27,10 @@ Collapsed=0
|
||||
DockId=0x00000006,0
|
||||
|
||||
[Window][Logger]
|
||||
Pos=8,452
|
||||
Size=364,320
|
||||
Pos=374,878
|
||||
Size=1202,291
|
||||
Collapsed=0
|
||||
DockId=0x0000000C,0
|
||||
DockId=0x00000004,0
|
||||
|
||||
[Window][Object Selector]
|
||||
Pos=8,27
|
||||
@ -40,21 +40,21 @@ DockId=0x00000007,0
|
||||
|
||||
[Window][Scene Window]
|
||||
Pos=8,27
|
||||
Size=364,423
|
||||
Size=364,452
|
||||
Collapsed=0
|
||||
DockId=0x0000000B,0
|
||||
|
||||
[Window][Editor]
|
||||
Pos=374,27
|
||||
Size=1202,812
|
||||
Size=1202,849
|
||||
Collapsed=0
|
||||
DockId=0x0000000D,0
|
||||
|
||||
[Window][Lua Text Editor]
|
||||
Pos=374,841
|
||||
Size=1202,328
|
||||
Pos=8,481
|
||||
Size=364,291
|
||||
Collapsed=0
|
||||
DockId=0x00000004,0
|
||||
DockId=0x0000000C,0
|
||||
|
||||
[Window][Lua Editor Window]
|
||||
Pos=374,600
|
||||
@ -66,16 +66,16 @@ DockId=0x0000000E,0
|
||||
DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,27 Size=1904,1142 Split=X Selected=0xF7365A5A
|
||||
DockNode ID=0x00000009 Parent=0x14621557 SizeRef=364,1142 Split=Y Selected=0x3DC5AC3F
|
||||
DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,745 Split=Y Selected=0x3DC5AC3F
|
||||
DockNode ID=0x0000000B Parent=0x00000005 SizeRef=364,423 HiddenTabBar=1 Selected=0x3DC5AC3F
|
||||
DockNode ID=0x0000000C Parent=0x00000005 SizeRef=364,320 HiddenTabBar=1 Selected=0x9DD4E196
|
||||
DockNode ID=0x0000000B Parent=0x00000005 SizeRef=364,452 HiddenTabBar=1 Selected=0x3DC5AC3F
|
||||
DockNode ID=0x0000000C Parent=0x00000005 SizeRef=364,291 Selected=0xAE3C694A
|
||||
DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,395 HiddenTabBar=1 Selected=0x726D8899
|
||||
DockNode ID=0x0000000A Parent=0x14621557 SizeRef=1538,1142 Split=X
|
||||
DockNode ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2
|
||||
DockNode ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X
|
||||
DockNode ID=0x00000001 Parent=0x00000008 SizeRef=1202,1142 Split=Y Selected=0xDF0EC458
|
||||
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=1202,812 Split=Y Selected=0xDF0EC458
|
||||
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=1202,849 Split=Y Selected=0xDF0EC458
|
||||
DockNode ID=0x0000000D Parent=0x00000003 SizeRef=1202,571 CentralNode=1 Selected=0xDF0EC458
|
||||
DockNode ID=0x0000000E Parent=0x00000003 SizeRef=1202,569 Selected=0xE98146C5
|
||||
DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1202,328 Selected=0xAE3C694A
|
||||
DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1202,291 Selected=0x9DD4E196
|
||||
DockNode ID=0x00000002 Parent=0x00000008 SizeRef=334,1142 HiddenTabBar=1 Selected=0x36DC96AB
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@ Entities:
|
||||
Components:
|
||||
Transform:
|
||||
Position: [0, 2.79999995, -12.6000004]
|
||||
Rotation: [-180, 146.58255, 0]
|
||||
Rotation: [128.988251, 128.988251, 128.988251]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 2
|
||||
@ -12,17 +12,17 @@ Entities:
|
||||
textureID: 1
|
||||
MeshPath: assets/models/LowPolyFiatUNO.obj
|
||||
- ID: 2
|
||||
Name: Null Texture Box
|
||||
Name: Gun
|
||||
Components:
|
||||
Transform:
|
||||
Position: [7.80000019, -8.10000038, -20.6000004]
|
||||
Rotation: [-86.3000031, 0, -66]
|
||||
Scale: [1, 1, 1]
|
||||
Position: [-0.899999976, 0.600000024, -0.300000012]
|
||||
Rotation: [203.563934, 203.563934, 203.563934]
|
||||
Scale: [0.00999999978, 0.00999999978, 0.00999999978]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 3
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
indexCount: 116445
|
||||
textureID: 6
|
||||
MeshPath: assets/models/Ak-47.obj
|
||||
- ID: 3
|
||||
Name: Grass Box Top
|
||||
Components:
|
||||
@ -31,7 +31,7 @@ Entities:
|
||||
Rotation: [-23.5, 15.8999996, -59.9000015]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 4
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
@ -43,7 +43,7 @@ Entities:
|
||||
Rotation: [-17.2999992, -16.1000004, -19.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 5
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
@ -51,9 +51,9 @@ Entities:
|
||||
Name: Skybox
|
||||
Components:
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 6
|
||||
textureID: 7
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [0, 0, 43.2000008]
|
||||
@ -67,7 +67,7 @@ Entities:
|
||||
Rotation: [15.8000002, -18.2000008, -11.1000004]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 3
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
@ -79,7 +79,7 @@ Entities:
|
||||
Rotation: [-16.1000004, -15.8999996, -35]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 4
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
@ -91,7 +91,7 @@ Entities:
|
||||
Rotation: [22.2999992, -32.7999992, 0]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 1
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
@ -103,7 +103,7 @@ Entities:
|
||||
Rotation: [-41.4000015, -22.6000004, -52.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
vao: 6
|
||||
indexCount: 36
|
||||
textureID: 2
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
|
||||
@ -187,6 +187,8 @@ void MyEngine::Run()
|
||||
g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/default.png");
|
||||
g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/lush_grass.png");
|
||||
g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/vegetation_tree_bark_40.png");
|
||||
g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/ak-47.jpg");
|
||||
|
||||
|
||||
g_AssetManager.loadAsset<GLuint>(AssetType::TEXTURE, "assets/textures/sky.png");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user