Skip to content

Commit

Permalink
Merge branch 'releases/0-1-0'
Browse files Browse the repository at this point in the history
  • Loading branch information
VladimirBalun committed Mar 3, 2019
2 parents c942cee + 579eb00 commit 069b8dc
Show file tree
Hide file tree
Showing 250 changed files with 27,690 additions and 3 deletions.
38 changes: 38 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Copyright 2018 Vladimir Balun
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

image: Visual Studio 2017

matrix:
fast_finish: false

platform:
- x64
- x86

clone_folder: c:\projects\RacingWorld

environment:
matrix:
- TOOLCHAIN: msvc15
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

build_script:
- cd c:\projects\RacingWorld\ClientSide
- if "%platform%" equ "x86" (cmake CMakeLists.txt -G "Visual Studio 15 2017")
- if "%platform%" equ "x64" (cmake CMakeLists.txt -G "Visual Studio 15 2017 Win64")
- if "%platform%" equ "x86" (msbuild /m /p:Configuration=Release /p:Platform="Win32" RacingWorld.sln)
- if "%platform%" equ "x64" (msbuild /m /p:Configuration=Debug /p:Platform="x64" RacingWorld.sln)
- if "%platform%" equ "x86" (msbuild /m /p:Configuration=Release /p:Platform="Win32" RacingWorld.sln)
- if "%platform%" equ "x64" (msbuild /m /p:Configuration=Debug /p:Platform="x64" RacingWorld.sln)
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ServerSide/.idea/*

ClientSide/Build/*
ClientSide/Bin/*
ClientSide/Libs/*
25 changes: 25 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2018 Vladimir Balun
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

sudo: required

language: java

script:
- cd Scripts
- chmod +x BuildServerSide.sh
- ./BuildServerSide.sh

os:
- linux
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Vladimir Balun(VladimirBalun)
Denis Bobarenko(Den3D)
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
### Release 0.1.0

* created game server;
* added ECS base structure for game server;
* added custom simple math and physic modules for game server;
* added a large number of different tests for game server;
* created game client;
* added custom allocators and global memory managment;
* added custom math module for work with graphic on client;
* added basic structure of Scene Graph for game client;
* added custom primitive renderer for game client;
* added simple movement around the scene;
* created binary protocol between client and server;
* created primitive interaction client with game server;
* created some scripts for automatic building and running game client and server;
* added automatic CI tools for game client and server;
* added tools for creating installer for all project.
56 changes: 56 additions & 0 deletions ClientSide/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# Copyright 2018 Vladimir Balun
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

cmake_minimum_required (VERSION 3.10)

project (RacingWorld)

set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")

set_property (GLOBAL PROPERTY USE_FOLDERS ON)

set (PROJECT_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set (PROJECT_BUILD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Build)
set (PROJECT_BIN_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Bin)
set (PROJECT_DEPENDENCIES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Dependencies)

file (GLOB_RECURSE SOURCES "Sources/*.cpp" "Sources/*.hpp")

foreach(FILE ${SOURCES})
get_filename_component(PARENT_DIR "${FILE}" DIRECTORY)
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}" "" GROUP "${PARENT_DIR}")
string(REPLACE "/" "\\" GROUP "${GROUP}")

if ("${FILE}" MATCHES ".*\\.cpp")
set(GROUP "${GROUP}")
elseif("${FILE}" MATCHES ".*\\.hpp")
set(GROUP "${GROUP}")
endif()

source_group("${GROUP}" FILES "${FILE}")
endforeach()

add_executable (${PROJECT_NAME} WIN32 ${SOURCES})
target_link_libraries (${PROJECT_NAME} wsock32.lib opengl32.lib)
target_include_directories (${PROJECT_NAME} PRIVATE ${PROJECT_DEPENDENCIES_DIR}/OpenGL/Include)
set_target_properties (${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BIN_DIR})
set_target_properties (${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BIN_DIR})
set_target_properties (${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BIN_DIR})
set_target_properties (${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY ${PROJECT_BIN_DIR})

include (CPack.cmake)
36 changes: 36 additions & 0 deletions ClientSide/CPack.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#
# Copyright 2018 Vladimir Balun
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

cmake_minimum_required (VERSION 3.10)

include(InstallRequiredSystemLibraries)

install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Bin)
install (FILES ../ServerSide/gameserver/target/GameServer.jar DESTINATION Bin)
install (DIRECTORY ./Resources DESTINATION ./)

set (CPACK_GENERATOR NSIS)
set (CPACK_PACKAGE_NAME "RacingWorld")
set (CPACK_PACKAGE_VENDOR "Vladimir Balun")
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "RacingWorld - is a multiplayer online 3D game about racing.")
set (CPACK_PACKAGE_VERSION "0.1.0")
set (CPACK_PACKAGE_VERSION_MAJOR "0")
set (CPACK_PACKAGE_VERSION_MINOR "1")
set (CPACK_PACKAGE_VERSION_PATCH "0")
set (CPACK_PACKAGE_INSTALL_DIRECTORY "RacingWorld")
SET (CPACK_NSIS_MODIFY_PATH ON)

INCLUDE(CPack)
Loading

0 comments on commit 069b8dc

Please sign in to comment.