Skip to content

Commit

Permalink
Merge pull request #57 from sdslabs/add-on-fix-add-point-llight
Browse files Browse the repository at this point in the history
Add lights (☞゚ヮ゚)☞
  • Loading branch information
twaritwaikar authored Feb 23, 2020
2 parents b92c086 + 0b0fa85 commit 34cd9fc
Show file tree
Hide file tree
Showing 46 changed files with 10,298 additions and 10,040 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)

set(ROOTEX_INCLUDES
${ROOTEX_INCLUDES}
${CMAKE_CURRENT_LIST_DIR}
${ROOTEX_INCLUDES}
${CMAKE_CURRENT_LIST_DIR}
CACHE INTERNAL "")

add_subdirectory(rootex)
Expand Down
Binary file modified game/assets/lost_in_istanbul.wav
Binary file not shown.
13 changes: 13 additions & 0 deletions game/assets/test/cube.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Entity = {
Components = {
TransformComponent = {
m_Position = {x = 0, y = 0, z = 0},
m_Rotation = {yaw = 0, pitch = 0, roll = 0},
m_Scale = {x = 10, y = 10, z = 1}
},
DiffuseVisualComponent = {
resFile = "game/assets/test/cube.obj",
texturePath = "game/assets/test/yellow.png"
}
}
}
10 changes: 10 additions & 0 deletions game/assets/test/directional_light.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Entity = {
Components = {
DirectionalLightComponent = {
direction = {x = 0.5773502691896258, y = 0.5773502691896258, z = -0.5773502691896258},
diffuseIntensity = 0.8,
diffuseColor = {r = 0.3, g = 0.1, b = 0.4, a = 1.0},
ambientColor = {r = 0.05, g = 0.05, b = 0.05, a = 1.0}
}
}
}
Loading

0 comments on commit 34cd9fc

Please sign in to comment.