Compare commits
20 Commits
v0.1.0
...
ab605f7590
| Author | SHA1 | Date | |
|---|---|---|---|
| ab605f7590 | |||
| 15d5af34b9 | |||
| 6d0e60e241 | |||
| 7b530968af | |||
| 930226cc47 | |||
| f9bf2f4b89 | |||
| df3ac5b5db | |||
| 2568eb7d18 | |||
| 2e3b4f4f0f | |||
| 5951a5e81c | |||
| 849386a3bc | |||
| 3e7ce71219 | |||
| 94fed9a810 | |||
| f4174724c6 | |||
|
|
def311c7dd | ||
|
|
45d2c8234a | ||
|
|
0f731530da | ||
|
|
2b75c510af | ||
|
|
d6e1e4a50e | ||
|
|
d62b310a21 |
13
.github/workflows/release-build.yml
vendored
@@ -27,7 +27,8 @@ jobs:
|
|||||||
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
env:
|
||||||
|
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/.vcpkg-cache,readwrite
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
@@ -48,12 +49,18 @@ jobs:
|
|||||||
- name: Setup MSVC
|
- name: Setup MSVC
|
||||||
if: matrix.platform == 'windows'
|
if: matrix.platform == 'windows'
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
- name: Cache vcpkg
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: .vcpkg-cache
|
||||||
|
key: ${{ runner.os }}-vcpkg-${{ hashFiles('vcpkg.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-vcpkg-
|
||||||
- name: Bootstrap vcpkg
|
- name: Bootstrap vcpkg
|
||||||
run: |
|
run: |
|
||||||
git clone https://github.com/microsoft/vcpkg.git
|
git clone https://github.com/microsoft/vcpkg.git
|
||||||
./vcpkg/bootstrap-vcpkg.bat
|
./vcpkg/bootstrap-vcpkg.bat
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
if: matrix.platform == 'windows'
|
if: matrix.platform == 'windows'
|
||||||
run: >
|
run: >
|
||||||
|
|||||||
@@ -1,4 +1,9 @@
|
|||||||
cmake_minimum_required(VERSION 3.21)
|
cmake_minimum_required(VERSION 3.21)
|
||||||
|
|
||||||
|
if(APPLE)
|
||||||
|
message(FATAL_ERROR "This game does not support macOS")
|
||||||
|
endif()
|
||||||
|
|
||||||
project(Cubed LANGUAGES C CXX)
|
project(Cubed LANGUAGES C CXX)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 23)
|
set(CMAKE_CXX_STANDARD 23)
|
||||||
@@ -34,6 +39,8 @@ add_subdirectory(third_party/imgui)
|
|||||||
|
|
||||||
add_subdirectory(third_party/dr_libs)
|
add_subdirectory(third_party/dr_libs)
|
||||||
|
|
||||||
|
add_subdirectory(third_party/stb)
|
||||||
|
|
||||||
add_executable(${PROJECT_NAME})
|
add_executable(${PROJECT_NAME})
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
@@ -123,16 +130,14 @@ target_include_directories(${PROJECT_NAME}
|
|||||||
|
|
||||||
target_link_libraries(${PROJECT_NAME}
|
target_link_libraries(${PROJECT_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
glfw
|
SDL3::SDL3
|
||||||
glad
|
glad
|
||||||
glm::glm
|
|
||||||
OpenGL::GL
|
OpenGL::GL
|
||||||
soil2
|
|
||||||
Freetype::Freetype
|
Freetype::Freetype
|
||||||
tomlplusplus::tomlplusplus
|
|
||||||
imgui
|
imgui
|
||||||
dr_libs
|
dr_libs
|
||||||
tbb
|
tbb
|
||||||
|
stb
|
||||||
protobuf::libprotobuf
|
protobuf::libprotobuf
|
||||||
absl::log
|
absl::log
|
||||||
absl::check
|
absl::check
|
||||||
@@ -141,6 +146,9 @@ target_link_libraries(${PROJECT_NAME}
|
|||||||
absl::flat_hash_map
|
absl::flat_hash_map
|
||||||
zstd::zstd
|
zstd::zstd
|
||||||
OpenAL::OpenAL
|
OpenAL::OpenAL
|
||||||
|
harfbuzz::harfbuzz
|
||||||
|
Opus::Opus
|
||||||
|
assimp::assimp
|
||||||
$<$<PLATFORM_ID:Windows>:ws2_32>
|
$<$<PLATFORM_ID:Windows>:ws2_32>
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|||||||
4
assets/SensitiveLexicon.json
Normal file
@@ -8,4 +8,5 @@ is_passable = true
|
|||||||
is_transitional = false
|
is_transitional = false
|
||||||
is_transparent = true
|
is_transparent = true
|
||||||
name = 'air'
|
name = 'air'
|
||||||
|
name_key = 'block.air'
|
||||||
roughness = 1.0
|
roughness = 1.0
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = true
|
is_transitional = true
|
||||||
is_transparent = false
|
is_transparent = false
|
||||||
name = 'dirt'
|
name = 'dirt'
|
||||||
|
name_key = 'block.dirt'
|
||||||
roughness = 1.0
|
roughness = 1.0
|
||||||
@@ -8,4 +8,5 @@ is_passable = true
|
|||||||
is_transitional = false
|
is_transitional = false
|
||||||
is_transparent = true
|
is_transparent = true
|
||||||
name = 'grass'
|
name = 'grass'
|
||||||
roughness = 0.9
|
name_key = 'block.grass'
|
||||||
|
roughness = 0.90000000000000002
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = true
|
is_transitional = true
|
||||||
is_transparent = false
|
is_transparent = false
|
||||||
name = 'grass_block'
|
name = 'grass_block'
|
||||||
roughness = 0.9
|
name_key = 'block.grass_block'
|
||||||
|
roughness = 0.90000000000000002
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = false
|
is_transitional = false
|
||||||
is_transparent = true
|
is_transparent = true
|
||||||
name = 'leaf'
|
name = 'leaf'
|
||||||
roughness = 0.7
|
name_key = 'block.leaf'
|
||||||
|
roughness = 0.69999999999999996
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = false
|
is_transitional = false
|
||||||
is_transparent = false
|
is_transparent = false
|
||||||
name = 'log'
|
name = 'log'
|
||||||
roughness = 0.7
|
name_key = 'block.log'
|
||||||
|
roughness = 0.69999999999999996
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = true
|
is_transitional = true
|
||||||
is_transparent = false
|
is_transparent = false
|
||||||
name = 'sand'
|
name = 'sand'
|
||||||
roughness = 0.8
|
name_key = 'block.sand'
|
||||||
|
roughness = 0.80000000000000004
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = true
|
is_transitional = true
|
||||||
is_transparent = false
|
is_transparent = false
|
||||||
name = 'snowy_grass_block'
|
name = 'snowy_grass_block'
|
||||||
roughness = 0.9
|
name_key = 'block.snowy_grass_block'
|
||||||
|
roughness = 0.90000000000000002
|
||||||
@@ -8,4 +8,5 @@ is_passable = false
|
|||||||
is_transitional = true
|
is_transitional = true
|
||||||
is_transparent = false
|
is_transparent = false
|
||||||
name = 'stone'
|
name = 'stone'
|
||||||
|
name_key = 'block.stone'
|
||||||
roughness = 0.75
|
roughness = 0.75
|
||||||
@@ -8,4 +8,5 @@ is_transparent = false
|
|||||||
is_discard = false
|
is_discard = false
|
||||||
is_blend = false
|
is_blend = false
|
||||||
is_transitional = false
|
is_transitional = false
|
||||||
roughness = 1.0
|
roughness = 1.0
|
||||||
|
name_key = "block.template"
|
||||||
|
|||||||
@@ -8,4 +8,5 @@ is_passable = true
|
|||||||
is_transitional = false
|
is_transitional = false
|
||||||
is_transparent = true
|
is_transparent = true
|
||||||
name = 'water'
|
name = 'water'
|
||||||
|
name_key = 'block.water'
|
||||||
roughness = 0.02
|
roughness = 0.02
|
||||||
BIN
assets/fonts/unifont_t-17.0.05.otf
Normal file
49
assets/lang/en_US.json
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
{
|
||||||
|
"menu.settings": "Settings",
|
||||||
|
"menu.main.host_game": "Host Game",
|
||||||
|
"menu.main.join_game": "Join Game",
|
||||||
|
"menu.main.credits": "Credits",
|
||||||
|
"menu.main.quit": "Quit",
|
||||||
|
"menu.main.player_name": "Player: {name}",
|
||||||
|
"menu.main.cubed_version": "Cubed: {version}",
|
||||||
|
"menu.pause.pause_menu": "Pause Menu",
|
||||||
|
"menu.pause.back_to_game": "Back To Game",
|
||||||
|
"menu.pause.return_to_main_menu": "Return to Menu",
|
||||||
|
"button.done": "Done",
|
||||||
|
"button.return": "Return",
|
||||||
|
"settings.title": "Settings",
|
||||||
|
"settings.fov": "Fov: {fov}",
|
||||||
|
"settings.mouse_sensitivity": "Sensitivity: {sensitivity}",
|
||||||
|
"settings.distance": "Distance: {distance}",
|
||||||
|
"settings.music_volume": "Music: {music}",
|
||||||
|
"settings.sfx_volume": "SFX: {sfx}",
|
||||||
|
"settings.player_voice": "Player Voice: {volume}",
|
||||||
|
"settings.fullscreen": "fullscreen: {state}",
|
||||||
|
"settings.aniso": "Aniso: {aniso}",
|
||||||
|
"settings.vsync": "V-Sync: {state}",
|
||||||
|
"settings.language": "Language: {lang}",
|
||||||
|
"settings.restart_game_info": "You need to restart the game to apply this changes.",
|
||||||
|
"settings.voice_input": "Voice Input: {type}",
|
||||||
|
"voice_input.ptt": "PTT",
|
||||||
|
"voice_input.always": "always",
|
||||||
|
"common.on": "on",
|
||||||
|
"common.off": "off",
|
||||||
|
"hostgame.create_a_new_world": "Create A New World",
|
||||||
|
"hostgame.world_seed": "World Seed",
|
||||||
|
"hostgame.port": "Port",
|
||||||
|
"hostgame.create_world": "Create World",
|
||||||
|
"joingame.join_a_world": "Join A World",
|
||||||
|
"joingame.server_ip": "Server Ip",
|
||||||
|
"joingame.join_world": "Join World",
|
||||||
|
"error.disable_voice": "Server Disable Voice Chat",
|
||||||
|
"block.air": "air",
|
||||||
|
"block.dirt": "dirt",
|
||||||
|
"block.grass_block": "grass block",
|
||||||
|
"block.grass": "grass",
|
||||||
|
"block.leaf": "leaf",
|
||||||
|
"block.log": "log",
|
||||||
|
"block.sand": "sand",
|
||||||
|
"block.snowy_grass_block": "snowy grass block",
|
||||||
|
"block.stone": "stone",
|
||||||
|
"block.water": "water"
|
||||||
|
}
|
||||||
49
assets/lang/zh_CN.json
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
{
|
||||||
|
"menu.settings": "设置",
|
||||||
|
"menu.main.host_game": "创建游戏",
|
||||||
|
"menu.main.join_game": "加入游戏",
|
||||||
|
"menu.main.credits": "制作人员",
|
||||||
|
"menu.main.quit": "退出",
|
||||||
|
"menu.main.player_name": "玩家:{name}",
|
||||||
|
"menu.main.cubed_version": "Cubed:{version}",
|
||||||
|
"menu.pause.pause_menu": "暂停菜单",
|
||||||
|
"menu.pause.back_to_game": "返回游戏",
|
||||||
|
"menu.pause.return_to_main_menu": "返回主菜单",
|
||||||
|
"button.done": "完成",
|
||||||
|
"button.return": "返回",
|
||||||
|
"settings.title": "设置",
|
||||||
|
"settings.fov": "视野:{fov}",
|
||||||
|
"settings.mouse_sensitivity": "灵敏度:{sensitivity}",
|
||||||
|
"settings.distance": "距离:{distance}",
|
||||||
|
"settings.music_volume": "音乐:{music}",
|
||||||
|
"settings.sfx_volume": "音效:{sfx}",
|
||||||
|
"settings.player_voice": "玩家语音:{volume}",
|
||||||
|
"settings.fullscreen": "全屏:{state}",
|
||||||
|
"settings.aniso": "各向异性过滤:{aniso}",
|
||||||
|
"settings.vsync": "垂直同步: {state}",
|
||||||
|
"settings.language": "语言: {lang}",
|
||||||
|
"settings.restart_game_info": "您需要重启游戏以应用这些更改。",
|
||||||
|
"settings.voice_input": "语音输入: {type}",
|
||||||
|
"voice_input.ptt": "按键通话",
|
||||||
|
"voice_input.always": "始终",
|
||||||
|
"common.on": "开",
|
||||||
|
"common.off": "关",
|
||||||
|
"hostgame.create_a_new_world": "创建新世界",
|
||||||
|
"hostgame.world_seed": "世界种子",
|
||||||
|
"hostgame.port": "端口",
|
||||||
|
"hostgame.create_world": "创建世界",
|
||||||
|
"joingame.join_a_world": "加入世界",
|
||||||
|
"joingame.server_ip": "服务器IP",
|
||||||
|
"joingame.join_world": "加入世界",
|
||||||
|
"error.disable_voice": "服务器已禁用语音聊天",
|
||||||
|
"block.air": "空气",
|
||||||
|
"block.dirt": "泥土",
|
||||||
|
"block.grass_block": "草方块",
|
||||||
|
"block.grass": "草",
|
||||||
|
"block.leaf": "树叶",
|
||||||
|
"block.log": "原木",
|
||||||
|
"block.sand": "沙子",
|
||||||
|
"block.snowy_grass_block": "覆雪草方块",
|
||||||
|
"block.stone": "石头",
|
||||||
|
"block.water": "水"
|
||||||
|
}
|
||||||
90
assets/licenses/OFL-1.1.txt
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
The SIL Open Font License version 1.1 is copied below, and is also
|
||||||
|
available with a FAQ at http://scripts.sil.org/OFL.
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
437
assets/licenses/OPENAL_SOFT_LICENSE.txt
Normal file
@@ -0,0 +1,437 @@
|
|||||||
|
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
[This is the first released version of the library GPL. It is
|
||||||
|
numbered 2 because it goes with version 2 of the ordinary GPL.]
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
Licenses are intended to guarantee your freedom to share and change
|
||||||
|
free software--to make sure the software is free for all its users.
|
||||||
|
|
||||||
|
This license, the Library General Public License, applies to some
|
||||||
|
specially designated Free Software Foundation software, and to any
|
||||||
|
other libraries whose authors decide to use it. You can use it for
|
||||||
|
your libraries, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if
|
||||||
|
you distribute copies of the library, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of the library, whether gratis
|
||||||
|
or for a fee, you must give the recipients all the rights that we gave
|
||||||
|
you. You must make sure that they, too, receive or can get the source
|
||||||
|
code. If you link a program with the library, you must provide
|
||||||
|
complete object files to the recipients so that they can relink them
|
||||||
|
with the library, after making changes to the library and recompiling
|
||||||
|
it. And you must show them these terms so they know their rights.
|
||||||
|
|
||||||
|
Our method of protecting your rights has two steps: (1) copyright
|
||||||
|
the library, and (2) offer you this license which gives you legal
|
||||||
|
permission to copy, distribute and/or modify the library.
|
||||||
|
|
||||||
|
Also, for each distributor's protection, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
library. If the library is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original
|
||||||
|
version, so that any problems introduced by others will not reflect on
|
||||||
|
the original authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that companies distributing free
|
||||||
|
software will individually obtain patent licenses, thus in effect
|
||||||
|
transforming the program into proprietary software. To prevent this,
|
||||||
|
we have made it clear that any patent must be licensed for everyone's
|
||||||
|
free use or not licensed at all.
|
||||||
|
|
||||||
|
Most GNU software, including some libraries, is covered by the ordinary
|
||||||
|
GNU General Public License, which was designed for utility programs. This
|
||||||
|
license, the GNU Library General Public License, applies to certain
|
||||||
|
designated libraries. This license is quite different from the ordinary
|
||||||
|
one; be sure to read it in full, and don't assume that anything in it is
|
||||||
|
the same as in the ordinary license.
|
||||||
|
|
||||||
|
The reason we have a separate public license for some libraries is that
|
||||||
|
they blur the distinction we usually make between modifying or adding to a
|
||||||
|
program and simply using it. Linking a program with a library, without
|
||||||
|
changing the library, is in some sense simply using the library, and is
|
||||||
|
analogous to running a utility program or application program. However, in
|
||||||
|
a textual and legal sense, the linked executable is a combined work, a
|
||||||
|
derivative of the original library, and the ordinary General Public License
|
||||||
|
treats it as such.
|
||||||
|
|
||||||
|
Because of this blurred distinction, using the ordinary General
|
||||||
|
Public License for libraries did not effectively promote software
|
||||||
|
sharing, because most developers did not use the libraries. We
|
||||||
|
concluded that weaker conditions might promote sharing better.
|
||||||
|
|
||||||
|
However, unrestricted linking of non-free programs would deprive the
|
||||||
|
users of those programs of all benefit from the free status of the
|
||||||
|
libraries themselves. This Library General Public License is intended to
|
||||||
|
permit developers of non-free programs to use free libraries, while
|
||||||
|
preserving your freedom as a user of such programs to change the free
|
||||||
|
libraries that are incorporated in them. (We have not seen how to achieve
|
||||||
|
this as regards changes in header files, but we have achieved it as regards
|
||||||
|
changes in the actual functions of the Library.) The hope is that this
|
||||||
|
will lead to faster development of free libraries.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow. Pay close attention to the difference between a
|
||||||
|
"work based on the library" and a "work that uses the library". The
|
||||||
|
former contains code derived from the library, while the latter only
|
||||||
|
works together with the library.
|
||||||
|
|
||||||
|
Note that it is possible for a library to be covered by the ordinary
|
||||||
|
General Public License rather than by this special one.
|
||||||
|
|
||||||
|
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License Agreement applies to any software library which
|
||||||
|
contains a notice placed by the copyright holder or other authorized
|
||||||
|
party saying it may be distributed under the terms of this Library
|
||||||
|
General Public License (also called "this License"). Each licensee is
|
||||||
|
addressed as "you".
|
||||||
|
|
||||||
|
A "library" means a collection of software functions and/or data
|
||||||
|
prepared so as to be conveniently linked with application programs
|
||||||
|
(which use some of those functions and data) to form executables.
|
||||||
|
|
||||||
|
The "Library", below, refers to any such software library or work
|
||||||
|
which has been distributed under these terms. A "work based on the
|
||||||
|
Library" means either the Library or any derivative work under
|
||||||
|
copyright law: that is to say, a work containing the Library or a
|
||||||
|
portion of it, either verbatim or with modifications and/or translated
|
||||||
|
straightforwardly into another language. (Hereinafter, translation is
|
||||||
|
included without limitation in the term "modification".)
|
||||||
|
|
||||||
|
"Source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For a library, complete source code means
|
||||||
|
all the source code for all modules it contains, plus any associated
|
||||||
|
interface definition files, plus the scripts used to control compilation
|
||||||
|
and installation of the library.
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running a program using the Library is not restricted, and output from
|
||||||
|
such a program is covered only if its contents constitute a work based
|
||||||
|
on the Library (independent of the use of the Library in a tool for
|
||||||
|
writing it). Whether that is true depends on what the Library does
|
||||||
|
and what the program that uses the Library does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Library's
|
||||||
|
complete source code as you receive it, in any medium, provided that
|
||||||
|
you conspicuously and appropriately publish on each copy an
|
||||||
|
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||||
|
all the notices that refer to this License and to the absence of any
|
||||||
|
warranty; and distribute a copy of this License along with the
|
||||||
|
Library.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy,
|
||||||
|
and you may at your option offer warranty protection in exchange for a
|
||||||
|
fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Library or any portion
|
||||||
|
of it, thus forming a work based on the Library, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The modified work must itself be a software library.
|
||||||
|
|
||||||
|
b) You must cause the files modified to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
c) You must cause the whole of the work to be licensed at no
|
||||||
|
charge to all third parties under the terms of this License.
|
||||||
|
|
||||||
|
d) If a facility in the modified Library refers to a function or a
|
||||||
|
table of data to be supplied by an application program that uses
|
||||||
|
the facility, other than as an argument passed when the facility
|
||||||
|
is invoked, then you must make a good faith effort to ensure that,
|
||||||
|
in the event an application does not supply such function or
|
||||||
|
table, the facility still operates, and performs whatever part of
|
||||||
|
its purpose remains meaningful.
|
||||||
|
|
||||||
|
(For example, a function in a library to compute square roots has
|
||||||
|
a purpose that is entirely well-defined independent of the
|
||||||
|
application. Therefore, Subsection 2d requires that any
|
||||||
|
application-supplied function or table used by this function must
|
||||||
|
be optional: if the application does not supply it, the square
|
||||||
|
root function must still compute square roots.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Library,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Library, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote
|
||||||
|
it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Library.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Library
|
||||||
|
with the Library (or with a work based on the Library) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||||
|
License instead of this License to a given copy of the Library. To do
|
||||||
|
this, you must alter all the notices that refer to this License, so
|
||||||
|
that they refer to the ordinary GNU General Public License, version 2,
|
||||||
|
instead of to this License. (If a newer version than version 2 of the
|
||||||
|
ordinary GNU General Public License has appeared, then you can specify
|
||||||
|
that version instead if you wish.) Do not make any other change in
|
||||||
|
these notices.
|
||||||
|
|
||||||
|
Once this change is made in a given copy, it is irreversible for
|
||||||
|
that copy, so the ordinary GNU General Public License applies to all
|
||||||
|
subsequent copies and derivative works made from that copy.
|
||||||
|
|
||||||
|
This option is useful when you wish to copy part of the code of
|
||||||
|
the Library into a program that is not a library.
|
||||||
|
|
||||||
|
4. You may copy and distribute the Library (or a portion or
|
||||||
|
derivative of it, under Section 2) in object code or executable form
|
||||||
|
under the terms of Sections 1 and 2 above provided that you accompany
|
||||||
|
it with the complete corresponding machine-readable source code, which
|
||||||
|
must be distributed under the terms of Sections 1 and 2 above on a
|
||||||
|
medium customarily used for software interchange.
|
||||||
|
|
||||||
|
If distribution of object code is made by offering access to copy
|
||||||
|
from a designated place, then offering equivalent access to copy the
|
||||||
|
source code from the same place satisfies the requirement to
|
||||||
|
distribute the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
5. A program that contains no derivative of any portion of the
|
||||||
|
Library, but is designed to work with the Library by being compiled or
|
||||||
|
linked with it, is called a "work that uses the Library". Such a
|
||||||
|
work, in isolation, is not a derivative work of the Library, and
|
||||||
|
therefore falls outside the scope of this License.
|
||||||
|
|
||||||
|
However, linking a "work that uses the Library" with the Library
|
||||||
|
creates an executable that is a derivative of the Library (because it
|
||||||
|
contains portions of the Library), rather than a "work that uses the
|
||||||
|
library". The executable is therefore covered by this License.
|
||||||
|
Section 6 states terms for distribution of such executables.
|
||||||
|
|
||||||
|
When a "work that uses the Library" uses material from a header file
|
||||||
|
that is part of the Library, the object code for the work may be a
|
||||||
|
derivative work of the Library even though the source code is not.
|
||||||
|
Whether this is true is especially significant if the work can be
|
||||||
|
linked without the Library, or if the work is itself a library. The
|
||||||
|
threshold for this to be true is not precisely defined by law.
|
||||||
|
|
||||||
|
If such an object file uses only numerical parameters, data
|
||||||
|
structure layouts and accessors, and small macros and small inline
|
||||||
|
functions (ten lines or less in length), then the use of the object
|
||||||
|
file is unrestricted, regardless of whether it is legally a derivative
|
||||||
|
work. (Executables containing this object code plus portions of the
|
||||||
|
Library will still fall under Section 6.)
|
||||||
|
|
||||||
|
Otherwise, if the work is a derivative of the Library, you may
|
||||||
|
distribute the object code for the work under the terms of Section 6.
|
||||||
|
Any executables containing that work also fall under Section 6,
|
||||||
|
whether or not they are linked directly with the Library itself.
|
||||||
|
|
||||||
|
6. As an exception to the Sections above, you may also compile or
|
||||||
|
link a "work that uses the Library" with the Library to produce a
|
||||||
|
work containing portions of the Library, and distribute that work
|
||||||
|
under terms of your choice, provided that the terms permit
|
||||||
|
modification of the work for the customer's own use and reverse
|
||||||
|
engineering for debugging such modifications.
|
||||||
|
|
||||||
|
You must give prominent notice with each copy of the work that the
|
||||||
|
Library is used in it and that the Library and its use are covered by
|
||||||
|
this License. You must supply a copy of this License. If the work
|
||||||
|
during execution displays copyright notices, you must include the
|
||||||
|
copyright notice for the Library among them, as well as a reference
|
||||||
|
directing the user to the copy of this License. Also, you must do one
|
||||||
|
of these things:
|
||||||
|
|
||||||
|
a) Accompany the work with the complete corresponding
|
||||||
|
machine-readable source code for the Library including whatever
|
||||||
|
changes were used in the work (which must be distributed under
|
||||||
|
Sections 1 and 2 above); and, if the work is an executable linked
|
||||||
|
with the Library, with the complete machine-readable "work that
|
||||||
|
uses the Library", as object code and/or source code, so that the
|
||||||
|
user can modify the Library and then relink to produce a modified
|
||||||
|
executable containing the modified Library. (It is understood
|
||||||
|
that the user who changes the contents of definitions files in the
|
||||||
|
Library will not necessarily be able to recompile the application
|
||||||
|
to use the modified definitions.)
|
||||||
|
|
||||||
|
b) Accompany the work with a written offer, valid for at
|
||||||
|
least three years, to give the same user the materials
|
||||||
|
specified in Subsection 6a, above, for a charge no more
|
||||||
|
than the cost of performing this distribution.
|
||||||
|
|
||||||
|
c) If distribution of the work is made by offering access to copy
|
||||||
|
from a designated place, offer equivalent access to copy the above
|
||||||
|
specified materials from the same place.
|
||||||
|
|
||||||
|
d) Verify that the user has already received a copy of these
|
||||||
|
materials or that you have already sent this user a copy.
|
||||||
|
|
||||||
|
For an executable, the required form of the "work that uses the
|
||||||
|
Library" must include any data and utility programs needed for
|
||||||
|
reproducing the executable from it. However, as a special exception,
|
||||||
|
the source code distributed need not include anything that is normally
|
||||||
|
distributed (in either source or binary form) with the major
|
||||||
|
components (compiler, kernel, and so on) of the operating system on
|
||||||
|
which the executable runs, unless that component itself accompanies
|
||||||
|
the executable.
|
||||||
|
|
||||||
|
It may happen that this requirement contradicts the license
|
||||||
|
restrictions of other proprietary libraries that do not normally
|
||||||
|
accompany the operating system. Such a contradiction means you cannot
|
||||||
|
use both them and the Library together in an executable that you
|
||||||
|
distribute.
|
||||||
|
|
||||||
|
7. You may place library facilities that are a work based on the
|
||||||
|
Library side-by-side in a single library together with other library
|
||||||
|
facilities not covered by this License, and distribute such a combined
|
||||||
|
library, provided that the separate distribution of the work based on
|
||||||
|
the Library and of the other library facilities is otherwise
|
||||||
|
permitted, and provided that you do these two things:
|
||||||
|
|
||||||
|
a) Accompany the combined library with a copy of the same work
|
||||||
|
based on the Library, uncombined with any other library
|
||||||
|
facilities. This must be distributed under the terms of the
|
||||||
|
Sections above.
|
||||||
|
|
||||||
|
b) Give prominent notice with the combined library of the fact
|
||||||
|
that part of it is a work based on the Library, and explaining
|
||||||
|
where to find the accompanying uncombined form of the same work.
|
||||||
|
|
||||||
|
8. You may not copy, modify, sublicense, link with, or distribute
|
||||||
|
the Library except as expressly provided under this License. Any
|
||||||
|
attempt otherwise to copy, modify, sublicense, link with, or
|
||||||
|
distribute the Library is void, and will automatically terminate your
|
||||||
|
rights under this License. However, parties who have received copies,
|
||||||
|
or rights, from you under this License will not have their licenses
|
||||||
|
terminated so long as such parties remain in full compliance.
|
||||||
|
|
||||||
|
9. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Library or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Library (or any work based on the
|
||||||
|
Library), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Library or works based on it.
|
||||||
|
|
||||||
|
10. Each time you redistribute the Library (or any work based on the
|
||||||
|
Library), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute, link with or modify the Library
|
||||||
|
subject to these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
11. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Library at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Library by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Library.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under any
|
||||||
|
particular circumstance, the balance of the section is intended to apply,
|
||||||
|
and the section as a whole is intended to apply in other circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
12. If the distribution and/or use of the Library is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Library under this License may add
|
||||||
|
an explicit geographical distribution limitation excluding those countries,
|
||||||
|
so that distribution is permitted only in or among countries not thus
|
||||||
|
excluded. In such case, this License incorporates the limitation as if
|
||||||
|
written in the body of this License.
|
||||||
|
|
||||||
|
13. The Free Software Foundation may publish revised and/or new
|
||||||
|
versions of the Library General Public License from time to time.
|
||||||
|
Such new versions will be similar in spirit to the present version,
|
||||||
|
but may differ in detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Library
|
||||||
|
specifies a version number of this License which applies to it and
|
||||||
|
"any later version", you have the option of following the terms and
|
||||||
|
conditions either of that version or of any later version published by
|
||||||
|
the Free Software Foundation. If the Library does not specify a
|
||||||
|
license version number, you may choose any version ever published by
|
||||||
|
the Free Software Foundation.
|
||||||
|
|
||||||
|
14. If you wish to incorporate parts of the Library into other free
|
||||||
|
programs whose distribution conditions are incompatible with these,
|
||||||
|
write to the author to ask for permission. For software which is
|
||||||
|
copyrighted by the Free Software Foundation, write to the Free
|
||||||
|
Software Foundation; we sometimes make exceptions for this. Our
|
||||||
|
decision will be guided by the two goals of preserving the free status
|
||||||
|
of all derivatives of our free software and of promoting the sharing
|
||||||
|
and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||||
|
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||||
|
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||||
|
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||||
|
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||||
|
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||||
|
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||||
|
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||||
|
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||||
|
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||||
|
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||||
|
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||||
|
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||||
|
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||||
|
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||||
|
DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
16
assets/model/creature/collision.json
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"boxes": [
|
||||||
|
{
|
||||||
|
"center": [
|
||||||
|
0,
|
||||||
|
0.78,
|
||||||
|
0
|
||||||
|
],
|
||||||
|
"half": [
|
||||||
|
0.53,
|
||||||
|
0.78,
|
||||||
|
0.406
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
BIN
assets/model/creature/pig.glb
Normal file
@@ -7,7 +7,6 @@ uniform mat4 lightSpaceMatrix;
|
|||||||
uniform mat4 modelMatrix;
|
uniform mat4 modelMatrix;
|
||||||
|
|
||||||
out vec2 tc;
|
out vec2 tc;
|
||||||
flat out int tex_layer;
|
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
tc = texCoord;
|
tc = texCoord;
|
||||||
@@ -3,7 +3,6 @@
|
|||||||
layout (location = 0) in vec3 pos;
|
layout (location = 0) in vec3 pos;
|
||||||
layout (location = 1) in vec2 texCoord;
|
layout (location = 1) in vec2 texCoord;
|
||||||
layout (location = 2) in vec3 aNormal;
|
layout (location = 2) in vec3 aNormal;
|
||||||
layout (location = 3) in vec3 aTangent;
|
|
||||||
|
|
||||||
uniform mat4 mv_matrix;
|
uniform mat4 mv_matrix;
|
||||||
uniform mat4 proj_matrix;
|
uniform mat4 proj_matrix;
|
||||||
|
Before Width: | Height: | Size: 99 B After Width: | Height: | Size: 355 B |
|
Before Width: | Height: | Size: 882 B After Width: | Height: | Size: 231 KiB |
|
Before Width: | Height: | Size: 277 B After Width: | Height: | Size: 893 B |
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 249 KiB |
|
Before Width: | Height: | Size: 874 B After Width: | Height: | Size: 223 KiB |
|
Before Width: | Height: | Size: 877 B After Width: | Height: | Size: 201 KiB |
|
Before Width: | Height: | Size: 914 B After Width: | Height: | Size: 215 KiB |
|
Before Width: | Height: | Size: 915 B After Width: | Height: | Size: 215 KiB |
|
Before Width: | Height: | Size: 874 B After Width: | Height: | Size: 215 KiB |
BIN
assets/texture/ui/microphone.png
Normal file
|
After Width: | Height: | Size: 137 B |
BIN
assets/texture/ui/slot.png
Normal file
|
After Width: | Height: | Size: 122 B |
@@ -6,60 +6,15 @@ find_package(Protobuf REQUIRED)
|
|||||||
find_package(absl REQUIRED)
|
find_package(absl REQUIRED)
|
||||||
find_package(zstd REQUIRED)
|
find_package(zstd REQUIRED)
|
||||||
find_package(OpenAL REQUIRED)
|
find_package(OpenAL REQUIRED)
|
||||||
if (UNIX AND NOT APPLE)
|
find_package(harfbuzz REQUIRED)
|
||||||
find_package(Freetype REQUIRED)
|
find_package(Freetype REQUIRED)
|
||||||
find_package(glfw3 REQUIRED)
|
find_package(SDL3 REQUIRED)
|
||||||
endif()
|
find_package(Opus REQUIRED)
|
||||||
|
find_package(assimp REQUIRED)
|
||||||
|
|
||||||
# Third-party libraries
|
# Third-party libraries
|
||||||
FetchContent_Declare(
|
|
||||||
glm
|
|
||||||
GIT_REPOSITORY https://github.com/g-truc/glm.git
|
|
||||||
GIT_TAG 1.0.3
|
|
||||||
|
|
||||||
)
|
|
||||||
FetchContent_MakeAvailable(glm)
|
|
||||||
FetchContent_Declare(
|
|
||||||
soil2
|
|
||||||
GIT_REPOSITORY https://github.com/SpartanJ/SOIL2.git
|
|
||||||
GIT_TAG 1.31
|
|
||||||
|
|
||||||
)
|
|
||||||
FetchContent_MakeAvailable(soil2)
|
|
||||||
FetchContent_Declare(
|
|
||||||
tomlplusplus
|
|
||||||
GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
|
|
||||||
GIT_TAG v3.4.0
|
|
||||||
)
|
|
||||||
FetchContent_MakeAvailable(tomlplusplus)
|
|
||||||
|
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
FetchContent_Declare(
|
|
||||||
glfw
|
|
||||||
GIT_REPOSITORY https://github.com/glfw/glfw.git
|
|
||||||
GIT_TAG 3.4
|
|
||||||
)
|
|
||||||
|
|
||||||
set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
|
|
||||||
set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
|
||||||
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
|
||||||
set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
|
|
||||||
set(GLFW_VULKAN_STATIC ON CACHE BOOL "" FORCE)
|
|
||||||
set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
|
|
||||||
|
|
||||||
FetchContent_MakeAvailable(glfw)
|
|
||||||
|
|
||||||
FetchContent_Declare(
|
|
||||||
freetype
|
|
||||||
GIT_REPOSITORY https://gitlab.freedesktop.org/freetype/freetype.git
|
|
||||||
GIT_TAG VER-2-14-3
|
|
||||||
)
|
|
||||||
FetchContent_MakeAvailable(freetype)
|
|
||||||
if(TARGET freetype)
|
|
||||||
add_library(Freetype::Freetype ALIAS freetype)
|
|
||||||
endif()
|
|
||||||
set(_BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
|
set(_BUILD_SHARED_LIBS_SAVED ${BUILD_SHARED_LIBS})
|
||||||
set(BUILD_SHARED_LIBS ON)
|
set(BUILD_SHARED_LIBS ON)
|
||||||
|
|
||||||
|
|||||||
25
cmake/modules/FindOpus.cmake
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
include(FindPackageHandleStandardArgs)
|
||||||
|
|
||||||
|
find_path(OPUS_INCLUDE_DIR
|
||||||
|
NAMES opus/opus.h opus.h
|
||||||
|
)
|
||||||
|
|
||||||
|
find_library(OPUS_LIBRARY
|
||||||
|
NAMES opus
|
||||||
|
)
|
||||||
|
|
||||||
|
find_package_handle_standard_args(
|
||||||
|
Opus
|
||||||
|
REQUIRED_VARS
|
||||||
|
OPUS_INCLUDE_DIR
|
||||||
|
OPUS_LIBRARY
|
||||||
|
)
|
||||||
|
|
||||||
|
if(Opus_FOUND)
|
||||||
|
add_library(Opus::Opus UNKNOWN IMPORTED)
|
||||||
|
|
||||||
|
set_target_properties(Opus::Opus PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${OPUS_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${OPUS_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
@@ -4,16 +4,20 @@
|
|||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
|
||||||
struct AABB {
|
struct AABB {
|
||||||
glm::vec3 min{0.0f, 0.0f, 0.0f};
|
glm::vec3 center{0.0f};
|
||||||
glm::vec3 max{0.0f, 0.0f, 0.0f};
|
glm::vec3 half{0.0f};
|
||||||
|
|
||||||
AABB(glm::vec3 min_point, glm::vec3 max_point)
|
AABB(glm::vec3 center_point, glm::vec3 half_size)
|
||||||
: min(min_point), max(max_point) {}
|
: center(center_point), half(half_size) {}
|
||||||
|
|
||||||
|
glm::vec3 min() const { return center - half; }
|
||||||
|
|
||||||
|
glm::vec3 max() const { return center + half; }
|
||||||
|
|
||||||
bool intersects(const AABB& other) const {
|
bool intersects(const AABB& other) const {
|
||||||
return (min.x <= other.max.x && max.x >= other.min.x) &&
|
return (glm::abs(center.x - other.center.x) <= half.x + other.half.x) &&
|
||||||
(min.y <= other.max.y && max.y >= other.min.y) &&
|
(glm::abs(center.y - other.center.y) <= half.y + other.half.y) &&
|
||||||
(min.z <= other.max.z && max.z >= other.min.z);
|
(glm::abs(center.z - other.center.z) <= half.z + other.half.z);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "Cubed/audio/audio_engine.hpp"
|
|
||||||
#define GLFW_INCLUDE_NONE
|
|
||||||
#include "Cubed/argument.hpp"
|
#include "Cubed/argument.hpp"
|
||||||
|
#include "Cubed/audio/audio_engine.hpp"
|
||||||
#include "Cubed/config.hpp"
|
#include "Cubed/config.hpp"
|
||||||
#include "Cubed/dev_panel.hpp"
|
#include "Cubed/dev_panel.hpp"
|
||||||
|
#include "Cubed/render/model_manager.hpp"
|
||||||
#include "Cubed/render/renderer.hpp"
|
#include "Cubed/render/renderer.hpp"
|
||||||
#include "Cubed/scene/scene_manager.hpp"
|
#include "Cubed/scene/scene_manager.hpp"
|
||||||
#include "Cubed/texture_manager.hpp"
|
#include "Cubed/texture_manager.hpp"
|
||||||
@@ -14,21 +14,15 @@ class App {
|
|||||||
public:
|
public:
|
||||||
App();
|
App();
|
||||||
~App();
|
~App();
|
||||||
static void cursor_position_callback(GLFWwindow* window, double xpos,
|
void handle_mouse_move(float xpos, float ypos, float xrel, float yrel);
|
||||||
double ypos);
|
void handle_sdl_key(SDL_Event& e);
|
||||||
static void key_callback(GLFWwindow* window, int key, int scancode,
|
void handle_sdl_mouse_button(SDL_Event& e);
|
||||||
int action, int mods);
|
void handle_window_focus(bool focused);
|
||||||
static void mouse_button_callback(GLFWwindow* window, int button,
|
void handle_window_resize(int new_width, int new_height);
|
||||||
int action, int mods);
|
void handle_framebuffer_resize(int new_width, int new_height);
|
||||||
static void window_focus_callback(GLFWwindow* window, int focused);
|
void handle_mouse_scroll(float xoffset, float yoffset);
|
||||||
static void window_reshape_callback(GLFWwindow* window, int new_width,
|
void handle_text_input(const char* text);
|
||||||
int new_height);
|
|
||||||
static void framebuffer_size_callback(GLFWwindow* window, int new_width,
|
|
||||||
int new_height);
|
|
||||||
static void mouse_scroll_callback(GLFWwindow* window, double xoffset,
|
|
||||||
double yoffset);
|
|
||||||
static void cursor_enter_callback(GLFWwindow* window, int entered);
|
|
||||||
static void char_callback(GLFWwindow* window, unsigned int ch);
|
|
||||||
static int start_cubed_application(int argc, char** argv);
|
static int start_cubed_application(int argc, char** argv);
|
||||||
|
|
||||||
static unsigned int seed();
|
static unsigned int seed();
|
||||||
@@ -43,32 +37,37 @@ public:
|
|||||||
const Argument& argument() const;
|
const Argument& argument() const;
|
||||||
AudioEngine& audio();
|
AudioEngine& audio();
|
||||||
|
|
||||||
const char* get_clipboard_text();
|
std::string get_clipboard_text();
|
||||||
|
|
||||||
|
void start_text_input();
|
||||||
|
void stop_text_input();
|
||||||
|
void update_text_input_area(const glm::vec4& textbox,
|
||||||
|
float cursor_position_x);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Config m_game_config;
|
Config m_game_config;
|
||||||
|
|
||||||
TextureManager m_texture_manager;
|
Window m_window;
|
||||||
|
|
||||||
|
TextureManager m_texture_manager;
|
||||||
|
ModelManager m_model_manager;
|
||||||
AudioEngine m_audio;
|
AudioEngine m_audio;
|
||||||
|
|
||||||
Renderer m_renderer;
|
Renderer m_renderer;
|
||||||
|
|
||||||
Window m_window;
|
|
||||||
|
|
||||||
SceneManager m_scene_manager;
|
SceneManager m_scene_manager;
|
||||||
|
|
||||||
inline static double last_time = glfwGetTime();
|
inline static uint64_t last_tick = 0;
|
||||||
inline static double current_time = glfwGetTime();
|
inline static uint64_t current_tick = 0;
|
||||||
inline static double dt = 0.0f;
|
inline static float dt = 0.0f;
|
||||||
inline static double fps_time_count = 0.0f;
|
inline static float fps_time_count = 0.0f;
|
||||||
inline static int frame_count = 0;
|
inline static int frame_count = 0;
|
||||||
inline static int fps = 0;
|
inline static int fps = 0;
|
||||||
Argument m_argument;
|
Argument m_argument;
|
||||||
|
bool m_running = true;
|
||||||
|
bool m_opengl_init = false;
|
||||||
void init(int argc, char** argv);
|
void init(int argc, char** argv);
|
||||||
void handle_argument(int argc, char** argv);
|
void handle_argument(int argc, char** argv);
|
||||||
void handle_toml();
|
|
||||||
auto init_camera();
|
auto init_camera();
|
||||||
auto init_texture();
|
auto init_texture();
|
||||||
auto init_world();
|
auto init_world();
|
||||||
@@ -77,6 +76,8 @@ private:
|
|||||||
void run();
|
void run();
|
||||||
void update();
|
void update();
|
||||||
|
|
||||||
|
void handle_sdl_event(SDL_Event& e);
|
||||||
|
|
||||||
void dispatch_event(const Event& e);
|
void dispatch_event(const Event& e);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <optional>
|
||||||
#include <string>
|
#include <string>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
struct Argument {
|
struct Argument {
|
||||||
bool is_client = false;
|
std::optional<int> port;
|
||||||
int port = 25530;
|
std::optional<std::string> ip;
|
||||||
std::string ip{"127.0.0.1"};
|
std::optional<std::string> player;
|
||||||
std::string player{"Unknown"};
|
std::optional<std::string> language;
|
||||||
bool debug_on = true;
|
std::optional<std::string> video_driver;
|
||||||
|
std::optional<bool> enable_exclusive;
|
||||||
|
std::optional<std::string> logs_path;
|
||||||
|
std::optional<int> log_level;
|
||||||
|
std::optional<bool> enable_filelog;
|
||||||
|
std::optional<bool> enable_consolelog;
|
||||||
};
|
};
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Cubed/audio/audio_fade.hpp"
|
#include "Cubed/audio/audio_fade.hpp"
|
||||||
|
#include "Cubed/audio/audio_recording.hpp"
|
||||||
#include "Cubed/audio/audio_source.hpp"
|
#include "Cubed/audio/audio_source.hpp"
|
||||||
|
#include "Cubed/audio/audio_stream_source.hpp"
|
||||||
#include "Cubed/audio/sound_manager.hpp"
|
#include "Cubed/audio/sound_manager.hpp"
|
||||||
#include "Cubed/audio/source_pool.hpp"
|
#include "Cubed/audio/source_pool.hpp"
|
||||||
#include "Cubed/config.hpp"
|
#include "Cubed/config.hpp"
|
||||||
@@ -10,13 +12,15 @@
|
|||||||
#include <AL/alc.h>
|
#include <AL/alc.h>
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <opus/opus.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
|
||||||
class ClientWorld;
|
class NetworkClient;
|
||||||
|
|
||||||
class AudioEngine {
|
class AudioEngine {
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AudioEngine(Config& config);
|
AudioEngine(Config& config);
|
||||||
AudioEngine(const AudioEngine&) = delete;
|
AudioEngine(const AudioEngine&) = delete;
|
||||||
@@ -41,11 +45,23 @@ public:
|
|||||||
|
|
||||||
float& bgm_target_volume();
|
float& bgm_target_volume();
|
||||||
|
|
||||||
|
void set_client(std::weak_ptr<NetworkClient> client);
|
||||||
|
|
||||||
|
void send_voice(const std::array<int16_t, AudioRecording::FRAME_SAMPLES>&);
|
||||||
|
void receive_voice(std::span<const char> opus, const glm::vec3& pos);
|
||||||
|
|
||||||
|
AudioRecording& audio_recording();
|
||||||
|
const AudioRecording& audio_recording() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
using FadeMap = std::unordered_map<std::string, AudioFade>;
|
using FadeMap = std::unordered_map<std::string, AudioFade>;
|
||||||
bool m_init{false};
|
bool m_init{false};
|
||||||
ALCdevice* device{nullptr};
|
ALCdevice* device{nullptr};
|
||||||
ALCcontext* context{nullptr};
|
ALCcontext* context{nullptr};
|
||||||
|
OpusEncoder* m_encoder{nullptr};
|
||||||
|
OpusDecoder* m_decoder{nullptr};
|
||||||
|
AudioRecording m_recording;
|
||||||
|
std::weak_ptr<NetworkClient> m_client;
|
||||||
glm::vec3 listener_pos;
|
glm::vec3 listener_pos;
|
||||||
std::unique_ptr<AudioSource> m_bgm;
|
std::unique_ptr<AudioSource> m_bgm;
|
||||||
FadeMap m_fade_map;
|
FadeMap m_fade_map;
|
||||||
@@ -56,6 +72,9 @@ private:
|
|||||||
bool m_underwater = false;
|
bool m_underwater = false;
|
||||||
float m_music_volume = 1.0f;
|
float m_music_volume = 1.0f;
|
||||||
float m_sfx_volume = 1.0f;
|
float m_sfx_volume = 1.0f;
|
||||||
|
float m_player_voice_volume = 1.0f;
|
||||||
|
|
||||||
|
std::unique_ptr<AudioStreamSource> m_voice_source;
|
||||||
std::unique_ptr<AudioFilter> m_low_pass_filter;
|
std::unique_ptr<AudioFilter> m_low_pass_filter;
|
||||||
std::unique_ptr<AudioEffect> m_underwater_effect;
|
std::unique_ptr<AudioEffect> m_underwater_effect;
|
||||||
std::unique_ptr<AudioEffectSlot> m_underwater_slot;
|
std::unique_ptr<AudioEffectSlot> m_underwater_slot;
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#include "Cubed/tools/log.hpp"
|
#include "Cubed/tools/log.hpp"
|
||||||
|
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
|
#include <source_location>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
inline void check_al_error(
|
inline void check_al_error(
|
||||||
std::source_location loaction = std::source_location::current()) {
|
std::source_location loaction = std::source_location::current()) {
|
||||||
|
|||||||
33
include/Cubed/audio/audio_recording.hpp
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <alc.h>
|
||||||
|
#include <array>
|
||||||
|
#include <cstdint>
|
||||||
|
namespace Cubed {
|
||||||
|
class AudioEngine;
|
||||||
|
class AudioRecording {
|
||||||
|
public:
|
||||||
|
static constexpr int SAMPLE_RATE = 48000;
|
||||||
|
static constexpr int FRAME_MS = 20;
|
||||||
|
static constexpr int FRAME_SAMPLES = SAMPLE_RATE * FRAME_MS / 1000;
|
||||||
|
AudioRecording(AudioEngine& engine);
|
||||||
|
AudioRecording(const AudioRecording&) = delete;
|
||||||
|
AudioRecording(AudioRecording&&) = delete;
|
||||||
|
AudioRecording& operator=(const AudioRecording&) = delete;
|
||||||
|
AudioRecording& operator=(AudioRecording&&) = delete;
|
||||||
|
~AudioRecording();
|
||||||
|
|
||||||
|
void update();
|
||||||
|
|
||||||
|
void init();
|
||||||
|
void start();
|
||||||
|
void stop();
|
||||||
|
bool is_recording() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
AudioEngine& m_engine;
|
||||||
|
ALCdevice* m_capture = nullptr;
|
||||||
|
bool m_recording = false;
|
||||||
|
void send_voice(const std::array<int16_t, FRAME_SAMPLES>& pcm);
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#include <AL/al.h>
|
#include <AL/al.h>
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
#include <memory>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
|
||||||
enum class AudioState { INITIAL, PLAYING, PAUSED, STOPPED };
|
enum class AudioState { INITIAL, PLAYING, PAUSED, STOPPED };
|
||||||
@@ -21,8 +22,9 @@ public:
|
|||||||
void set_pitch(float pitch);
|
void set_pitch(float pitch);
|
||||||
void play();
|
void play();
|
||||||
void play_2d(const AudioBuffer& buffer);
|
void play_2d(const AudioBuffer& buffer);
|
||||||
|
void play_2d(std::unique_ptr<AudioBuffer> buffer);
|
||||||
void play_3d(const AudioBuffer& buffer, const glm::vec3& pos);
|
void play_3d(const AudioBuffer& buffer, const glm::vec3& pos);
|
||||||
|
void play_3d(std::unique_ptr<AudioBuffer> buffer, const glm::vec3& pos);
|
||||||
void stop();
|
void stop();
|
||||||
void pause();
|
void pause();
|
||||||
float duration() const;
|
float duration() const;
|
||||||
@@ -42,6 +44,8 @@ public:
|
|||||||
void clear_effect_slot();
|
void clear_effect_slot();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
std::unique_ptr<AudioBuffer> m_buffer;
|
||||||
|
|
||||||
ALuint m_source = 0;
|
ALuint m_source = 0;
|
||||||
float m_target_volume = 1.0f;
|
float m_target_volume = 1.0f;
|
||||||
float m_duration = 0.0f;
|
float m_duration = 0.0f;
|
||||||
|
|||||||
46
include/Cubed/audio/audio_stream_source.hpp
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Cubed/audio/audio_effect_slot.hpp"
|
||||||
|
#include "Cubed/audio/audio_filter.hpp"
|
||||||
|
#include "glm/ext/vector_float3.hpp"
|
||||||
|
|
||||||
|
#include <al.h>
|
||||||
|
#include <array>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <span>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace Cubed {
|
||||||
|
class AudioStreamSource {
|
||||||
|
public:
|
||||||
|
static constexpr int NUM_BUFFERS = 4;
|
||||||
|
AudioStreamSource();
|
||||||
|
AudioStreamSource(const AudioStreamSource&) = delete;
|
||||||
|
AudioStreamSource(AudioStreamSource&&) = delete;
|
||||||
|
AudioStreamSource& operator=(const AudioStreamSource&) = delete;
|
||||||
|
AudioStreamSource& operator=(AudioStreamSource&&) = delete;
|
||||||
|
~AudioStreamSource();
|
||||||
|
|
||||||
|
void push_pcm(std::span<const int16_t> pcm, ALsizei sample_rate);
|
||||||
|
|
||||||
|
void stop();
|
||||||
|
bool is_playing() const;
|
||||||
|
void reset();
|
||||||
|
|
||||||
|
void set_volume(float volume);
|
||||||
|
void set_pitch(float pitch);
|
||||||
|
void set_pos(glm::vec3 pos);
|
||||||
|
void set_filter(const AudioFilter& filter);
|
||||||
|
void clear_filter();
|
||||||
|
void set_effect_slot(const AudioEffectSlot& slot);
|
||||||
|
void clear_effect_slot();
|
||||||
|
|
||||||
|
private:
|
||||||
|
ALuint m_source = 0;
|
||||||
|
std::array<ALuint, NUM_BUFFERS> m_buffers{};
|
||||||
|
std::vector<ALuint> m_free_buffers;
|
||||||
|
bool m_playing = false;
|
||||||
|
|
||||||
|
void unqueue_processed();
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
class SourcePool {
|
class SourcePool {
|
||||||
private:
|
private:
|
||||||
std::vector<AudioSource> m_sources;
|
std::vector<std::unique_ptr<AudioSource>> m_sources;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit SourcePool(size_t size);
|
explicit SourcePool(size_t size);
|
||||||
@@ -15,9 +15,10 @@ public:
|
|||||||
SourcePool& operator=(SourcePool&&) = delete;
|
SourcePool& operator=(SourcePool&&) = delete;
|
||||||
|
|
||||||
void update();
|
void update();
|
||||||
|
[[nodiscard]]
|
||||||
AudioSource* acquire();
|
AudioSource* acquire();
|
||||||
|
|
||||||
std::vector<AudioSource>& sources();
|
std::vector<std::unique_ptr<AudioSource>>& sources();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Cubed/input/event.hpp"
|
#include "Cubed/input/event.hpp"
|
||||||
#define GLFW_INCLUDE_NONE
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
#include <glm/gtc/matrix_transform.hpp>
|
#include <glm/gtc/matrix_transform.hpp>
|
||||||
#include <glm/gtc/type_ptr.hpp>
|
#include <glm/gtc/type_ptr.hpp>
|
||||||
@@ -19,7 +18,6 @@ private:
|
|||||||
THIRD_PERSON_FRONT,
|
THIRD_PERSON_FRONT,
|
||||||
};
|
};
|
||||||
|
|
||||||
bool m_firse_mouse = true;
|
|
||||||
ClientPlayer* m_player;
|
ClientPlayer* m_player;
|
||||||
float m_last_mouse_x, m_last_mouse_y;
|
float m_last_mouse_x, m_last_mouse_y;
|
||||||
glm::vec3 m_camera_pos;
|
glm::vec3 m_camera_pos;
|
||||||
@@ -39,8 +37,7 @@ public:
|
|||||||
|
|
||||||
void camera_init(ClientPlayer* player);
|
void camera_init(ClientPlayer* player);
|
||||||
void hot_reload();
|
void hot_reload();
|
||||||
void reset_camera();
|
void update_cursor_position_camera(float offset_x, float offset_y);
|
||||||
void update_cursor_position_camera(double xpos, double ypos);
|
|
||||||
|
|
||||||
const glm::mat4 get_camera_lookat() const;
|
const glm::mat4 get_camera_lookat() const;
|
||||||
const glm::vec3& get_camera_pos() const;
|
const glm::vec3& get_camera_pos() const;
|
||||||
@@ -50,6 +47,7 @@ public:
|
|||||||
void change_perspective();
|
void change_perspective();
|
||||||
bool is_first_person() const;
|
bool is_first_person() const;
|
||||||
bool handle_event(const Event& e);
|
bool handle_event(const Event& e);
|
||||||
|
ClientPlayer* player();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ public:
|
|||||||
|
|
||||||
template <TOML::TomlValueType T>
|
template <TOML::TomlValueType T>
|
||||||
T get(std::string_view key, T default_value) {
|
T get(std::string_view key, T default_value) {
|
||||||
|
if (!m_init) {
|
||||||
|
load_config();
|
||||||
|
}
|
||||||
if (auto* node = find_node(m_tbl, key)) {
|
if (auto* node = find_node(m_tbl, key)) {
|
||||||
if (auto value = node->value<T>())
|
if (auto value = node->value<T>())
|
||||||
return *value;
|
return *value;
|
||||||
@@ -30,6 +33,9 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <TOML::TomlValueType T> void set(std::string_view key, T&& value) {
|
template <TOML::TomlValueType T> void set(std::string_view key, T&& value) {
|
||||||
|
if (!m_init) {
|
||||||
|
load_config();
|
||||||
|
}
|
||||||
auto pos = key.rfind('.');
|
auto pos = key.rfind('.');
|
||||||
|
|
||||||
toml::table* table;
|
toml::table* table;
|
||||||
@@ -51,8 +57,17 @@ public:
|
|||||||
save_to_file();
|
save_to_file();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string get(std::string_view key, const char* default_value) {
|
||||||
|
return get(key, std::string(default_value));
|
||||||
|
}
|
||||||
|
|
||||||
|
void set(std::string_view key, const char* val) {
|
||||||
|
set(key, std::string(val));
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
toml::table m_tbl;
|
toml::table m_tbl;
|
||||||
|
bool m_init = false;
|
||||||
const std::string CONGIF_PATH;
|
const std::string CONGIF_PATH;
|
||||||
const toml::node* find_node(const toml::table& root,
|
const toml::node* find_node(const toml::table& root,
|
||||||
std::string_view path) const;
|
std::string_view path) const;
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
#include "Cubed/ui/label.hpp"
|
#include "Cubed/ui/label.hpp"
|
||||||
#include "Cubed/ui/widget.hpp"
|
#include "Cubed/ui/widget.hpp"
|
||||||
|
|
||||||
|
#include <format>
|
||||||
|
#include <memory>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
@@ -11,6 +13,7 @@ namespace Cubed {
|
|||||||
class DebugCollector {
|
class DebugCollector {
|
||||||
public:
|
public:
|
||||||
static DebugCollector& get();
|
static DebugCollector& get();
|
||||||
|
static void destory();
|
||||||
DebugCollector();
|
DebugCollector();
|
||||||
|
|
||||||
void report(const std::string& name, std::string_view content);
|
void report(const std::string& name, std::string_view content);
|
||||||
@@ -21,6 +24,14 @@ public:
|
|||||||
private:
|
private:
|
||||||
ColumnLayout m_widget;
|
ColumnLayout m_widget;
|
||||||
std::unordered_map<std::string, Label*> m_component;
|
std::unordered_map<std::string, Label*> m_component;
|
||||||
|
static std::unique_ptr<DebugCollector>& get_ptr();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template <typename... Args>
|
||||||
|
void d_rep(const std::string& key, std::format_string<Args...> fmt,
|
||||||
|
Args&&... args) {
|
||||||
|
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
|
||||||
|
DebugCollector::get().report(key, msg);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
@@ -63,7 +63,7 @@ private:
|
|||||||
void show_server_world_table_bar();
|
void show_server_world_table_bar();
|
||||||
void show_client_world_table_bar();
|
void show_client_world_table_bar();
|
||||||
void show_player_tab_item();
|
void show_player_tab_item();
|
||||||
void show_items_tab_item();
|
// void show_items_tab_item();
|
||||||
void show_shader_tab_item();
|
void show_shader_tab_item();
|
||||||
|
|
||||||
void update_config_view();
|
void update_config_view();
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ struct LookBlock {
|
|||||||
|
|
||||||
struct BlockData {
|
struct BlockData {
|
||||||
std::string name;
|
std::string name;
|
||||||
|
std::string name_key;
|
||||||
BlockType id = 0;
|
BlockType id = 0;
|
||||||
|
|
||||||
bool is_liquid = false;
|
bool is_liquid = false;
|
||||||
@@ -55,11 +56,11 @@ struct BlockData {
|
|||||||
bool is_blend = false;
|
bool is_blend = false;
|
||||||
bool is_transitional = false;
|
bool is_transitional = false;
|
||||||
float roughness = 1.0f;
|
float roughness = 1.0f;
|
||||||
BlockData(BlockType b_id, std::string_view b_name, bool liquid,
|
BlockData(std::string_view b_name, std::string_view name_k, BlockType b_id,
|
||||||
bool passable, bool cross_plane, bool transparent, bool gas,
|
bool liquid, bool passable, bool cross_plane, bool transparent,
|
||||||
bool discard, bool blend, bool transitional, float r)
|
bool gas, bool discard, bool blend, bool transitional, float r)
|
||||||
: name(b_name), id(b_id), is_liquid(liquid), is_gas(gas),
|
: name(b_name), name_key(name_k), id(b_id), is_liquid(liquid),
|
||||||
is_passable(passable), is_cross_plane(cross_plane),
|
is_gas(gas), is_passable(passable), is_cross_plane(cross_plane),
|
||||||
is_transparent(transparent), is_discard(discard), is_blend(blend),
|
is_transparent(transparent), is_discard(discard), is_blend(blend),
|
||||||
is_transitional(transitional), roughness(r) {}
|
is_transitional(transitional), roughness(r) {}
|
||||||
};
|
};
|
||||||
@@ -72,7 +73,7 @@ public:
|
|||||||
static unsigned sums();
|
static unsigned sums();
|
||||||
static unsigned cross_plane_sum();
|
static unsigned cross_plane_sum();
|
||||||
static const std::string& name_form_id(BlockType id);
|
static const std::string& name_form_id(BlockType id);
|
||||||
|
static std::string local_name(BlockType id);
|
||||||
static bool is_gas(BlockType id);
|
static bool is_gas(BlockType id);
|
||||||
static bool is_liquid(BlockType id);
|
static bool is_liquid(BlockType id);
|
||||||
|
|
||||||
|
|||||||
15
include/Cubed/gameplay/chat_message.hpp
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Cubed/ui/color.hpp"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <string>
|
||||||
|
namespace Cubed {
|
||||||
|
struct ChatMessage {
|
||||||
|
std::string player;
|
||||||
|
std::string text;
|
||||||
|
Color color;
|
||||||
|
bool system_msg = false;
|
||||||
|
uint64_t time = 0;
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
27
include/Cubed/gameplay/chunk.hpp
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/gameplay/chunk_pos.hpp"
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <tuple>
|
||||||
|
namespace Cubed {
|
||||||
|
class Chunk {
|
||||||
|
public:
|
||||||
|
Chunk() = default;
|
||||||
|
Chunk(const Chunk&) = delete;
|
||||||
|
Chunk(Chunk&&) = delete;
|
||||||
|
Chunk& operator=(const Chunk&) = delete;
|
||||||
|
Chunk& operator=(Chunk&&) = delete;
|
||||||
|
virtual ~Chunk() = default;
|
||||||
|
static int index(int x, int y, int z);
|
||||||
|
static int index(const glm::vec3& pos);
|
||||||
|
static std::tuple<int, int, int> world_to_block(int world_x, int world_y,
|
||||||
|
int world_z, int chunk_x,
|
||||||
|
int chunk_z);
|
||||||
|
static std::tuple<int, int, int> world_to_block(const glm::ivec3& block_pos,
|
||||||
|
ChunkPos chunk_pos);
|
||||||
|
static std::tuple<int, int, int> block_to_world(int x, int y, int z,
|
||||||
|
int chunk_x, int chunk_z);
|
||||||
|
static std::tuple<int, int, int> block_to_world(const glm::ivec3& block_pos,
|
||||||
|
ChunkPos chunk_pos);
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
#include "Cubed/constants.hpp"
|
#include "Cubed/constants.hpp"
|
||||||
#include "Cubed/gameplay/biome.hpp"
|
#include "Cubed/gameplay/biome.hpp"
|
||||||
#include "Cubed/gameplay/block.hpp"
|
#include "Cubed/gameplay/block.hpp"
|
||||||
|
#include "Cubed/gameplay/chunk.hpp"
|
||||||
#include "Cubed/gameplay/chunk_pos.hpp"
|
#include "Cubed/gameplay/chunk_pos.hpp"
|
||||||
#include "Cubed/gameplay/vertex_data.hpp"
|
#include "Cubed/gameplay/vertex_data.hpp"
|
||||||
#include "world/chunk_data.pb.h"
|
#include "world/chunk_data.pb.h"
|
||||||
@@ -26,7 +27,7 @@ struct ChunkRenderSnapshot {
|
|||||||
glm::vec3 center;
|
glm::vec3 center;
|
||||||
glm::vec3 half_extents;
|
glm::vec3 half_extents;
|
||||||
};
|
};
|
||||||
class ClientChunk {
|
class ClientChunk : public Chunk {
|
||||||
public:
|
public:
|
||||||
ClientChunk(ClientWorld& world);
|
ClientChunk(ClientWorld& world);
|
||||||
~ClientChunk();
|
~ClientChunk();
|
||||||
@@ -35,17 +36,6 @@ public:
|
|||||||
ClientChunk(ClientChunk&&) noexcept;
|
ClientChunk(ClientChunk&&) noexcept;
|
||||||
ClientChunk& operator=(ClientChunk&&) noexcept;
|
ClientChunk& operator=(ClientChunk&&) noexcept;
|
||||||
|
|
||||||
static int index(int x, int y, int z);
|
|
||||||
static int index(const glm::vec3& pos);
|
|
||||||
static std::tuple<int, int, int> world_to_block(int world_x, int world_y,
|
|
||||||
int world_z, int chunk_x,
|
|
||||||
int chunk_z);
|
|
||||||
static std::tuple<int, int, int> world_to_block(const glm::ivec3& block_pos,
|
|
||||||
ChunkPos chunk_pos);
|
|
||||||
static std::tuple<int, int, int> block_to_world(int x, int y, int z,
|
|
||||||
int chunk_x, int chunk_z);
|
|
||||||
static std::tuple<int, int, int> block_to_world(const glm::ivec3& block_pos,
|
|
||||||
ChunkPos chunk_pos);
|
|
||||||
BiomeType get_biome() const;
|
BiomeType get_biome() const;
|
||||||
ChunkPos get_chunk_pos() const;
|
ChunkPos get_chunk_pos() const;
|
||||||
const std::vector<BlockType>& get_chunk_blocks() const;
|
const std::vector<BlockType>& get_chunk_blocks() const;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
#include "Cubed/gameplay/chunk_pos.hpp"
|
#include "Cubed/gameplay/chunk_pos.hpp"
|
||||||
#include "Cubed/gameplay/game_mode.hpp"
|
#include "Cubed/gameplay/game_mode.hpp"
|
||||||
#include "Cubed/gameplay/game_time.hpp"
|
#include "Cubed/gameplay/game_time.hpp"
|
||||||
|
#include "Cubed/gameplay/item_stack.hpp"
|
||||||
#include "Cubed/gameplay/player.hpp"
|
#include "Cubed/gameplay/player.hpp"
|
||||||
#include "Cubed/input/event.hpp"
|
#include "Cubed/input/event.hpp"
|
||||||
#include "Cubed/input/input.hpp"
|
#include "Cubed/input/input.hpp"
|
||||||
@@ -18,6 +19,7 @@ namespace Cubed {
|
|||||||
class ClientWorld;
|
class ClientWorld;
|
||||||
class ClientPlayer {
|
class ClientPlayer {
|
||||||
public:
|
public:
|
||||||
|
static constexpr size_t HOTBAR_SUM = 10;
|
||||||
static constexpr float WALK_SOUND_INTERVAL = 0.45f;
|
static constexpr float WALK_SOUND_INTERVAL = 0.45f;
|
||||||
static constexpr float RUN_SOUND_INTERVAL = 0.3f;
|
static constexpr float RUN_SOUND_INTERVAL = 0.3f;
|
||||||
using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
|
using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
|
||||||
@@ -47,7 +49,6 @@ public:
|
|||||||
void change_mode(GameMode mode);
|
void change_mode(GameMode mode);
|
||||||
void reload_config();
|
void reload_config();
|
||||||
void set_player_pos(const glm::vec3& pos);
|
void set_player_pos(const glm::vec3& pos);
|
||||||
void set_place_block(unsigned id);
|
|
||||||
void update(float delta_time);
|
void update(float delta_time);
|
||||||
|
|
||||||
float& max_walk_speed();
|
float& max_walk_speed();
|
||||||
@@ -58,7 +59,7 @@ public:
|
|||||||
float& g();
|
float& g();
|
||||||
float& fly_y_speed();
|
float& fly_y_speed();
|
||||||
|
|
||||||
unsigned get_current_block() const;
|
const ItemStack& get_current_itemstack() const;
|
||||||
|
|
||||||
void set_gait(Gait gait);
|
void set_gait(Gait gait);
|
||||||
GameMode& game_mode();
|
GameMode& game_mode();
|
||||||
@@ -82,6 +83,10 @@ public:
|
|||||||
void set_underwater(bool u);
|
void set_underwater(bool u);
|
||||||
void place_block(float dt);
|
void place_block(float dt);
|
||||||
|
|
||||||
|
int selected_hotbar() const;
|
||||||
|
void set_hotbar(int pos, const ItemStack& item);
|
||||||
|
std::span<const ItemStack, HOTBAR_SUM> get_hotbar() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
using enum GameMode;
|
using enum GameMode;
|
||||||
float m_max_walk_speed = DEFAULT_MAX_WALK_SPEED;
|
float m_max_walk_speed = DEFAULT_MAX_WALK_SPEED;
|
||||||
@@ -89,12 +94,13 @@ private:
|
|||||||
float m_acceleration = DEFAULT_ACCELERATION;
|
float m_acceleration = DEFAULT_ACCELERATION;
|
||||||
float m_deceleration = DEFAULT_DECELERATION;
|
float m_deceleration = DEFAULT_DECELERATION;
|
||||||
float m_g = DEFAULT_G;
|
float m_g = DEFAULT_G;
|
||||||
constexpr static float MAX_SPACE_ON_TIME = 0.3f;
|
static constexpr float MAX_SPACE_ON_TIME = 0.3f;
|
||||||
constexpr static float PLACE_BLOCK_INTERVAL = 0.2f;
|
static constexpr float PLACE_BLOCK_INTERVAL = 0.2f;
|
||||||
|
|
||||||
float m_place_time = PLACE_BLOCK_INTERVAL;
|
float m_place_time = PLACE_BLOCK_INTERVAL;
|
||||||
std::atomic<float> m_yaw = 0.0f;
|
std::atomic<float> m_yaw = 0.0f;
|
||||||
std::atomic<float> m_pitch = 0.0f;
|
std::atomic<float> m_pitch = 0.0f;
|
||||||
|
std::array<ItemStack, HOTBAR_SUM> m_hotbar;
|
||||||
float m_sensitivity = 0.15f;
|
float m_sensitivity = 0.15f;
|
||||||
|
|
||||||
float m_max_speed = m_max_walk_speed;
|
float m_max_speed = m_max_walk_speed;
|
||||||
@@ -108,7 +114,7 @@ private:
|
|||||||
|
|
||||||
float m_xz_speed = 0.0f;
|
float m_xz_speed = 0.0f;
|
||||||
|
|
||||||
unsigned m_place_block = 1;
|
int m_selected_hotbar = 0;
|
||||||
|
|
||||||
bool m_moving = false;
|
bool m_moving = false;
|
||||||
bool m_sprinting = false;
|
bool m_sprinting = false;
|
||||||
|
|||||||
@@ -2,14 +2,18 @@
|
|||||||
#include "Cubed/audio/audio_engine.hpp"
|
#include "Cubed/audio/audio_engine.hpp"
|
||||||
#include "Cubed/config.hpp"
|
#include "Cubed/config.hpp"
|
||||||
#include "Cubed/gameplay/block.hpp"
|
#include "Cubed/gameplay/block.hpp"
|
||||||
|
#include "Cubed/gameplay/chat_message.hpp"
|
||||||
#include "Cubed/gameplay/chunk_pos.hpp"
|
#include "Cubed/gameplay/chunk_pos.hpp"
|
||||||
#include "Cubed/gameplay/client_chunk.hpp"
|
#include "Cubed/gameplay/client_chunk.hpp"
|
||||||
#include "Cubed/gameplay/client_player.hpp"
|
#include "Cubed/gameplay/client_player.hpp"
|
||||||
#include "Cubed/gameplay/game_time.hpp"
|
#include "Cubed/gameplay/game_time.hpp"
|
||||||
#include "Cubed/gameplay/network_client.hpp"
|
#include "Cubed/gameplay/network_client.hpp"
|
||||||
|
#include "Cubed/gameplay/player_data.hpp"
|
||||||
|
#include "Cubed/gameplay/world.hpp"
|
||||||
#include "Cubed/input/event.hpp"
|
#include "Cubed/input/event.hpp"
|
||||||
#include "Cubed/tools/cubed_random.hpp"
|
#include "Cubed/tools/cubed_random.hpp"
|
||||||
#include "Cubed/tools/priority_thread_pool.hpp"
|
#include "Cubed/tools/priority_thread_pool.hpp"
|
||||||
|
#include "Cubed/tools/sparse_vector.hpp"
|
||||||
|
|
||||||
#include <absl/container/flat_hash_set.h>
|
#include <absl/container/flat_hash_set.h>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
@@ -18,46 +22,27 @@
|
|||||||
#include <tbb/concurrent_unordered_map.h>
|
#include <tbb/concurrent_unordered_map.h>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
|
||||||
struct PlayerInfo {
|
|
||||||
std::string name;
|
|
||||||
std::string uuid;
|
|
||||||
glm::vec3 render_pos;
|
|
||||||
glm::vec3 target_pos;
|
|
||||||
float render_yaw;
|
|
||||||
float yaw;
|
|
||||||
float render_pitch;
|
|
||||||
float pitch;
|
|
||||||
Gait gait;
|
|
||||||
float angle = 0.0f;
|
|
||||||
float walk_time = 0.0f;
|
|
||||||
float moving_time = 0.0f;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct PlayerRenderData {
|
|
||||||
std::string name;
|
|
||||||
std::string uuid;
|
|
||||||
glm::vec3 render_pos;
|
|
||||||
float yaw;
|
|
||||||
float pitch;
|
|
||||||
Gait gait;
|
|
||||||
float angle;
|
|
||||||
};
|
|
||||||
class WorldScene;
|
class WorldScene;
|
||||||
class ClientWorld {
|
class ClientWorld : public World {
|
||||||
public:
|
public:
|
||||||
|
ClientWorld(const ClientWorld&) = delete;
|
||||||
|
ClientWorld(ClientWorld&&) = delete;
|
||||||
|
ClientWorld& operator=(const ClientWorld&) = delete;
|
||||||
|
ClientWorld& operator=(ClientWorld&&) = delete;
|
||||||
ClientWorld(AudioEngine& auido, Config& config, WorldScene& scene);
|
ClientWorld(AudioEngine& auido, Config& config, WorldScene& scene);
|
||||||
~ClientWorld();
|
~ClientWorld();
|
||||||
void init(std::string_view player_name,
|
void init(std::string_view player_name,
|
||||||
std::shared_ptr<NetworkClient> client);
|
std::shared_ptr<NetworkClient> client);
|
||||||
void update(float delta_time);
|
void update(float dt);
|
||||||
|
void update_players(float dt);
|
||||||
bool handle_event(const Event& e);
|
bool handle_event(const Event& e);
|
||||||
const std::optional<LookBlock>& get_look_block_pos() const;
|
const std::optional<LookBlock>& get_look_block_pos() const;
|
||||||
ClientPlayer& get_player();
|
ClientPlayer& get_player();
|
||||||
const ClientPlayer& get_player() const;
|
const ClientPlayer& get_player() const;
|
||||||
int get_block(const glm::ivec3& block_pos) const;
|
int get_block(const glm::ivec3& block_pos) const override;
|
||||||
bool is_solid(const glm::ivec3& block_pos) const;
|
bool is_solid(const glm::ivec3& block_pos) const override;
|
||||||
bool can_pass_block(const glm::ivec3& block_pos) const;
|
bool can_pass_block(const glm::ivec3& block_pos) const override;
|
||||||
BlockType get_block_tpye(const glm::ivec3& block_pos) const;
|
BlockType get_block_tpye(const glm::ivec3& block_pos) const override;
|
||||||
|
|
||||||
void rebuild_world();
|
void rebuild_world();
|
||||||
|
|
||||||
@@ -78,6 +63,7 @@ public:
|
|||||||
void rendering_distance(int rendering_distance);
|
void rendering_distance(int rendering_distance);
|
||||||
int get_chunk_task_id() const;
|
int get_chunk_task_id() const;
|
||||||
void start_client_thread(std::string_view uuid);
|
void start_client_thread(std::string_view uuid);
|
||||||
|
void receive_login_rsp(LoginRsp& rsp);
|
||||||
void stop_client_thread();
|
void stop_client_thread();
|
||||||
|
|
||||||
void start_thread_pool();
|
void start_thread_pool();
|
||||||
@@ -97,10 +83,18 @@ public:
|
|||||||
void request_exit();
|
void request_exit();
|
||||||
bool is_receive_exit();
|
bool is_receive_exit();
|
||||||
int chunk_size() const;
|
int chunk_size() const;
|
||||||
static AABB get_block_aabb(const glm::ivec3& pos);
|
|
||||||
AudioEngine& get_audio();
|
AudioEngine& get_audio();
|
||||||
|
const AudioEngine& get_audio() const;
|
||||||
Config& get_config();
|
Config& get_config();
|
||||||
WorldScene& world_scene();
|
WorldScene& world_scene();
|
||||||
|
void set_direct_exit();
|
||||||
|
|
||||||
|
void receive_chat_message(ChatMsg& msg);
|
||||||
|
void send_chat_message(ChatMessage& message);
|
||||||
|
void receive_voice_message(VoiceMsg& msg);
|
||||||
|
bool enable_voice_chat() const;
|
||||||
|
int get_per_tick_time() const override;
|
||||||
template <typename Fn>
|
template <typename Fn>
|
||||||
void register_ticktimer(std::string_view id, TickType threshold, Fn&& f) {
|
void register_ticktimer(std::string_view id, TickType threshold, Fn&& f) {
|
||||||
m_ticktimers.emplace(
|
m_ticktimers.emplace(
|
||||||
@@ -109,6 +103,11 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
struct VoiceMessage {
|
||||||
|
std::string data;
|
||||||
|
glm::vec3 pos;
|
||||||
|
};
|
||||||
|
|
||||||
std::atomic<bool> m_is_pending_delete_queue_free{false};
|
std::atomic<bool> m_is_pending_delete_queue_free{false};
|
||||||
std::mutex m_delete_vbo_mutex;
|
std::mutex m_delete_vbo_mutex;
|
||||||
std::mutex m_delete_vao_mutex;
|
std::mutex m_delete_vao_mutex;
|
||||||
@@ -121,7 +120,6 @@ private:
|
|||||||
ChunkPos::TBBHash>;
|
ChunkPos::TBBHash>;
|
||||||
using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
|
using ChunkPosSet = absl::flat_hash_set<ChunkPos, ChunkPos::Hash>;
|
||||||
using ChunkPosVector = std::vector<ChunkPos>;
|
using ChunkPosVector = std::vector<ChunkPos>;
|
||||||
using OtherPlayerHashMap = std::unordered_map<std::string, PlayerInfo>;
|
|
||||||
using chunk_acc = ChunkHashMap::accessor;
|
using chunk_acc = ChunkHashMap::accessor;
|
||||||
using chunk_cacc = ChunkHashMap::const_accessor;
|
using chunk_cacc = ChunkHashMap::const_accessor;
|
||||||
|
|
||||||
@@ -132,8 +130,8 @@ private:
|
|||||||
|
|
||||||
static constexpr int WORLD_EXIT_TIMEOUT = 200;
|
static constexpr int WORLD_EXIT_TIMEOUT = 200;
|
||||||
static constexpr int MAX_UPLOAD_CHUNK_SUM = 16;
|
static constexpr int MAX_UPLOAD_CHUNK_SUM = 16;
|
||||||
|
|
||||||
ClientPlayer m_player;
|
ClientPlayer m_player;
|
||||||
OtherPlayerHashMap m_player_info;
|
|
||||||
ChunkHashMap m_chunks;
|
ChunkHashMap m_chunks;
|
||||||
AudioEngine& m_audio;
|
AudioEngine& m_audio;
|
||||||
Config& m_config;
|
Config& m_config;
|
||||||
@@ -141,11 +139,16 @@ private:
|
|||||||
std::vector<glm::vec4> m_planes;
|
std::vector<glm::vec4> m_planes;
|
||||||
std::jthread m_client_thread;
|
std::jthread m_client_thread;
|
||||||
|
|
||||||
mutable std::shared_mutex m_player_info_mutex;
|
mutable std::shared_mutex m_players_date_mutex;
|
||||||
|
using PlayerHandle = SparseVector<PlayerData>::Handle;
|
||||||
|
SparseVector<PlayerData> m_players_data;
|
||||||
|
std::unordered_map<std::string, PlayerHandle> m_players_handle;
|
||||||
|
|
||||||
tbb::concurrent_queue<std::unique_ptr<ClientChunk>> m_pending_upload_queue;
|
tbb::concurrent_queue<std::unique_ptr<ClientChunk>> m_pending_upload_queue;
|
||||||
tbb::concurrent_queue<ChunkPos> m_dirty_chunk_queue;
|
tbb::concurrent_queue<ChunkPos> m_dirty_chunk_queue;
|
||||||
tbb::concurrent_queue<PendingSound> m_pending_sound;
|
tbb::concurrent_queue<PendingSound> m_pending_sound;
|
||||||
|
tbb::concurrent_queue<ChatMessage> m_message_queue;
|
||||||
|
tbb::concurrent_queue<VoiceMessage> m_voice_queue;
|
||||||
|
|
||||||
std::deque<ChunkPos> m_dirty_queue;
|
std::deque<ChunkPos> m_dirty_queue;
|
||||||
std::vector<const ChunkRenderSnapshot*> m_render_snapshots;
|
std::vector<const ChunkRenderSnapshot*> m_render_snapshots;
|
||||||
@@ -153,15 +156,17 @@ private:
|
|||||||
|
|
||||||
tbb::concurrent_unordered_map<std::string, TickTimer> m_ticktimers;
|
tbb::concurrent_unordered_map<std::string, TickTimer> m_ticktimers;
|
||||||
std::unordered_map<std::string, Timer> m_timers;
|
std::unordered_map<std::string, Timer> m_timers;
|
||||||
|
std::atomic<bool> m_exit_direct{false};
|
||||||
std::atomic<bool> m_game_running{false};
|
std::atomic<bool> m_game_running{false};
|
||||||
std::atomic<bool> m_receive_exit{false};
|
std::atomic<bool> m_receive_exit{false};
|
||||||
std::atomic<int> m_rendering_distance{24};
|
std::atomic<int> m_rendering_distance{24};
|
||||||
std::atomic<TickType> m_game_ticks{0};
|
std::atomic<TickType> m_game_ticks{0};
|
||||||
std::atomic<TickType> m_day_tick{6000};
|
std::atomic<TickType> m_day_tick{6000};
|
||||||
|
std::atomic<int> m_per_tick_time = DEFAULT_PER_TICK_TIME;
|
||||||
std::atomic<bool> m_requesting_chunk{false};
|
std::atomic<bool> m_requesting_chunk{false};
|
||||||
std::atomic<bool> m_is_rebuilding{false};
|
std::atomic<bool> m_is_rebuilding{false};
|
||||||
std::atomic<int> m_chunk_task_id{0};
|
std::atomic<int> m_chunk_task_id{0};
|
||||||
|
std::atomic<bool> m_voice_chat{true};
|
||||||
std::shared_ptr<NetworkClient> m_client;
|
std::shared_ptr<NetworkClient> m_client;
|
||||||
ChunkLoadStyle m_chunk_load_style{ChunkLoadStyle::CENTER};
|
ChunkLoadStyle m_chunk_load_style{ChunkLoadStyle::CENTER};
|
||||||
|
|
||||||
|
|||||||
45
include/Cubed/gameplay/entity.hpp
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/AABB.hpp"
|
||||||
|
#include "Cubed/gameplay/player.hpp"
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <string>
|
||||||
|
namespace Cubed {
|
||||||
|
|
||||||
|
struct Position {
|
||||||
|
glm::vec3 value{0.0f};
|
||||||
|
};
|
||||||
|
|
||||||
|
struct WalkPose {
|
||||||
|
Gait gait = Gait::STOP;
|
||||||
|
// for arm roll caculate
|
||||||
|
float walk_time = 0.0f;
|
||||||
|
// for sound play
|
||||||
|
float moving_time = 0.0f;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct EntityInfo {
|
||||||
|
std::string name;
|
||||||
|
std::string uuid;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Health {
|
||||||
|
float hp = 20;
|
||||||
|
float max_hp = 20;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Orientation {
|
||||||
|
float yaw = 0.0f;
|
||||||
|
float pitch = 0.0f;
|
||||||
|
float roll = 0.0f;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Velocity {
|
||||||
|
glm::vec3 value{0.0f};
|
||||||
|
};
|
||||||
|
|
||||||
|
struct HitBoxes {
|
||||||
|
std::vector<AABB> boxex;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
24
include/Cubed/gameplay/hitbox_manager.hpp
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/AABB.hpp"
|
||||||
|
|
||||||
|
#include <tbb/concurrent_hash_map.h>
|
||||||
|
namespace Cubed {
|
||||||
|
class HitboxManager {
|
||||||
|
public:
|
||||||
|
HitboxManager();
|
||||||
|
~HitboxManager();
|
||||||
|
static HitboxManager& instance();
|
||||||
|
|
||||||
|
AABB get_aabb(const std::string& key);
|
||||||
|
|
||||||
|
static AABB aabb(const std::string& key);
|
||||||
|
|
||||||
|
private:
|
||||||
|
using HitBoxMap = tbb::concurrent_hash_map<std::string, AABB>;
|
||||||
|
using cacc = HitBoxMap::const_accessor;
|
||||||
|
using acc = HitBoxMap::accessor;
|
||||||
|
HitBoxMap m_hitboxes;
|
||||||
|
|
||||||
|
AABB load(const std::string& path);
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
8
include/Cubed/gameplay/item_stack.hpp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/gameplay/block.hpp"
|
||||||
|
namespace Cubed {
|
||||||
|
struct ItemStack {
|
||||||
|
BlockType type = 0;
|
||||||
|
size_t sum = 0;
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
7
include/Cubed/gameplay/model.hpp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
#pragma once
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
using ModelID = uint32_t;
|
||||||
|
struct Model {
|
||||||
|
ModelID id;
|
||||||
|
};
|
||||||
@@ -21,6 +21,7 @@ public:
|
|||||||
bool is_connect_error() const;
|
bool is_connect_error() const;
|
||||||
std::string get_error_string() const;
|
std::string get_error_string() const;
|
||||||
void clear_error();
|
void clear_error();
|
||||||
|
ClientWorld& world();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct Task {
|
struct Task {
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ enum class PacketEnum : uint16_t {
|
|||||||
BLOCK_CHANGE_RSP = 3004,
|
BLOCK_CHANGE_RSP = 3004,
|
||||||
S2C_CLEAR_ALL_CHUNKS = 3005,
|
S2C_CLEAR_ALL_CHUNKS = 3005,
|
||||||
UPDATE_TIME = 3006,
|
UPDATE_TIME = 3006,
|
||||||
|
CHAT_MSG = 4001,
|
||||||
|
VOICE_MSG = 4002,
|
||||||
PING = 9001,
|
PING = 9001,
|
||||||
PONG = 9002
|
PONG = 9002
|
||||||
|
|
||||||
@@ -121,6 +123,12 @@ template <> constexpr uint16_t get_packet_id<Pong>() {
|
|||||||
template <> constexpr uint16_t get_packet_id<PlayerWaterSound>() {
|
template <> constexpr uint16_t get_packet_id<PlayerWaterSound>() {
|
||||||
return std::to_underlying(PacketEnum::PLAYER_WATER_SOUND);
|
return std::to_underlying(PacketEnum::PLAYER_WATER_SOUND);
|
||||||
}
|
}
|
||||||
|
template <> constexpr uint16_t get_packet_id<ChatMsg>() {
|
||||||
|
return std::to_underlying(PacketEnum::CHAT_MSG);
|
||||||
|
}
|
||||||
|
template <> constexpr uint16_t get_packet_id<VoiceMsg>() {
|
||||||
|
return std::to_underlying(PacketEnum::VOICE_MSG);
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
requires std::derived_from<T, google::protobuf::Message>
|
requires std::derived_from<T, google::protobuf::Message>
|
||||||
|
|||||||
20
include/Cubed/gameplay/player_data.hpp
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/gameplay/entity.hpp"
|
||||||
|
namespace Cubed {
|
||||||
|
struct PlayerData {
|
||||||
|
Position pos{};
|
||||||
|
Position render_pos{};
|
||||||
|
EntityInfo entity{};
|
||||||
|
WalkPose walk{};
|
||||||
|
Orientation angle{};
|
||||||
|
Orientation render_angle{};
|
||||||
|
};
|
||||||
|
|
||||||
|
struct PlayerRenderData {
|
||||||
|
EntityInfo info{};
|
||||||
|
Position render_pos{};
|
||||||
|
Orientation angle{};
|
||||||
|
Gait gait{};
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
#include "Cubed/constants.hpp"
|
#include "Cubed/constants.hpp"
|
||||||
#include "Cubed/gameplay/biome.hpp"
|
#include "Cubed/gameplay/biome.hpp"
|
||||||
#include "Cubed/gameplay/block.hpp"
|
#include "Cubed/gameplay/block.hpp"
|
||||||
|
#include "Cubed/gameplay/chunk.hpp"
|
||||||
#include "Cubed/gameplay/chunk_generator.hpp"
|
#include "Cubed/gameplay/chunk_generator.hpp"
|
||||||
#include "Cubed/gameplay/chunk_pos.hpp"
|
#include "Cubed/gameplay/chunk_pos.hpp"
|
||||||
|
|
||||||
@@ -11,7 +12,7 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
class ServerWorld;
|
class ServerWorld;
|
||||||
class ServerChunk {
|
class ServerChunk : public Chunk {
|
||||||
public:
|
public:
|
||||||
ServerChunk(ServerWorld& world, ChunkPos chunk_pos,
|
ServerChunk(ServerWorld& world, ChunkPos chunk_pos,
|
||||||
bool temp_chunk = false);
|
bool temp_chunk = false);
|
||||||
|
|||||||
@@ -8,9 +8,12 @@
|
|||||||
#include "Cubed/gameplay/river_worm.hpp"
|
#include "Cubed/gameplay/river_worm.hpp"
|
||||||
#include "Cubed/gameplay/server_chunk.hpp"
|
#include "Cubed/gameplay/server_chunk.hpp"
|
||||||
#include "Cubed/gameplay/server_player.hpp"
|
#include "Cubed/gameplay/server_player.hpp"
|
||||||
|
#include "Cubed/gameplay/world.hpp"
|
||||||
#include "Cubed/tools/priority_thread_pool.hpp"
|
#include "Cubed/tools/priority_thread_pool.hpp"
|
||||||
#include "Cubed/tools/recent_queue.hpp"
|
#include "Cubed/tools/recent_queue.hpp"
|
||||||
|
#include "Cubed/tools/sensitive_filter.hpp"
|
||||||
#include "Cubed/tools/thread_pool.hpp"
|
#include "Cubed/tools/thread_pool.hpp"
|
||||||
|
#include "Cubed/ui/color.hpp"
|
||||||
#include "world/block_change.pb.h"
|
#include "world/block_change.pb.h"
|
||||||
|
|
||||||
#include <absl/container/flat_hash_set.h>
|
#include <absl/container/flat_hash_set.h>
|
||||||
@@ -23,7 +26,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
class Session;
|
class Session;
|
||||||
class ServerWorld {
|
class ServerWorld : public World {
|
||||||
public:
|
public:
|
||||||
enum class ThreadPoolKind { NET, GEN };
|
enum class ThreadPoolKind { NET, GEN };
|
||||||
ServerWorld(Config& config);
|
ServerWorld(Config& config);
|
||||||
@@ -80,7 +83,15 @@ public:
|
|||||||
void handle_chunk_req(int task_id, const std::string& uuid, ChunkPos pos);
|
void handle_chunk_req(int task_id, const std::string& uuid, ChunkPos pos);
|
||||||
void handle_block_change(const BlockChangeReq& req);
|
void handle_block_change(const BlockChangeReq& req);
|
||||||
|
|
||||||
|
void handle_chat_message(ChatMsg& msg);
|
||||||
|
void handle_voice_message(VoiceMsg& msg);
|
||||||
int chunk_size() const;
|
int chunk_size() const;
|
||||||
|
|
||||||
|
int get_block(const glm::ivec3& block_pos) const override;
|
||||||
|
bool is_solid(const glm::ivec3& block_pos) const override;
|
||||||
|
bool can_pass_block(const glm::ivec3& block_pos) const override;
|
||||||
|
BlockType get_block_tpye(const glm::ivec3& block_pos) const override;
|
||||||
|
int get_per_tick_time() const override;
|
||||||
template <typename Fn>
|
template <typename Fn>
|
||||||
void register_timer(std::string_view id, TickType threshold, Fn&& f) {
|
void register_timer(std::string_view id, TickType threshold, Fn&& f) {
|
||||||
m_timers.emplace(std::piecewise_construct,
|
m_timers.emplace(std::piecewise_construct,
|
||||||
@@ -115,7 +126,7 @@ private:
|
|||||||
using PlayerUUIDMap = tbb::concurrent_hash_map<std::string, std::string>;
|
using PlayerUUIDMap = tbb::concurrent_hash_map<std::string, std::string>;
|
||||||
|
|
||||||
using chunk_acc = ChunkHashMap::accessor;
|
using chunk_acc = ChunkHashMap::accessor;
|
||||||
using chunk_caac = ChunkHashMap::const_accessor;
|
using chunk_cacc = ChunkHashMap::const_accessor;
|
||||||
|
|
||||||
using uuid_acc = PlayerUUIDMap::accessor;
|
using uuid_acc = PlayerUUIDMap::accessor;
|
||||||
using uuid_cacc = PlayerUUIDMap::const_accessor;
|
using uuid_cacc = PlayerUUIDMap::const_accessor;
|
||||||
@@ -128,6 +139,9 @@ private:
|
|||||||
|
|
||||||
CaveCarver m_cave_carcer;
|
CaveCarver m_cave_carcer;
|
||||||
RiverWorm m_river_worm;
|
RiverWorm m_river_worm;
|
||||||
|
std::atomic<bool> m_enable_filter{false};
|
||||||
|
std::atomic<bool> m_voice_chat{true};
|
||||||
|
SensitiveFilter m_filter;
|
||||||
|
|
||||||
std::jthread m_gen_thread;
|
std::jthread m_gen_thread;
|
||||||
std::jthread m_server_thread;
|
std::jthread m_server_thread;
|
||||||
@@ -189,5 +203,8 @@ private:
|
|||||||
std::atomic<std::shared_ptr<PriorityThreadPool>>& thread_pool,
|
std::atomic<std::shared_ptr<PriorityThreadPool>>& thread_pool,
|
||||||
int threads);
|
int threads);
|
||||||
void send_server_stop();
|
void send_server_stop();
|
||||||
|
|
||||||
|
void boardcast_message(const std::string& name, const std::string& message,
|
||||||
|
Color color = Color::WHITE, bool system_msg = false);
|
||||||
};
|
};
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
|
|||||||
29
include/Cubed/gameplay/world.hpp
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/AABB.hpp"
|
||||||
|
#include "Cubed/gameplay/block.hpp"
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
namespace Cubed {
|
||||||
|
class World {
|
||||||
|
public:
|
||||||
|
World() = default;
|
||||||
|
World(const World&) = delete;
|
||||||
|
World(World&&) = delete;
|
||||||
|
World& operator=(const World&) = delete;
|
||||||
|
World& operator=(World&&) = delete;
|
||||||
|
virtual ~World() = default;
|
||||||
|
|
||||||
|
virtual int get_block(const glm::ivec3& block_pos) const = 0;
|
||||||
|
virtual bool is_solid(const glm::ivec3& block_pos) const = 0;
|
||||||
|
virtual bool can_pass_block(const glm::ivec3& block_pos) const = 0;
|
||||||
|
virtual BlockType get_block_tpye(const glm::ivec3& block_pos) const = 0;
|
||||||
|
virtual int get_per_tick_time() const = 0;
|
||||||
|
|
||||||
|
static AABB get_block_aabb(const glm::ivec3& pos) {
|
||||||
|
return {glm::vec3{static_cast<float>(pos.x) + 0.5f,
|
||||||
|
static_cast<float>(pos.y) + 0.5f,
|
||||||
|
static_cast<float>(pos.z) + 0.5f},
|
||||||
|
glm::vec3{0.5f, 0.5f, 0.5f}};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
@@ -11,8 +11,10 @@ namespace Cubed {
|
|||||||
struct MouseMoveEvent {
|
struct MouseMoveEvent {
|
||||||
float xpos;
|
float xpos;
|
||||||
float ypos;
|
float ypos;
|
||||||
|
float xrel;
|
||||||
MouseMoveEvent(float x, float y) : xpos(x), ypos(y) {}
|
float yrel;
|
||||||
|
MouseMoveEvent(float x, float y, float dx, float dy)
|
||||||
|
: xpos(x), ypos(y), xrel(dx), yrel(dy) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct MouseButtonEvent {
|
struct MouseButtonEvent {
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
|
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
|
||||||
struct MoveState {
|
struct MoveState {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ enum class MouseKey {
|
|||||||
|
|
||||||
BACK_BUTTON, // Side button back
|
BACK_BUTTON, // Side button back
|
||||||
FORWARD_BUTTON, // Side button forward
|
FORWARD_BUTTON, // Side button forward
|
||||||
|
/*
|
||||||
WHEEL_UP,
|
WHEEL_UP,
|
||||||
WHEEL_DOWN,
|
WHEEL_DOWN,
|
||||||
WHEEL_LEFT,
|
WHEEL_LEFT,
|
||||||
@@ -20,6 +20,7 @@ enum class MouseKey {
|
|||||||
EXTRA_BUTTON_3,
|
EXTRA_BUTTON_3,
|
||||||
EXTRA_BUTTON_4,
|
EXTRA_BUTTON_4,
|
||||||
EXTRA_BUTTON_5
|
EXTRA_BUTTON_5
|
||||||
|
*/
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
49
include/Cubed/localization.hpp
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <format>
|
||||||
|
#include <string>
|
||||||
|
#include <string_view>
|
||||||
|
#include <unordered_map>
|
||||||
|
namespace Cubed {
|
||||||
|
|
||||||
|
struct FormatArg {
|
||||||
|
std::string name;
|
||||||
|
std::string value;
|
||||||
|
};
|
||||||
|
template <typename T> FormatArg arg(std::string_view name, T&& value) {
|
||||||
|
return {std::string(name), std::format("{}", std::forward<T>(value))};
|
||||||
|
}
|
||||||
|
|
||||||
|
class Localization {
|
||||||
|
public:
|
||||||
|
Localization();
|
||||||
|
static Localization& instance();
|
||||||
|
|
||||||
|
void load_language(std::string_view language);
|
||||||
|
bool has(const std::string& key) const;
|
||||||
|
template <typename... Args>
|
||||||
|
std::string translate(const std::string& key, Args&&... args) {
|
||||||
|
if constexpr (sizeof...(Args) == 0)
|
||||||
|
return std::string{lookup(key)};
|
||||||
|
std::string fmt{lookup(key)};
|
||||||
|
(replace_all(fmt, "{" + args.name + "}", args.value), ...);
|
||||||
|
return fmt;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::unordered_map<std::string, std::string> m_translations;
|
||||||
|
std::string m_current_lang{"en_US"};
|
||||||
|
std::string_view lookup(const std::string& key) const;
|
||||||
|
static void replace_all(std::string& str, std::string_view from,
|
||||||
|
std::string_view to);
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename... Args>
|
||||||
|
std::string tr(const std::string& key, Args&&... args) {
|
||||||
|
return Localization::instance().translate(key, std::forward<Args>(args)...);
|
||||||
|
}
|
||||||
|
template <typename T>
|
||||||
|
FormatArg tr_arg(const std::string& name, const std::string& key) {
|
||||||
|
return {std::string(name), tr(key)};
|
||||||
|
}
|
||||||
|
} // namespace Cubed
|
||||||
33
include/Cubed/render/model_manager.hpp
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/gameplay/model.hpp"
|
||||||
|
#include "Cubed/render/model_node.hpp"
|
||||||
|
#include "Cubed/tools/model_loader.hpp"
|
||||||
|
|
||||||
|
#include <tbb/concurrent_hash_map.h>
|
||||||
|
namespace Cubed {
|
||||||
|
class ModelManager {
|
||||||
|
public:
|
||||||
|
ModelManager();
|
||||||
|
ModelManager(const ModelManager&) = delete;
|
||||||
|
ModelManager(ModelManager&&) = delete;
|
||||||
|
ModelManager& operator=(const ModelManager&) = delete;
|
||||||
|
ModelManager& operator=(ModelManager&&) = delete;
|
||||||
|
~ModelManager();
|
||||||
|
const ModelNode& get_model(const std::string& model_name);
|
||||||
|
const ModelNode& get_model(ModelID id);
|
||||||
|
ModelID get_model_id(const std::string& name);
|
||||||
|
const std::string& get_model_name(ModelID id);
|
||||||
|
void init();
|
||||||
|
|
||||||
|
private:
|
||||||
|
ModelLoader m_loader;
|
||||||
|
ModelID m_next = 0;
|
||||||
|
using ModelMap = tbb::concurrent_hash_map<ModelID, ModelNode>;
|
||||||
|
using IDMap = tbb::concurrent_hash_map<std::string, ModelID>;
|
||||||
|
using NameMap = tbb::concurrent_hash_map<ModelID, std::string>;
|
||||||
|
ModelMap m_models;
|
||||||
|
IDMap m_id_map;
|
||||||
|
NameMap m_name_map;
|
||||||
|
const ModelNode& load_model(std::string_view model_name);
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
42
include/Cubed/render/model_node.hpp
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Cubed/primitive_data.hpp"
|
||||||
|
#include "Cubed/render/texture.hpp"
|
||||||
|
#include "Cubed/render/vertex_array.hpp"
|
||||||
|
#include "Cubed/render/vertex_buffer.hpp"
|
||||||
|
|
||||||
|
#include <glad/glad.h>
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
namespace Cubed {
|
||||||
|
|
||||||
|
struct Mesh {
|
||||||
|
std::vector<Vertex3D> vertices;
|
||||||
|
std::vector<uint32_t> indices;
|
||||||
|
std::unique_ptr<VertexBuffer> vbo;
|
||||||
|
std::unique_ptr<VertexBuffer> ebo;
|
||||||
|
std::unique_ptr<VertexArray> vao;
|
||||||
|
std::unique_ptr<Texture> texture;
|
||||||
|
void upload() {
|
||||||
|
vao = std::make_unique<VertexArray>();
|
||||||
|
vao->bind();
|
||||||
|
vbo = std::make_unique<VertexBuffer>();
|
||||||
|
vbo->buffer_data(vertices.data(), vertices.size() * sizeof(Vertex3D));
|
||||||
|
ebo = std::make_unique<VertexBuffer>(BufferType::ELEMENT_ARRAY_BUFFER);
|
||||||
|
ebo->buffer_data(indices.data(), indices.size() * sizeof(uint32_t));
|
||||||
|
vao->attribute(0, 3, GL_FLOAT, sizeof(Vertex3D), (void*)0);
|
||||||
|
vao->attribute(1, 2, GL_FLOAT, sizeof(Vertex3D),
|
||||||
|
(void*)offsetof(Vertex3D, s));
|
||||||
|
vao->attribute(2, 3, GL_FLOAT, sizeof(Vertex3D),
|
||||||
|
(void*)offsetof(Vertex3D, nx));
|
||||||
|
};
|
||||||
|
};
|
||||||
|
struct ModelNode {
|
||||||
|
std::string name;
|
||||||
|
glm::mat4 transform{1.0f};
|
||||||
|
std::vector<Mesh> meshes;
|
||||||
|
std::vector<ModelNode> children;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
25
include/Cubed/render/model_renderer.hpp
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Cubed/render/model_node.hpp"
|
||||||
|
#include "Cubed/shader.hpp"
|
||||||
|
|
||||||
|
#include <glm/glm.hpp>
|
||||||
|
namespace Cubed {
|
||||||
|
class Renderer;
|
||||||
|
class Camera;
|
||||||
|
class ModelRender {
|
||||||
|
public:
|
||||||
|
ModelRender(Renderer& renderer);
|
||||||
|
void render_model(const std::string& name, const glm::vec3& pos,
|
||||||
|
Camera& camera);
|
||||||
|
|
||||||
|
void shadow_pass(const std::string& name, const glm::vec3& pos,
|
||||||
|
Camera& camera);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Renderer& m_renderer;
|
||||||
|
void render_node(const ModelNode& node, const glm::mat4& parent,
|
||||||
|
const glm::mat4& view, const Shader& shader, bool shadow);
|
||||||
|
void render_mesh(const Mesh& mesh, bool shadow);
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
@@ -13,9 +13,7 @@ public:
|
|||||||
PlayerRenderer(Renderer& renderer);
|
PlayerRenderer(Renderer& renderer);
|
||||||
~PlayerRenderer();
|
~PlayerRenderer();
|
||||||
void init();
|
void init();
|
||||||
void render(const Shader& shader, ClientWorld& world);
|
void render(const Shader& shader, ClientWorld& world, bool shadow_render);
|
||||||
void shadow_render(const Shader& shader, glm::mat4& light_matrix,
|
|
||||||
ClientWorld& world);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct PlayerVertex {
|
struct PlayerVertex {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
#include "Cubed/constants.hpp"
|
#include "Cubed/constants.hpp"
|
||||||
#include "Cubed/input/event.hpp"
|
#include "Cubed/input/event.hpp"
|
||||||
#include "Cubed/primitive_data.hpp"
|
#include "Cubed/primitive_data.hpp"
|
||||||
|
#include "Cubed/render/model_renderer.hpp"
|
||||||
#include "Cubed/render/player_renderer.hpp"
|
#include "Cubed/render/player_renderer.hpp"
|
||||||
#include "Cubed/render/shader_manager.hpp"
|
#include "Cubed/render/shader_manager.hpp"
|
||||||
#include "Cubed/render/vertex_array.hpp"
|
#include "Cubed/render/vertex_array.hpp"
|
||||||
@@ -19,15 +20,17 @@
|
|||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
class TextureManager;
|
class TextureManager;
|
||||||
class ClientWorld;
|
class ClientWorld;
|
||||||
|
class ModelManager;
|
||||||
class DevPanel;
|
class DevPanel;
|
||||||
class Renderer {
|
class Renderer {
|
||||||
public:
|
public:
|
||||||
constexpr static int NUM_VAO = 7;
|
constexpr static int NUM_VAO = 7;
|
||||||
|
|
||||||
Renderer(TextureManager& texture_manager, Config& config);
|
Renderer(TextureManager& texture_manager, Config& config,
|
||||||
|
ModelManager& model_manager);
|
||||||
~Renderer();
|
~Renderer();
|
||||||
void reload_config();
|
void reload_config();
|
||||||
void init(bool debug_on);
|
void init();
|
||||||
const Shader& get_shader(const std::string& name) const;
|
const Shader& get_shader(const std::string& name) const;
|
||||||
void begin_frame();
|
void begin_frame();
|
||||||
void end_frame();
|
void end_frame();
|
||||||
@@ -79,9 +82,12 @@ public:
|
|||||||
|
|
||||||
bool handle_event(const Event& e);
|
bool handle_event(const Event& e);
|
||||||
|
|
||||||
|
ModelManager& model_manager();
|
||||||
|
ModelRender& model_renderer();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
TextureManager& m_texture_manager;
|
TextureManager& m_texture_manager;
|
||||||
|
ModelManager& m_model_manager;
|
||||||
bool m_init = false;
|
bool m_init = false;
|
||||||
|
|
||||||
float m_aspect = 0.0f;
|
float m_aspect = 0.0f;
|
||||||
@@ -118,6 +124,7 @@ private:
|
|||||||
std::vector<Vertex2D> m_ui;
|
std::vector<Vertex2D> m_ui;
|
||||||
|
|
||||||
WorldRenderer m_world_renderer;
|
WorldRenderer m_world_renderer;
|
||||||
|
ModelRender m_model_renderer;
|
||||||
Config& m_config;
|
Config& m_config;
|
||||||
|
|
||||||
bool handle_window_resize_event(const WindowResizeEvent& e);
|
bool handle_window_resize_event(const WindowResizeEvent& e);
|
||||||
|
|||||||
@@ -38,9 +38,11 @@ enum TextureFormat : GLenum {
|
|||||||
R8 = GL_R8,
|
R8 = GL_R8,
|
||||||
RGB = GL_RGB,
|
RGB = GL_RGB,
|
||||||
RGBA8 = GL_RGBA8,
|
RGBA8 = GL_RGBA8,
|
||||||
|
BGRA = GL_BGRA
|
||||||
|
|
||||||
};
|
};
|
||||||
|
// You need to set the texture scaling method, otherwise it will render as
|
||||||
|
// black.
|
||||||
class Texture {
|
class Texture {
|
||||||
public:
|
public:
|
||||||
explicit Texture(TextureType type);
|
explicit Texture(TextureType type);
|
||||||
@@ -82,7 +84,7 @@ public:
|
|||||||
void set_nearest() const;
|
void set_nearest() const;
|
||||||
void set_repeat(bool r = true, bool s = true, bool t = true) const;
|
void set_repeat(bool r = true, bool s = true, bool t = true) const;
|
||||||
void set_clamp_to_border(bool r = true, bool s = true, bool t = true) const;
|
void set_clamp_to_border(bool r = true, bool s = true, bool t = true) const;
|
||||||
void set_clamp_to_edge(bool r = true, bool s = true, bool t = true) const;
|
void set_clamp_to_edge(bool r = false, bool s = true, bool t = true) const;
|
||||||
|
|
||||||
TextureType type() const;
|
TextureType type() const;
|
||||||
float width() const;
|
float width() const;
|
||||||
|
|||||||
@@ -132,7 +132,8 @@ private:
|
|||||||
|
|
||||||
void render_underwater(ClientWorld& world);
|
void render_underwater(ClientWorld& world);
|
||||||
void render_outline(ClientWorld& world);
|
void render_outline(ClientWorld& world);
|
||||||
void render_player(ClientWorld& world);
|
void shadow_entity(ClientWorld& world, const glm::mat4& light_matrix);
|
||||||
|
void render_entity(ClientWorld& world);
|
||||||
|
|
||||||
void render_normal_block(const glm::mat4& model_mat,
|
void render_normal_block(const glm::mat4& model_mat,
|
||||||
const glm::mat4& mv_mat, const glm::mat4& norm_mat,
|
const glm::mat4& mv_mat, const glm::mat4& norm_mat,
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ struct SliderVariable {
|
|||||||
float mouse_sensitivity = 0.15f;
|
float mouse_sensitivity = 0.15f;
|
||||||
float sfx = 1.0f;
|
float sfx = 1.0f;
|
||||||
float music = 0.5f;
|
float music = 0.5f;
|
||||||
|
float player_voice = 1.0f;
|
||||||
int rendering_distance = 24;
|
int rendering_distance = 24;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,11 @@
|
|||||||
#include "Cubed/gameplay/network_server.hpp"
|
#include "Cubed/gameplay/network_server.hpp"
|
||||||
#include "Cubed/scene/scene.hpp"
|
#include "Cubed/scene/scene.hpp"
|
||||||
#include "Cubed/ui/error_ui.hpp"
|
#include "Cubed/ui/error_ui.hpp"
|
||||||
|
#include "Cubed/ui/inventory_ui.hpp"
|
||||||
#include "Cubed/ui/pasue_menu_ui_manager.hpp"
|
#include "Cubed/ui/pasue_menu_ui_manager.hpp"
|
||||||
#include "Cubed/ui/world_ui_manager.hpp"
|
#include "Cubed/ui/world_ui_manager.hpp"
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
enum class VoiceInputType { OFF, PTT, ALWAYS };
|
||||||
class SceneManager;
|
class SceneManager;
|
||||||
class WorldScene : public Scene {
|
class WorldScene : public Scene {
|
||||||
public:
|
public:
|
||||||
@@ -33,14 +35,15 @@ public:
|
|||||||
bool pause() const;
|
bool pause() const;
|
||||||
void set_pause(bool pause);
|
void set_pause(bool pause);
|
||||||
void set_error(std::string_view error);
|
void set_error(std::string_view error);
|
||||||
|
void set_mouse(bool pause);
|
||||||
|
void set_chatting(bool chatting, bool send);
|
||||||
|
// Not thread safe
|
||||||
|
void handle_chat_message(ChatMessage& message);
|
||||||
|
|
||||||
|
bool is_recording() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool handle_mouse_move_event(const MouseMoveEvent& e) override;
|
enum class PauseUI { PAUSE_MENU, INVENTORY };
|
||||||
bool handle_mouse_button_event(const MouseButtonEvent& e) override;
|
|
||||||
bool handle_window_resize_event(const WindowResizeEvent& e) override;
|
|
||||||
bool handle_mouse_wheel_event(const MouseWheelEvent& e) override;
|
|
||||||
bool handle_key_event(const KeyEvent& e) override;
|
|
||||||
|
|
||||||
SceneManager& m_scene_manager;
|
SceneManager& m_scene_manager;
|
||||||
DevPanel m_dev_panel;
|
DevPanel m_dev_panel;
|
||||||
Camera m_camera;
|
Camera m_camera;
|
||||||
@@ -50,9 +53,20 @@ private:
|
|||||||
bool m_paused = false;
|
bool m_paused = false;
|
||||||
bool m_show_hud = true;
|
bool m_show_hud = true;
|
||||||
bool m_show_dev_pannel = true;
|
bool m_show_dev_pannel = true;
|
||||||
|
bool m_chatting = false;
|
||||||
PauseMenuUIManager m_pasue_menu;
|
PauseMenuUIManager m_pasue_menu;
|
||||||
|
InventoryUI m_inventory_ui;
|
||||||
|
PauseUI m_paused_ui = PauseUI::PAUSE_MENU;
|
||||||
WorldUIManager m_hud_ui;
|
WorldUIManager m_hud_ui;
|
||||||
ErrorUI m_error_ui;
|
ErrorUI m_error_ui;
|
||||||
const Argument& m_argument;
|
const Argument& m_argument;
|
||||||
|
VoiceInputType m_input_type;
|
||||||
|
bool handle_mouse_move_event(const MouseMoveEvent& e) override;
|
||||||
|
bool handle_mouse_button_event(const MouseButtonEvent& e) override;
|
||||||
|
bool handle_window_resize_event(const WindowResizeEvent& e) override;
|
||||||
|
bool handle_mouse_wheel_event(const MouseWheelEvent& e) override;
|
||||||
|
bool handle_key_event(const KeyEvent& e) override;
|
||||||
|
bool handle_text_input_event(const TextInputEvent&) override;
|
||||||
|
void load_config();
|
||||||
};
|
};
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
@@ -48,9 +48,8 @@ public:
|
|||||||
const Texture* get_cross_plane_array() const;
|
const Texture* get_cross_plane_array() const;
|
||||||
const Texture* get_image_texture(const std::string& path);
|
const Texture* get_image_texture(const std::string& path);
|
||||||
const Texture* get_pbr_texture() const;
|
const Texture* get_pbr_texture() const;
|
||||||
const std::vector<std::unique_ptr<Texture>>& item_textures() const;
|
const std::vector<std::unique_ptr<Texture>>& get_item_textures() const;
|
||||||
const Texture* get_skin() const;
|
const Texture* get_skin() const;
|
||||||
// Must call after MapTable::init_map() and glfwMakeContextCurrent(window);
|
|
||||||
void init_texture();
|
void init_texture();
|
||||||
|
|
||||||
void need_reload();
|
void need_reload();
|
||||||
|
|||||||
14
include/Cubed/tools/env_tools.hpp
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
#pragma once
|
||||||
|
#include <cstdlib> // IWYU pragma: keep
|
||||||
|
namespace Cubed {
|
||||||
|
namespace Tools {
|
||||||
|
|
||||||
|
inline void set_env(const char* name, const char* value) {
|
||||||
|
#ifdef _WIN32
|
||||||
|
_putenv_s(name, value);
|
||||||
|
#else
|
||||||
|
setenv(name, value, 1);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
} // namespace Tools
|
||||||
|
} // namespace Cubed
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
#include <glm/glm.hpp>
|
#include <glm/glm.hpp>
|
||||||
|
#include <hb-ft.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
@@ -22,6 +23,16 @@ struct Character {
|
|||||||
GLuint advance;
|
GLuint advance;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct Glyph {
|
||||||
|
glm::vec2 uv_min;
|
||||||
|
glm::vec2 uv_max;
|
||||||
|
|
||||||
|
glm::ivec2 size;
|
||||||
|
glm::ivec2 bearing;
|
||||||
|
|
||||||
|
int layer = 0;
|
||||||
|
};
|
||||||
|
|
||||||
struct TextMesh {
|
struct TextMesh {
|
||||||
std::vector<Vertex2D> vertices;
|
std::vector<Vertex2D> vertices;
|
||||||
|
|
||||||
@@ -36,27 +47,33 @@ class Shader;
|
|||||||
|
|
||||||
class Font {
|
class Font {
|
||||||
public:
|
public:
|
||||||
|
static constexpr int CELL_SIZE = 64;
|
||||||
Font();
|
Font();
|
||||||
~Font();
|
~Font();
|
||||||
|
static Font& get();
|
||||||
|
|
||||||
static TextMesh vertices(const std::string& text);
|
static void destroy();
|
||||||
static const Texture* text_texture();
|
TextMesh vertices(const std::string& text);
|
||||||
|
const Texture* text_texture();
|
||||||
static const std::string& font_path();
|
static const std::string& font_path();
|
||||||
|
static float text_width(const std::string& text);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
FT_Library m_ft;
|
FT_Library m_ft;
|
||||||
FT_Face m_face;
|
FT_Face m_face;
|
||||||
|
hb_font_t* m_hb_font;
|
||||||
|
int m_next_layer = 0;
|
||||||
float m_texture_width = 64;
|
float m_texture_width = 64;
|
||||||
float m_texture_height = 64;
|
float m_texture_height = 64;
|
||||||
|
|
||||||
static inline std::unique_ptr<Texture> m_text_texture;
|
std::unique_ptr<Texture> m_text_texture;
|
||||||
static inline std::string m_font_path{ASSETS_PATH
|
static inline std::string m_font_path{ASSETS_PATH
|
||||||
"fonts/IBMPlexSans-Regular.ttf"};
|
"fonts/unifont_t-17.0.05.otf"};
|
||||||
std::unordered_map<char8_t, Character> m_characters;
|
std::unordered_map<uint32_t, Glyph> m_cache;
|
||||||
|
int m_max_layers = 0;
|
||||||
void load_character(char8_t c);
|
Glyph& load_glyph(uint32_t glyph_index);
|
||||||
void setup_font_character();
|
void upload_glyph(Glyph& glyph, const unsigned char* buffer);
|
||||||
|
static std::unique_ptr<Font>& get_ptr();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
@@ -1,85 +1,184 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include <atomic>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <filesystem>
|
||||||
#include <format>
|
#include <format>
|
||||||
|
#include <fstream>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <source_location>
|
#include <memory>
|
||||||
|
#include <mutex>
|
||||||
|
#include <print>
|
||||||
|
#include <shared_mutex>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <syncstream>
|
#include <syncstream>
|
||||||
|
#include <utility>
|
||||||
|
#ifdef DEBUG
|
||||||
|
#undef DEBUG
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef INFO
|
||||||
|
#undef INFO
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ERROR
|
||||||
|
#undef ERROR
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef WARN
|
||||||
|
#undef WARN
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
|
|
||||||
namespace Logger {
|
class Logger {
|
||||||
enum class Level { L_TRACE, L_DEBUG, L_INFO, L_ERROR, L_WARN };
|
public:
|
||||||
|
enum class Level { DEBUG = 0, INFO = 1, WARN = 2, ERROR = 3 };
|
||||||
|
static constexpr Level get_level(int i) {
|
||||||
|
switch (i) {
|
||||||
|
case std::to_underlying(Level::DEBUG):
|
||||||
|
return Level::DEBUG;
|
||||||
|
|
||||||
template <typename... Args>
|
case std::to_underlying(Level::INFO):
|
||||||
inline void info(std::format_string<Args...> fmt, Args&&... args) {
|
return Level::INFO;
|
||||||
auto now_time = std::chrono::time_point_cast<std::chrono::seconds>(
|
case std::to_underlying(Level::WARN):
|
||||||
std::chrono::system_clock::now());
|
return Level::WARN;
|
||||||
|
case std::to_underlying(Level::ERROR):
|
||||||
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
|
return Level::ERROR;
|
||||||
std::osyncstream(std::cout)
|
default:
|
||||||
<< "\033[1;32m" << std::format("[INFO][{:%Y-%m-%d %H:%M:%S}]", now_time)
|
return Level::INFO;
|
||||||
<< msg << "\033[0m"
|
}
|
||||||
<< "\n";
|
}
|
||||||
}
|
Logger() { m_file_stream = std::make_unique<std::ofstream>(); }
|
||||||
|
~Logger() { m_file_stream.reset(); }
|
||||||
template <typename... Args>
|
static Logger& instance() {
|
||||||
inline void error(std::format_string<Args...> fmt, Args&&... args) {
|
static Logger inst;
|
||||||
auto now_time = std::chrono::time_point_cast<std::chrono::seconds>(
|
return inst;
|
||||||
std::chrono::system_clock::now());
|
}
|
||||||
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
|
static void set_level(Level level) { instance().m_level = level; }
|
||||||
std::osyncstream(std::cerr)
|
static void set_console_write(bool write) {
|
||||||
<< "\033[1;31m"
|
instance().m_console_write = write;
|
||||||
<< std::format("[ERROR][{:%Y-%m-%d %H:%M:%S}]", now_time) << msg
|
|
||||||
<< "\033[0m"
|
|
||||||
<< "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename... Args>
|
|
||||||
inline void warn(std::format_string<Args...> fmt, Args&&... args) {
|
|
||||||
auto now_time = std::chrono::time_point_cast<std::chrono::seconds>(
|
|
||||||
std::chrono::system_clock::now());
|
|
||||||
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
|
|
||||||
std::osyncstream(std::cout)
|
|
||||||
<< "\033[1;33m" << std::format("[WARN][{:%Y-%m-%d %H:%M:%S}]", now_time)
|
|
||||||
<< msg << "\033[0m"
|
|
||||||
<< "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename... Args>
|
|
||||||
inline void log(Level level, std::source_location loc,
|
|
||||||
std::format_string<Args...> fmt, Args&&... args) {
|
|
||||||
auto now_time = std::chrono::time_point_cast<std::chrono::seconds>(
|
|
||||||
std::chrono::system_clock::now());
|
|
||||||
std::string msg = std::vformat(fmt.get(), std::make_format_args(args...));
|
|
||||||
switch (level) {
|
|
||||||
case Logger::Level::L_TRACE:
|
|
||||||
std::osyncstream(std::cout)
|
|
||||||
<< "\033[1;34m"
|
|
||||||
<< std::format("[TRACE][{:%Y-%m-%d %H:%M:%S}]", now_time) << "["
|
|
||||||
<< loc.file_name() << ":" << loc.line() << "]"
|
|
||||||
<< "[" << loc.function_name() << "]" << msg << "\033[0m"
|
|
||||||
<< "\n";
|
|
||||||
break;
|
|
||||||
case Logger::Level::L_DEBUG:
|
|
||||||
std::osyncstream(std::cout)
|
|
||||||
<< "\033[1;34m"
|
|
||||||
<< std::format("[DEBUG][{:%Y-%m-%d %H:%M:%S}]", now_time) << msg
|
|
||||||
<< "\033[0m"
|
|
||||||
<< "\n";
|
|
||||||
break;
|
|
||||||
case Logger::Level::L_INFO:
|
|
||||||
info(fmt, std::forward<Args>(args)...);
|
|
||||||
break;
|
|
||||||
case Logger::Level::L_WARN:
|
|
||||||
warn(fmt, std::forward<Args>(args)...);
|
|
||||||
break;
|
|
||||||
case Logger::Level::L_ERROR:
|
|
||||||
error(fmt, std::forward<Args>(args)...);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Logger
|
static void set_file_write(bool write) { instance().m_file_write = write; }
|
||||||
|
|
||||||
|
static void set_logs_path(const std::string& path) {
|
||||||
|
std::unique_lock lock(instance().m_mutex);
|
||||||
|
instance().m_logs_path = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename... Args>
|
||||||
|
static void info(std::format_string<Args...> fmt, Args&&... args) {
|
||||||
|
instance().log(Level::INFO, fmt, std::forward<Args>(args)...);
|
||||||
|
}
|
||||||
|
template <typename... Args>
|
||||||
|
static void error(std::format_string<Args...> fmt, Args&&... args) {
|
||||||
|
instance().log(Level::ERROR, fmt, std::forward<Args>(args)...);
|
||||||
|
}
|
||||||
|
template <typename... Args>
|
||||||
|
static void warn(std::format_string<Args...> fmt, Args&&... args) {
|
||||||
|
instance().log(Level::WARN, fmt, std::forward<Args>(args)...);
|
||||||
|
}
|
||||||
|
template <typename... Args>
|
||||||
|
static void debug(std::format_string<Args...> fmt, Args&&... args) {
|
||||||
|
instance().log(Level::DEBUG, fmt, std::forward<Args>(args)...);
|
||||||
|
}
|
||||||
|
template <typename... Args>
|
||||||
|
void log(Level level, std::format_string<Args...> fmt, Args&&... args) {
|
||||||
|
auto now_time = std::chrono::time_point_cast<std::chrono::seconds>(
|
||||||
|
std::chrono::system_clock::now());
|
||||||
|
if (level < m_level) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto msg = std::format(fmt, std::forward<Args>(args)...);
|
||||||
|
std::string_view level_str;
|
||||||
|
std::string_view color;
|
||||||
|
switch (level) {
|
||||||
|
case Level::INFO:
|
||||||
|
color = INFO_ANSI;
|
||||||
|
level_str = "[INFO]";
|
||||||
|
break;
|
||||||
|
case Level::ERROR:
|
||||||
|
color = ERROR_ANSI;
|
||||||
|
level_str = "[ERROR]";
|
||||||
|
break;
|
||||||
|
case Level::WARN:
|
||||||
|
color = WARN_ANSI;
|
||||||
|
level_str = "[WARN]";
|
||||||
|
break;
|
||||||
|
case Level::DEBUG:
|
||||||
|
color = DEBUG_ANSI;
|
||||||
|
level_str = "[DEBUG]";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
std::string message =
|
||||||
|
std::format("{}[{:%Y-%m-%d %H:%M:%S}]{}", level_str, now_time, msg);
|
||||||
|
|
||||||
|
if (m_file_write) {
|
||||||
|
|
||||||
|
std::shared_lock lock{m_mutex};
|
||||||
|
auto today = std::chrono::floor<std::chrono::days>(
|
||||||
|
std::chrono::system_clock::now());
|
||||||
|
auto date = std::chrono::year_month_day{today};
|
||||||
|
|
||||||
|
if (!m_today.ok() || date > m_today) {
|
||||||
|
lock.unlock();
|
||||||
|
std::unique_lock l(m_mutex);
|
||||||
|
|
||||||
|
auto today = std::chrono::floor<std::chrono::days>(
|
||||||
|
std::chrono::system_clock::now());
|
||||||
|
auto date = std::chrono::year_month_day{today};
|
||||||
|
|
||||||
|
if (!m_today.ok() || date > m_today) {
|
||||||
|
m_today = date;
|
||||||
|
try {
|
||||||
|
std::filesystem::create_directories(m_logs_path);
|
||||||
|
m_file_stream->close();
|
||||||
|
std::filesystem::path log =
|
||||||
|
m_logs_path / std::format("{:%Y-%m-%d}.log", date);
|
||||||
|
m_file_stream->open(log, std::ios::app);
|
||||||
|
if (!m_file_stream->is_open()) {
|
||||||
|
std::osyncstream(std::cerr)
|
||||||
|
<< "File Stream Open Error\n";
|
||||||
|
}
|
||||||
|
// direct write
|
||||||
|
if (m_file_stream && m_file_stream->is_open()) {
|
||||||
|
std::osyncstream sync_out{*m_file_stream};
|
||||||
|
std::println(sync_out, "{}", message);
|
||||||
|
}
|
||||||
|
} catch (const std::exception& e) {
|
||||||
|
std::osyncstream(std::cerr)
|
||||||
|
<< "Catch Logger Error " << e.what() << "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (m_file_stream && m_file_stream->is_open()) {
|
||||||
|
std::osyncstream sync_out{*m_file_stream};
|
||||||
|
std::println(sync_out, "{}", message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (m_console_write) {
|
||||||
|
std::osyncstream sync_out(level == Level::ERROR ? std::cerr
|
||||||
|
: std::cout);
|
||||||
|
std::println(sync_out, "{}{}{}", color, message, CLEAR_ANSI);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static constexpr std::string_view CLEAR_ANSI = "\033[0m";
|
||||||
|
static constexpr std::string_view INFO_ANSI = "\033[1;32m";
|
||||||
|
static constexpr std::string_view ERROR_ANSI = "\033[1;31m";
|
||||||
|
static constexpr std::string_view DEBUG_ANSI = "\033[1;34m";
|
||||||
|
static constexpr std::string_view WARN_ANSI = "\033[1;33m";
|
||||||
|
std::filesystem::path m_logs_path{"logs"};
|
||||||
|
std::shared_mutex m_mutex;
|
||||||
|
std::atomic<bool> m_file_write{false};
|
||||||
|
std::atomic<bool> m_console_write{true};
|
||||||
|
std::atomic<Level> m_level{Level::INFO};
|
||||||
|
std::chrono::year_month_day m_today{};
|
||||||
|
std::unique_ptr<std::ofstream> m_file_stream;
|
||||||
|
};
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
|
|||||||
22
include/Cubed/tools/model_loader.hpp
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
#pragma once
|
||||||
|
#include "Cubed/render/model_node.hpp"
|
||||||
|
|
||||||
|
#include <assimp/Importer.hpp>
|
||||||
|
#include <assimp/scene.h>
|
||||||
|
namespace Cubed {
|
||||||
|
|
||||||
|
class ModelLoader {
|
||||||
|
public:
|
||||||
|
ModelLoader();
|
||||||
|
ModelNode load(const std::string& path);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Assimp::Importer m_importer;
|
||||||
|
ModelNode process_node(aiNode* node, const aiScene* scene);
|
||||||
|
Mesh process_mesh(aiMesh* mesh, const aiScene* scene);
|
||||||
|
bool process_texture(Mesh& mesh, aiMaterial* material, const aiScene* scene,
|
||||||
|
aiTextureType type);
|
||||||
|
glm::mat4 convert_matrix(const aiMatrix4x4& matrix);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
78
include/Cubed/tools/net_error.hpp
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <asio/error.hpp>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
namespace Cubed {
|
||||||
|
|
||||||
|
inline std::string_view net_error_message(const asio::error_code& ec) {
|
||||||
|
if (!ec)
|
||||||
|
return "No error.";
|
||||||
|
|
||||||
|
#define NET_CASE(err, msg) \
|
||||||
|
if (ec == asio::error::err) { \
|
||||||
|
return msg; \
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== basic_errors =====
|
||||||
|
|
||||||
|
NET_CASE(access_denied, "Access denied.")
|
||||||
|
NET_CASE(address_family_not_supported, "Address family is not supported.")
|
||||||
|
NET_CASE(address_in_use, "Address is already in use.")
|
||||||
|
NET_CASE(already_connected, "Already connected.")
|
||||||
|
NET_CASE(already_started, "Operation already in progress.")
|
||||||
|
NET_CASE(broken_pipe, "Broken pipe.")
|
||||||
|
NET_CASE(connection_aborted, "Connection aborted.")
|
||||||
|
NET_CASE(connection_refused, "Connection refused by the remote host.")
|
||||||
|
NET_CASE(connection_reset, "Connection reset by the remote host.")
|
||||||
|
NET_CASE(bad_descriptor, "Invalid socket or file descriptor.")
|
||||||
|
NET_CASE(fault, "Bad memory address.")
|
||||||
|
NET_CASE(host_unreachable, "Host is unreachable.")
|
||||||
|
NET_CASE(in_progress, "Operation is in progress.")
|
||||||
|
NET_CASE(interrupted, "Operation interrupted.")
|
||||||
|
NET_CASE(invalid_argument, "Invalid argument.")
|
||||||
|
NET_CASE(message_size, "Message is too large.")
|
||||||
|
NET_CASE(name_too_long, "Name is too long.")
|
||||||
|
NET_CASE(network_down, "Network is down.")
|
||||||
|
NET_CASE(network_reset, "Network connection was reset.")
|
||||||
|
NET_CASE(network_unreachable, "Network is unreachable.")
|
||||||
|
NET_CASE(no_descriptors, "Too many open sockets or files.")
|
||||||
|
NET_CASE(no_buffer_space, "No buffer space available.")
|
||||||
|
NET_CASE(no_memory, "Out of memory.")
|
||||||
|
NET_CASE(no_permission, "Operation not permitted.")
|
||||||
|
NET_CASE(no_protocol_option, "Protocol option is unavailable.")
|
||||||
|
NET_CASE(no_such_device, "No such device.")
|
||||||
|
NET_CASE(not_connected, "Socket is not connected.")
|
||||||
|
NET_CASE(not_socket, "Object is not a socket.")
|
||||||
|
NET_CASE(operation_aborted, "Operation cancelled.")
|
||||||
|
NET_CASE(operation_not_supported, "Operation is not supported.")
|
||||||
|
NET_CASE(shut_down, "Connection has been shut down.")
|
||||||
|
NET_CASE(timed_out, "Operation timed out.")
|
||||||
|
NET_CASE(try_again, "Temporary failure. Please try again.")
|
||||||
|
NET_CASE(would_block, "Operation would block.")
|
||||||
|
|
||||||
|
// ===== netdb_errors =====
|
||||||
|
|
||||||
|
NET_CASE(host_not_found, "Host could not be resolved.")
|
||||||
|
NET_CASE(host_not_found_try_again, "Temporary DNS resolution failure.")
|
||||||
|
NET_CASE(no_data, "No address data available.")
|
||||||
|
NET_CASE(no_recovery, "Non-recoverable DNS error.")
|
||||||
|
|
||||||
|
// ===== addrinfo_errors =====
|
||||||
|
|
||||||
|
NET_CASE(service_not_found, "Requested service was not found.")
|
||||||
|
NET_CASE(socket_type_not_supported, "Socket type is not supported.")
|
||||||
|
|
||||||
|
// ===== misc_errors =====
|
||||||
|
|
||||||
|
NET_CASE(already_open, "Resource is already open.")
|
||||||
|
NET_CASE(eof, "Connection closed by the remote host.")
|
||||||
|
NET_CASE(not_found, "Requested item was not found.")
|
||||||
|
NET_CASE(fd_set_failure, "Too many descriptors for select().")
|
||||||
|
|
||||||
|
#undef NET_CASE
|
||||||
|
|
||||||
|
return "Unknown network error.";
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
24
include/Cubed/tools/sensitive_filter.hpp
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <nlohmann/json.hpp>
|
||||||
|
namespace Cubed {
|
||||||
|
class SensitiveFilter {
|
||||||
|
public:
|
||||||
|
SensitiveFilter();
|
||||||
|
void load(const nlohmann::json& j);
|
||||||
|
std::string filter(std::string_view text);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void insert(const std::u32string& world);
|
||||||
|
void build();
|
||||||
|
|
||||||
|
struct Node {
|
||||||
|
std::unordered_map<char32_t, int> next;
|
||||||
|
int fail = 0;
|
||||||
|
size_t length = 0;
|
||||||
|
bool end = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::vector<Node> trie{1};
|
||||||
|
};
|
||||||
|
} // namespace Cubed
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <SOIL2.h>
|
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
@@ -48,7 +47,7 @@ bool check_opengl_error();
|
|||||||
std::string read_shader_source(const std::string& file_path);
|
std::string read_shader_source(const std::string& file_path);
|
||||||
|
|
||||||
ImageData load_image_data(const std::string& tex_image_path,
|
ImageData load_image_data(const std::string& tex_image_path,
|
||||||
bool check_exist = true);
|
bool check_exist = true, bool full_path = false);
|
||||||
|
|
||||||
} // namespace Tools
|
} // namespace Tools
|
||||||
|
|
||||||
|
|||||||
318
include/Cubed/tools/sparse_vector.hpp
Normal file
@@ -0,0 +1,318 @@
|
|||||||
|
#pragma once
|
||||||
|
#include <cassert>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <iterator>
|
||||||
|
#include <optional>
|
||||||
|
#include <utility>
|
||||||
|
#include <vector>
|
||||||
|
namespace Cubed {
|
||||||
|
template <typename T> class SparseVector {
|
||||||
|
private:
|
||||||
|
std::vector<std::optional<T>> m_data;
|
||||||
|
std::vector<uint32_t> m_free_list;
|
||||||
|
std::vector<uint32_t> m_generation;
|
||||||
|
|
||||||
|
std::vector<uint32_t> m_dense;
|
||||||
|
std::vector<uint32_t> m_dense_index;
|
||||||
|
|
||||||
|
public:
|
||||||
|
struct Handle {
|
||||||
|
uint32_t index;
|
||||||
|
uint32_t generation;
|
||||||
|
|
||||||
|
uint64_t value() const noexcept {
|
||||||
|
return (uint64_t(index) << 32) | generation;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator==(const Handle&) const = default;
|
||||||
|
|
||||||
|
struct Hash {
|
||||||
|
size_t operator()(const Handle& h) const noexcept {
|
||||||
|
return h.value();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
using value_type = T;
|
||||||
|
using reference = T&;
|
||||||
|
using const_reference = const T&;
|
||||||
|
using pointer = T*;
|
||||||
|
|
||||||
|
using size_type = size_t;
|
||||||
|
|
||||||
|
class iterator { // NOLINT
|
||||||
|
private:
|
||||||
|
SparseVector* m_owner;
|
||||||
|
size_t m_index;
|
||||||
|
|
||||||
|
public:
|
||||||
|
using iterator_category = std::random_access_iterator_tag;
|
||||||
|
using iterator_concept = std::random_access_iterator_tag;
|
||||||
|
using value_type = T;
|
||||||
|
using difference_type = std::ptrdiff_t;
|
||||||
|
using pointer = T*;
|
||||||
|
using reference = T&;
|
||||||
|
|
||||||
|
iterator(SparseVector* owner, size_t index)
|
||||||
|
: m_owner(owner), m_index(index) {}
|
||||||
|
|
||||||
|
reference operator*() {
|
||||||
|
return m_owner->m_data[m_owner->m_dense[m_index]].value();
|
||||||
|
}
|
||||||
|
|
||||||
|
pointer operator->() { return &(**this); }
|
||||||
|
|
||||||
|
iterator& operator++() {
|
||||||
|
++m_index;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator operator++(int) {
|
||||||
|
iterator tmp = *this;
|
||||||
|
++(*this);
|
||||||
|
return tmp;
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator& operator--() {
|
||||||
|
--m_index;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator operator--(int) {
|
||||||
|
iterator tmp = *this;
|
||||||
|
--(*this);
|
||||||
|
return tmp;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator==(const iterator& other) const {
|
||||||
|
return m_owner == other.m_owner && m_index == other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator!=(const iterator& other) const {
|
||||||
|
return !(*this == other);
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator operator+(difference_type n) const {
|
||||||
|
return iterator(m_owner, m_index + n);
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator operator-(difference_type n) const {
|
||||||
|
return iterator(m_owner, m_index - n);
|
||||||
|
}
|
||||||
|
|
||||||
|
difference_type operator-(const iterator& other) const {
|
||||||
|
return static_cast<difference_type>(m_index) -
|
||||||
|
static_cast<difference_type>(other.m_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator& operator+=(difference_type n) {
|
||||||
|
m_index += n;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator& operator-=(difference_type n) {
|
||||||
|
m_index -= n;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
reference operator[](difference_type n) const { return *(*this + n); }
|
||||||
|
|
||||||
|
bool operator<(const iterator& other) const {
|
||||||
|
return m_index < other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator>(const iterator& other) const {
|
||||||
|
return m_index > other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator<=(const iterator& other) const {
|
||||||
|
return m_index <= other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator>=(const iterator& other) const {
|
||||||
|
return m_index >= other.m_index;
|
||||||
|
}
|
||||||
|
friend iterator operator+(difference_type n, const iterator& it) {
|
||||||
|
return it + n;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class const_iterator { // NOLINT
|
||||||
|
private:
|
||||||
|
const SparseVector* m_owner;
|
||||||
|
size_t m_index;
|
||||||
|
|
||||||
|
public:
|
||||||
|
using iterator_category = std::random_access_iterator_tag;
|
||||||
|
using iterator_concept = std::random_access_iterator_tag;
|
||||||
|
using value_type = T;
|
||||||
|
using difference_type = std::ptrdiff_t;
|
||||||
|
using pointer = const T*;
|
||||||
|
using reference = const T&;
|
||||||
|
|
||||||
|
const_iterator(const SparseVector* owner, size_t index)
|
||||||
|
: m_owner(owner), m_index(index) {}
|
||||||
|
|
||||||
|
reference operator*() const {
|
||||||
|
return m_owner->m_data[m_owner->m_dense[m_index]].value();
|
||||||
|
}
|
||||||
|
|
||||||
|
pointer operator->() const { return &(**this); }
|
||||||
|
|
||||||
|
const_iterator& operator++() {
|
||||||
|
++m_index;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator operator++(int) {
|
||||||
|
const_iterator tmp = *this;
|
||||||
|
++(*this);
|
||||||
|
return tmp;
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator& operator--() {
|
||||||
|
--m_index;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator operator--(int) {
|
||||||
|
const_iterator tmp = *this;
|
||||||
|
--(*this);
|
||||||
|
return tmp;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator==(const const_iterator& other) const {
|
||||||
|
return m_owner == other.m_owner && m_index == other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator!=(const const_iterator& other) const {
|
||||||
|
return !(*this == other);
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator operator+(difference_type n) const {
|
||||||
|
return const_iterator(m_owner, m_index + n);
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator operator-(difference_type n) const {
|
||||||
|
return const_iterator(m_owner, m_index - n);
|
||||||
|
}
|
||||||
|
|
||||||
|
difference_type operator-(const const_iterator& other) const {
|
||||||
|
return static_cast<difference_type>(m_index) -
|
||||||
|
static_cast<difference_type>(other.m_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator& operator+=(difference_type n) {
|
||||||
|
m_index += n;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator& operator-=(difference_type n) {
|
||||||
|
m_index -= n;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
reference operator[](difference_type n) const { return *(*this + n); }
|
||||||
|
|
||||||
|
bool operator<(const const_iterator& other) const {
|
||||||
|
return m_index < other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator>(const const_iterator& other) const {
|
||||||
|
return m_index > other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator<=(const const_iterator& other) const {
|
||||||
|
return m_index <= other.m_index;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator>=(const const_iterator& other) const {
|
||||||
|
return m_index >= other.m_index;
|
||||||
|
}
|
||||||
|
friend const_iterator operator+(difference_type n,
|
||||||
|
const const_iterator& it) {
|
||||||
|
return it + n;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <class U> Handle insert(U&& value) {
|
||||||
|
uint32_t id;
|
||||||
|
if (!m_free_list.empty()) {
|
||||||
|
id = m_free_list.back();
|
||||||
|
m_free_list.pop_back();
|
||||||
|
m_data[id].emplace(std::forward<U>(value));
|
||||||
|
|
||||||
|
m_dense_index[id] = m_dense.size();
|
||||||
|
} else {
|
||||||
|
id = m_data.size();
|
||||||
|
m_data.push_back(std::forward<U>(value));
|
||||||
|
m_generation.push_back(1);
|
||||||
|
m_dense_index.emplace_back(m_dense.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
m_dense.push_back(id);
|
||||||
|
return {id, m_generation[id]};
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename... Args> Handle emplace(Args&&... args) {
|
||||||
|
return insert(T(std::forward<Args>(args)...));
|
||||||
|
}
|
||||||
|
|
||||||
|
void erase(Handle h) {
|
||||||
|
|
||||||
|
if (!exists(h)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint32_t id = h.index;
|
||||||
|
m_free_list.push_back(id);
|
||||||
|
uint32_t index = m_dense_index[id];
|
||||||
|
uint32_t last_id = m_dense.back();
|
||||||
|
m_dense[index] = last_id;
|
||||||
|
m_dense_index[last_id] = index;
|
||||||
|
|
||||||
|
m_dense.pop_back();
|
||||||
|
m_data[id].reset();
|
||||||
|
++m_generation[id];
|
||||||
|
}
|
||||||
|
|
||||||
|
T& operator[](Handle h) {
|
||||||
|
assert(exists(h));
|
||||||
|
return m_data[h.index].value();
|
||||||
|
}
|
||||||
|
|
||||||
|
const T& operator[](Handle h) const {
|
||||||
|
assert(exists(h));
|
||||||
|
return m_data[h.index].value();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool exists(Handle h) const {
|
||||||
|
return h.index < m_generation.size() &&
|
||||||
|
m_generation[h.index] == h.generation;
|
||||||
|
}
|
||||||
|
|
||||||
|
void reserve(size_t n) {
|
||||||
|
m_data.reserve(n);
|
||||||
|
m_generation.reserve(n);
|
||||||
|
m_dense.reserve(n);
|
||||||
|
m_dense_index.reserve(n);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t size() const { return m_dense.size(); }
|
||||||
|
|
||||||
|
bool empty() const { return m_dense.empty(); }
|
||||||
|
|
||||||
|
iterator begin() { return iterator(this, 0); }
|
||||||
|
|
||||||
|
iterator end() { return iterator(this, m_dense.size()); }
|
||||||
|
|
||||||
|
const_iterator begin() const { return const_iterator(this, 0); }
|
||||||
|
|
||||||
|
const_iterator end() const { return const_iterator(this, m_dense.size()); }
|
||||||
|
|
||||||
|
const_iterator cbegin() const { return begin(); }
|
||||||
|
|
||||||
|
const_iterator cend() const { return end(); }
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Cubed/tools/log.hpp"
|
#include "Cubed/tools/log.hpp" // IWYU pragma: keep
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
@@ -157,6 +157,46 @@ inline std::string get_cpu_info() {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline std::string get_compiler_info() {
|
||||||
|
std::string result;
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
result = "Clang ";
|
||||||
|
result += __clang_version__;
|
||||||
|
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
result = "GCC ";
|
||||||
|
result += std::to_string(__GNUC__);
|
||||||
|
result += ".";
|
||||||
|
result += std::to_string(__GNUC_MINOR__);
|
||||||
|
result += ".";
|
||||||
|
result += std::to_string(__GNUC_PATCHLEVEL__);
|
||||||
|
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
|
int major = _MSC_VER / 100;
|
||||||
|
int minor = _MSC_VER % 100;
|
||||||
|
|
||||||
|
result = "MSVC ";
|
||||||
|
result += std::to_string(major);
|
||||||
|
result += ".";
|
||||||
|
result += std::to_string(minor);
|
||||||
|
|
||||||
|
#else
|
||||||
|
result = "Unknown Compiler";
|
||||||
|
#endif
|
||||||
|
constexpr long CPP_VERSION =
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
_MSVC_LANG;
|
||||||
|
#else
|
||||||
|
__cplusplus;
|
||||||
|
#endif
|
||||||
|
result += " (C++";
|
||||||
|
result += std::to_string(CPP_VERSION);
|
||||||
|
result += ")";
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Tools
|
} // namespace Tools
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
|
|||||||
13
include/Cubed/tools/system_locate.hpp
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace Cubed {
|
||||||
|
struct SystemLocale {
|
||||||
|
std::string country; // CN、US、JP...
|
||||||
|
std::string locale; // zh_CN、en_US...
|
||||||
|
};
|
||||||
|
|
||||||
|
SystemLocale get_system_locale();
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
28
include/Cubed/tools/system_window_manager.hpp
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Cubed/tools/log.hpp"
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <string>
|
||||||
|
namespace Cubed {
|
||||||
|
|
||||||
|
namespace Tools {
|
||||||
|
inline std::string detect_wm() {
|
||||||
|
#ifdef _WIN32
|
||||||
|
return "Windows";
|
||||||
|
#endif
|
||||||
|
#ifdef __linux__
|
||||||
|
|
||||||
|
const char* desktop = getenv("XDG_CURRENT_DESKTOP");
|
||||||
|
if (!desktop) {
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
Logger::info("XDG_CURRENT_DESKTOP: {}", desktop);
|
||||||
|
return std::string(desktop);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
} // namespace Tools
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#include "Cubed/tools/cubed_assert.hpp"
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <utf8cpp/utf8.h>
|
||||||
|
#include <vector>
|
||||||
namespace Cubed {
|
namespace Cubed {
|
||||||
inline std::string codepoint_to_utf8(uint32_t cp) {
|
inline std::string codepoint_to_utf8(uint32_t cp) {
|
||||||
std::string out;
|
std::string out;
|
||||||
@@ -38,4 +42,28 @@ inline void utf8_pop_back(std::string& str) {
|
|||||||
str.erase(i);
|
str.erase(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline std::vector<std::string> split_utf8(const std::string& str, int size) {
|
||||||
|
ASSERT(size > 0);
|
||||||
|
if (!utf8::is_valid(str)) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
std::vector<std::string> blocks;
|
||||||
|
auto cur = str.begin();
|
||||||
|
int chat_count = 0;
|
||||||
|
|
||||||
|
for (auto it = str.begin(); it != str.end();) {
|
||||||
|
if (chat_count >= size) {
|
||||||
|
blocks.emplace_back(cur, it);
|
||||||
|
cur = it;
|
||||||
|
chat_count = 0;
|
||||||
|
}
|
||||||
|
utf8::next(it, str.end());
|
||||||
|
++chat_count;
|
||||||
|
if (it == str.end()) {
|
||||||
|
blocks.emplace_back(cur, it);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return blocks;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
10
include/Cubed/tools/time_tools.hpp
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <SDL3/SDL_timer.h>
|
||||||
|
#include <cstdint>
|
||||||
|
namespace Cubed {
|
||||||
|
namespace Tools {
|
||||||
|
inline uint64_t get_time_ticks() { return SDL_GetTicks(); }
|
||||||
|
} // namespace Tools
|
||||||
|
|
||||||
|
} // namespace Cubed
|
||||||
@@ -29,6 +29,12 @@ std::optional<T> safe_get_value(const toml::table& table, std::string_view key,
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline std::optional<std::string>
|
||||||
|
safe_get_value(const toml::table& table, std::string_view key,
|
||||||
|
std::string_view default_value) {
|
||||||
|
return safe_get_value(table, key, std::string(default_value));
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace TOML
|
} // namespace TOML
|
||||||
|
|
||||||
} // namespace Cubed
|
} // namespace Cubed
|
||||||
|
|||||||
@@ -12,4 +12,7 @@ enum class Anchor {
|
|||||||
BOTTOM_LEFT,
|
BOTTOM_LEFT,
|
||||||
BOTTOM_CENTER,
|
BOTTOM_CENTER,
|
||||||
BOTTOM_RIGHT,
|
BOTTOM_RIGHT,
|
||||||
|
|
||||||
|
FOLLOW_MOUSE
|
||||||
|
|
||||||
};
|
};
|
||||||