Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…#777)

* Moved the materials and shaders to git

* Updated the version number

* Fixed some compiler warnings and made the move constructors noexcept

Otherwise standard containers don't use the move operations
  • Loading branch information
hhyyrylainen authored Apr 20, 2019
1 parent fcc4784 commit 354d08d
Show file tree
Hide file tree
Showing 42 changed files with 1,743 additions and 18 deletions.
22 changes: 10 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ link_directories("${LEVIATHAN_SRC}/build/bin")
# Version
set(PROGRAM_VERSION_STABLE 0)
set(PROGRAM_VERSION_MAJOR 4)
set(PROGRAM_VERSION_MINOR 1)
set(PROGRAM_VERSION_PATCH 1)
set(PROGRAM_VERSION_SUFFIX "")
set(PROGRAM_VERSION_MINOR 2)
set(PROGRAM_VERSION_PATCH 0)
set(PROGRAM_VERSION_SUFFIX "-alpha")

set(PROGRAM_VERSION_STR ${PROGRAM_VERSION_STABLE}.${PROGRAM_VERSION_MAJOR}.${PROGRAM_VERSION_MINOR}.${PROGRAM_VERSION_PATCH}${PROGRAM_VERSION_SUFFIX})
set(PROGRAM_VERSION ${PROGRAM_VERSION_STABLE}.${PROGRAM_VERSION_MAJOR}${PROGRAM_VERSION_MINOR}${PROGRAM_VERSION_PATCH})
Expand Down Expand Up @@ -143,10 +143,13 @@ file(GLOB THRIVE_SCRIPTS "scripts/*")
file(COPY ${THRIVE_SCRIPTS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/Scripts")
InstallContentsOfFolder("scripts" "bin/Data/Scripts")

# Right now we only use what the engine needs
# # Copy javascript libraries
# file(GLOB THRIVE_VENDOR_SCRIPTS "assets/jsvendor/*")
# file(COPY ${THRIVE_VENDOR_SCRIPTS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/jsvendor")
file(GLOB THRIVE_MATERIALS "materials/*")
file(COPY ${THRIVE_MATERIALS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/Materials/")
InstallContentsOfFolder("materials" "bin/Data/Materials")

file(GLOB THRIVE_SHADERS "shaders/*")
file(COPY ${THRIVE_SHADERS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/Shaders/")
InstallContentsOfFolder("shaders" "bin/Data/Shaders")

# Copy other data assets
file(GLOB THRIVE_TEXTURES "assets/textures/*")
Expand All @@ -158,11 +161,6 @@ file(GLOB THRIVE_FONTS "assets/fonts/*")
file(COPY ${THRIVE_FONTS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/Fonts/")
InstallContentsOfFolder("assets/fonts" "bin/Data/Fonts")


file(GLOB THRIVE_MATERIALS "assets/materials/*")
file(COPY ${THRIVE_MATERIALS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/Materials/")
InstallContentsOfFolder("assets/materials" "bin/Data/Materials")

file(GLOB THRIVE_MODELS "assets/models/*")
file(COPY ${THRIVE_MODELS} DESTINATION "${PROJECT_BINARY_DIR}/bin/Data/Models/")
InstallContentsOfFolder("assets/models" "bin/Data/Models")
Expand Down
35 changes: 35 additions & 0 deletions materials/ER.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
material ER
{
receive_shadows on

technique
{
pass ER
{
// lighting off

scene_blend alpha_blend
depth_write off

vertex_program_ref Organelle_VS
{
param_named_auto worldViewProj worldviewproj_matrix
param_named_auto time time_0_2pi 20
param_named size float 0.05
param_named maxRot float 15
}
fragment_program_ref Organelle_PS
{
param_named tex int 0
param_named_auto organelleColour custom 1
}

texture_unit
{
texture ER.png gamma
alpha_op_ex modulate src_manual src_texture 0.7
colour_op_ex modulate src_manual src_texture 1.0 1.0 1.0
}
}
}
}
53 changes: 53 additions & 0 deletions materials/agent_vacuole.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@


material AgentVacuoleMaterial3
{
receive_shadows on

technique
{
pass AgentVacuoleMaterial3
{
ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
specular 0.0 0.0 0.0 1.0 12.5
emissive 0.4000000059604645 0.4000000059604645 0.4000000059604645 1.0

alpha_to_coverage off
colour_write on
cull_hardware clockwise
depth_check on
depth_func less_equal
depth_write on
illumination_stage
light_clip_planes off
light_scissor off
// lighting on
// normalise_normals off
polygon_mode solid
scene_blend one zero
scene_blend_op add
shading gouraud
// transparent_sorting on

vertex_program_ref Organelle_VS
{
param_named size float 0.01
param_named maxRot float 180
}
fragment_program_ref Organelle_PS
{
param_named tex int 0
param_named_auto organelleColour custom 1
}
texture_unit
{
texture AgentVacuole.png gamma
tex_address_mode wrap
scale 1.0 1.0
tex_coord_set 0
colour_op modulate
}
}
}
}
Loading

0 comments on commit 354d08d

Please sign in to comment.