Skip to content

Commit

Permalink
Merge branch 'pr/9'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ugozapad
ugozapad committed Jan 25, 2024
2 parents bae4fc3 + 170c0fe commit e25c601
Show file tree
Hide file tree
Showing 1,600 changed files with 1,914 additions and 135,205 deletions.
45 changes: 45 additions & 0 deletions .github/workflows/ci_linux.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI Linux

on: [push, pull_request]

jobs:
pre_job:
runs-on: ubuntu-latest
outputs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
- id: skip_check
uses: fkirc/skip-duplicate-actions@v5
with:
concurrent_skipping: 'same_content'
do_not_skip: '["pull_request", "release", "workflow_dispatch", "schedule"]'

build-windows:
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
configuration: [debug, release]
arch: [x64]
name: 'Linux [${{ matrix.arch }}, ${{ matrix.configuration }}]'
steps:
- uses: actions/checkout@v3
with:
submodules: 'recursive'
- name: Install libs
run: |
sudo apt-get update && sudo apt-get install meson libgl-dev
- name: Configure and build
run: |
mkdir build && cd build
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.configuration}}
ninja
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: farcry.${{ matrix.arch }}-${{ matrix.configuration }}
path: bin/${{ matrix.arch }}-${{ matrix.configuration }}

permissions: write-all
5 changes: 2 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<<<<<<< HEAD
.vs
*.user
bin
build
Debug
Debug_XBox
Release
=======
build
>>>>>>> ddd4fa5ecb269a35314b06dc1a3ef8e284eabd34
cmake-build-*
Binary file added BinWin64/DivxDecoder.dll
View file
Binary file not shown.
Binary file added BinWin64/DivxMediaLib.dll
View file
Binary file not shown.
Binary file added BinWin64/FileParser.dll
View file
Binary file not shown.
Binary file added BinWin64/crysound64.dll
View file
Binary file not shown.
Binary file added BinWin64/msvcr71.dll
View file
Binary file not shown.
17 changes: 16 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,31 @@ message("ARCH_TYPE=${ARCH_TYPE}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/bin/${ARCH_TYPE}-${CMAKE_BUILD_TYPE})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/bin/${ARCH_TYPE}-${CMAKE_BUILD_TYPE})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG})

if (MSVC)
if (${ARCH_TYPE} STREQUAL "x64")
add_definitions(-DWIN64 -D_AMD64_ -DOS_WIN64 -DPROC_AMD64)
add_definitions(-DWIN64 -D_AMD64_)
endif()
# Always generate PDBs
add_compile_options(/Zi)
add_link_options(/DEBUG)

add_compile_options(/W3) # Warning level
else()
add_definitions(-DLINUX -fpermissive)
if (${ARCH_TYPE} STREQUAL "x64")
add_definitions(-DLINUX64 -D_AMD64_)
endif()

# Verbose output
add_compile_options(-v)
add_link_options(-v)

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -D_DEBUG -g")
endif()

add_subdirectory(Externals)
Expand Down
6 changes: 6 additions & 0 deletions SourceCode/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@ add_subdirectory(CryAnimation)
add_subdirectory(CryEntitySystem)
add_subdirectory(CryFont)
add_subdirectory(CryGame)
if (MSVC)
add_subdirectory(CryInput)
add_subdirectory(CryMovie)
endif()
add_subdirectory(CryNetwork)
add_subdirectory(CryPhysics)
add_subdirectory(CryScriptSystem)
add_subdirectory(CrySoundSystem)
add_subdirectory(CrySystem)
if (MSVC)
add_subdirectory(FARCRY)
add_subdirectory(FarCry_WinSV)
add_subdirectory(RenderDll/XRenderD3D9)
endif()
add_subdirectory(RenderDll/XRenderNULL)
add_subdirectory(RenderDll/XRenderOGL)
if (MSVC)
add_subdirectory(ResourceCompiler)
add_subdirectory(ResourceCompilerPC)
endif()
14 changes: 7 additions & 7 deletions SourceCode/Cry3DEngine/3dEngine.cpp → SourceCode/Cry3DEngine/3DEngine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"

#include "3dEngine.h"
#include "visareas.h"
#include "objman.h"
#include "3DEngine.h"
#include "VisAreas.h"
#include "ObjMan.h"
#include "terrain_water.h"
#include "CryStaticModel.h"

#include "partman.h"
#include "DecalManager.h"
#include "bflyes.h"
#include "rain.h"
#include "meshidx.h"
#include "MeshIdx.h"
#include "detail_grass.h"
#include "StencilShadowEdgeDetector.h" // CStencilShadowEdgeDetector
#include "StencilShadowConnectivityBuilder.h" // CStencilShadowConnectivityBuilder
#include "watervolumes.h"
#include "WaterVolumes.h"

#include "LMCompStructures.h"
#include "LMSerializationManager2.h"

#include "brush.h"
#include "Brush.h"

ISystem * Cry3DEngineBase::m_pSys=0;
IRenderer * Cry3DEngineBase::m_pRenderer=0;
Expand Down
0 SourceCode/Cry3DEngine/3dEngine.h → SourceCode/Cry3DEngine/3DEngine.h
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions SourceCode/Cry3DEngine/3DEngineLight.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

#include "StdAfx.h"

#include "3dEngine.h"
#include "objman.h"
#include "visareas.h"
#include "3DEngine.h"
#include "ObjMan.h"
#include "VisAreas.h"
#include "AABBSV.h"

#include "partman.h"
Expand Down
14 changes: 7 additions & 7 deletions SourceCode/Cry3DEngine/3dEngineLoad.cpp → SourceCode/Cry3DEngine/3DEngineLoad.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"

#include "3dEngine.h"
#include "objman.h"
#include "visareas.h"
#include "3DEngine.h"
#include "ObjMan.h"
#include "VisAreas.h"
#include "terrain_water.h"
#include "CryStaticModel.h"
#include "partman.h"
Expand All @@ -26,8 +26,8 @@
#include "detail_grass.h"
#include "rain.h"
#include <IXMLDOM.h>
#include "watervolumes.h"
#include "brush.h"
#include "WaterVolumes.h"
#include "Brush.h"
#include "LMCompStructures.h"

#define LEVEL_DATA_FILE "LevelData.xml"
Expand Down Expand Up @@ -789,4 +789,4 @@ void C3DEngine::LoadParticleEffects( XmlNodeRef &levelDataRoot,bool bEditorMode
{
m_pPartManager->LoadParticles( file );
}
}
}
12 changes: 6 additions & 6 deletions SourceCode/Cry3DEngine/3DEngineRender.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"

#include "3dEngine.h"
#include "objman.h"
#include "visareas.h"
#include "3DEngine.h"
#include "ObjMan.h"
#include "VisAreas.h"
#include "terrain_water.h"
#include "partman.h"
#include "DecalManager.h"
Expand All @@ -27,7 +27,7 @@

#include "cbuffer.h"

#include "watervolumes.h"
#include "WaterVolumes.h"

////////////////////////////////////////////////////////////////////////////////////////
// RenderScene
Expand Down Expand Up @@ -775,7 +775,7 @@ void C3DEngine::RenderSkyBox(IShader *pSH)
vTrans = GetViewCamera().GetPos() + 0.9f*t*(vTrans-GetViewCamera().GetPos());
}

m_SunObject[m_pTerrain->m_nRenderStackLevel]->m_Matrix = GetTranslationMat(vTrans);
m_SunObject[m_pTerrain->m_nRenderStackLevel]->m_Matrix = Matrix44::GetTranslationMat(vTrans);
m_SunObject[m_pTerrain->m_nRenderStackLevel]->m_ObjFlags |= FOB_DRSUN | FOB_TRANS_TRANSLATE;
m_SunObject[m_pTerrain->m_nRenderStackLevel]->m_TempVars[2] = 1.0f;
float fWaterLevel = GetWaterLevel();
Expand Down
6 changes: 3 additions & 3 deletions SourceCode/Cry3DEngine/3DEngineScreenEffects.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Last Update: 09/12/2003
=====================================================================
*/

#include "stdafx.h"
#include "3dEngine.h"
#include "objman.h"
#include "StdAfx.h"
#include "3DEngine.h"
#include "ObjMan.h"
#include "../RenderDll/Common/RendElements/CREScreenCommon.h"

// some helper macros
Expand Down
12 changes: 6 additions & 6 deletions SourceCode/Cry3DEngine/BasicArea.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"

#include "StatObj.h"
#include "objman.h"
#include "visareas.h"
#include "ObjMan.h"
#include "VisAreas.h"
#include "terrain_sector.h"
#include "cbuffer.h"
#include "3DEngine.h"
#include "meshidx.h"
#include "watervolumes.h"
#include "brush.h"
#include "MeshIdx.h"
#include "WaterVolumes.h"
#include "Brush.h"
#include "LMCompStructures.h"

void CBasicArea::SerializeArea(bool bSave)
Expand Down
14 changes: 7 additions & 7 deletions SourceCode/Cry3DEngine/Brush.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"
#include <ILMSerializationManager.h>
#include "StatObj.h"
#include "objman.h"
#include "visareas.h"
#include "ObjMan.h"
#include "VisAreas.h"
#include "terrain_sector.h"
#include "cbuffer.h"
#include "3DEngine.h"
#include "meshidx.h"
#include "watervolumes.h"
#include "MeshIdx.h"
#include "WaterVolumes.h"
#include "LMCompStructures.h"
#include "brush.h"
#include "Brush.h"

//////////////////////////////////////////////////////////////////////////
// Brush Export structures.
Expand Down Expand Up @@ -1516,4 +1516,4 @@ void CBrush::PreloadInstanceResources(Vec3d vPrevPortalPos, float fPrevPortalDis
GetRenderer()->EF_PrecacheResource(pTexPic, 0, 1.f, 0);
}
}
}
}
2 changes: 1 addition & 1 deletion SourceCode/Cry3DEngine/Brush.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _3DENGINE_BRUSH_H_
#define _3DENGINE_BRUSH_H_

#include "ObjMan.H"
#include "ObjMan.h"

#if defined(LINUX)
#include "LMCompStructures.h"
Expand Down
14 changes: 7 additions & 7 deletions SourceCode/Cry3DEngine/BrushLM.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"

#include "StatObj.h"
#include "objman.h"
#include "visareas.h"
#include "ObjMan.h"
#include "VisAreas.h"
#include "terrain_sector.h"
#include "cbuffer.h"
#include "3DEngine.h"
#include "meshidx.h"
#include "watervolumes.h"
#include "MeshIdx.h"
#include "WaterVolumes.h"
#include "LMCompStructures.h"
#include "brush.h"
#include "Brush.h"
#include "IEntitySystem.h"

void CBrush::SetLightmap(RenderLMData *pLMData, float *pTexCoords, UINT iNumTexCoords, const unsigned char cucOcclIDCount, const std::vector<std::pair<EntityId, EntityId> >& aIDs)
Expand Down Expand Up @@ -132,4 +132,4 @@ void CBrush::SetLightmap(RenderLMData *pLMData, float *pTexCoords, UINT iNumTexC
C3DEngine *pEng = (C3DEngine *)Get3DEngine();
m_arrLMData[nLod].m_pLMTCBuffer->SetChunk(pEng->m_pSHDefault,
0,pLeafBuffer->m_SecVertCount, 0,pLeafBuffer->m_Indices.m_nItems);
}
}
12 changes: 6 additions & 6 deletions SourceCode/Cry3DEngine/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ project(Cry3DEngine)
add_definitions(-D_USRDLL -DCRY3DENGINE_EXPORTS)

set(SRC_FILES
"3dEngine.cpp"
"3dEngineLight.cpp"
"3dEngineLoad.cpp"
"3dEngineRender.cpp"
"3dEngineScreenEffects.cpp"
"3DEngine.cpp"
"3DEngineLight.cpp"
"3DEngineLoad.cpp"
"3DEngineRender.cpp"
"3DEngineScreenEffects.cpp"
"BasicArea.cpp"
"Brush.cpp"
"BrushLM.cpp"
"cbuffer.cpp"
"Cry3DEngine.cpp"
"CryStaticModel.cpp"
"cvars.cpp"
"CVars.cpp"
"Decal.cpp"
"DecalManager.cpp"
"detail_grass.cpp"
Expand Down
8 changes: 4 additions & 4 deletions SourceCode/Cry3DEngine/cvars.cpp → SourceCode/Cry3DEngine/CVars.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
//
////////////////////////////////////////////////////////////////////////////

#include "stdafx.h"
#include "StdAfx.h"

#include "3dEngine.h"
#include "irenderer.h"
#include "3DEngine.h"
#include "IRenderer.h"

// can not be changed by user
#define INIT_CVAR_CHEAT(_var,_def_val,_comment)\
Expand Down Expand Up @@ -215,4 +215,4 @@ void CVars::Init()
if(ICVar * pVar1 = GetConsole()->GetCVar("e_shadow_maps_receiving"))
pVar1->Set(0);
}
}
}
0 SourceCode/Cry3DEngine/cvars.h → SourceCode/Cry3DEngine/CVars.h
View file
File renamed without changes.
Loading

0 comments on commit e25c601

Please sign in to comment.