Skip to content

Commit

Permalink
merge: add graphic client with some animations
Browse files Browse the repository at this point in the history
feat(graphic): add graphic client with some animations
  • Loading branch information
sdragos1 authored Jun 23, 2024
2 parents b413972 + 7e4220b commit f25d3e1
Show file tree
Hide file tree
Showing 48 changed files with 1,650 additions and 36 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea
.vscode
cmake-build-debug
server/build
zappy_server
Expand Down
22 changes: 22 additions & 0 deletions graphic/assets/deraumere/deraumere.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.004 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture deraumere.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/deraumere/deraumere.mesh
Binary file not shown.
Binary file added graphic/assets/deraumere/deraumere.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions graphic/assets/food/food.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.002 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture food.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/food/food.mesh
Binary file not shown.
Binary file added graphic/assets/food/food.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions graphic/assets/linemate/linemate.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.003 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture linemate.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/linemate/linemate.mesh
Binary file not shown.
Binary file added graphic/assets/linemate/linemate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions graphic/assets/mendiane/mendiane.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.005 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture mendiane.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/mendiane/mendiane.mesh
Binary file not shown.
Binary file added graphic/assets/mendiane/mendiane.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions graphic/assets/phiras/phiras.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.006 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture phiras.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/phiras/phiras.mesh
Binary file not shown.
Binary file added graphic/assets/phiras/phiras.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions graphic/assets/sibur/sibur.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.007 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture sibur.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/sibur/sibur.mesh
Binary file not shown.
Binary file added graphic/assets/sibur/sibur.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions graphic/assets/thystame/thystame.material
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// generated by blender2ogre 0.9.0 on 2024-06-10 17:02:03
material Material.008 {
receive_shadows on
technique {
pass {
diffuse 0.8 0.8 0.8 1.0
specular 0.5 0.0 0 0 0

// additional maps - requires RTSS
rtshader_system {
lighting_stage metal_roughness
}

// - base_color_texture
texture_unit {
texture thystame.png
tex_address_mode wrap
colour_op modulate
}
}
}
}
Binary file added graphic/assets/thystame/thystame.mesh
Binary file not shown.
Binary file added graphic/assets/thystame/thystame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphic/plugins.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PluginFolder=/usr/local/lib/OGRE
Plugin=RenderSystem_GL
Plugin=Codec_FreeImage
9 changes: 8 additions & 1 deletion graphic/resources.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
[Main]
FileSystem=assets/cube
Zip=assets/ui/SdkTrays.zip
FileSystem=assets/food
FileSystem=assets/linemate
FileSystem=assets/deraumere
FileSystem=assets/sibur
FileSystem=assets/mendiane
FileSystem=assets/phiras
FileSystem=assets/thystame
Zip=assets/ui/SdkTrays.zip
6 changes: 6 additions & 0 deletions graphic/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ add_library(zappy_gui_src STATIC)
target_link_libraries(zappy_gui_src OgreBites)

target_include_directories(zappy_gui_src PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(zappy_gui_src PUBLIC ${CMAKE_SOURCE_DIR})

## Binary executable
add_executable(zappy_gui main.cpp)
Expand All @@ -13,3 +14,8 @@ target_link_libraries(zappy_gui zappy_gui_src)

## Add subdirectories
add_subdirectory(app)
add_subdirectory(commands)
add_subdirectory(types)
add_subdirectory(utils)
add_subdirectory(client)
add_subdirectory(constants)
Loading

0 comments on commit f25d3e1

Please sign in to comment.