Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 07:47:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

x64 version (#1113)

Browse source 
* Sort out compiler errors (excluding external libraries)

* Add TODO comment

* Use empty() method

* Fix wrong casts

* Fix new warnings

* Fix merge error

* Revert "Merge branch 'develop' into sezz_x64"

This reverts commit f695769189, reversing
changes made to 54c5e0c70d.

* Revert "Revert "Merge branch 'develop' into sezz_x64""

This reverts commit e1128c41f8.

* Update all libraries with x86 versions, organize lib directories, update x64 config

* Show app bitness in a log file

* Fix text rendering by uncommenting ToWString helper function

* Ship dlls and automatically replace them when switching between x86/x64

* Update TombEngine.vcxproj

* Adjust ammo struct; remove unneeded line

* Update broken x64 config for release mode

* Fix more project config inconsistencies

* Update TombEngine.vcxproj

* Remove unnecessary casts

* Tabs not spaces

* Update TombEngine.vcxproj.user

* Revert "Update TombEngine.vcxproj.user"

This reverts commit c168943ed0.

* Add x64 lua53.lib, remove DLLs.

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Co-authored-by: hispidence <squidshirehimself@gmail.com>
This commit is contained in:
Lwmte 2023-05-21 18:01:27 +03:00 • committed by GitHub
parent 0226d577ce
commit 4d63d92364
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 2469 additions and 1408 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitignore vendored
View file

@ -1,15 +1,11 @@
enc_temp_folder/
Build/
TombEngine/CustomObjects/
TombEngine/x64/
TombEngine/Debug/
TombEngine/Release
TombEngine/Legacy Engine Objects
x64/
TombEngine/Release/
packages/
.vs/
.vsconfig
*.dll
*.dmp
*.id0
*.id1

BIN
Libs/bass/x64/bass.dll Normal file
View file

Binary file not shown.

BIN
Libs/bass/x64/bass.lib Normal file
View file

Binary file not shown.

BIN
Libs/bass/x64/bass_fx.dll Normal file
View file

Binary file not shown.

BIN
Libs/bass/x64/bass_fx.lib Normal file
View file

Binary file not shown.

BIN
Libs/bass/x64/bassmix.dll Normal file
View file

Binary file not shown.

BIN
Libs/bass/x64/bassmix.lib Normal file
View file

Binary file not shown.

BIN
Libs/bass/x86/bass.dll Normal file
View file

Binary file not shown.

0
Libs/bass/bass.lib → Libs/bass/x86/bass.lib
View file

BIN
Libs/bass/x86/bass_fx.dll Normal file
View file

Binary file not shown.

0
Libs/bass/bass_fx.lib → Libs/bass/x86/bass_fx.lib
View file

BIN
Libs/bass/x86/bassmix.dll Normal file
View file

Binary file not shown.

0
Libs/bass/bassmix.lib → Libs/bass/x86/bassmix.lib
View file

BIN
Libs/lua/lua53.lib
View file

Binary file not shown.

BIN
Libs/lua/x64/lua53.lib Normal file
View file

Binary file not shown.

BIN
Libs/lua/x64/lua53.pdb Normal file
View file

Binary file not shown.

BIN
Libs/lua/x86/lua53.lib Normal file
View file

Binary file not shown.

BIN
Libs/lua/x86/lua53.pdb Normal file
View file

Binary file not shown.

BIN
Libs/ois/x64/OIS.dll Normal file
View file

Binary file not shown.

BIN
Libs/ois/x64/OIS.lib Normal file
View file

Binary file not shown.

BIN
Libs/ois/x64/OIS_d.dll Normal file
View file

Binary file not shown.

BIN
Libs/ois/x64/OIS_d.lib Normal file
View file

Binary file not shown.

BIN
Libs/ois/x86/OIS.dll Normal file
View file

Binary file not shown.

0
Libs/ois/OIS.lib → Libs/ois/x86/OIS.lib
View file

BIN
Libs/ois/x86/OIS_d.dll Normal file
View file

Binary file not shown.

0
Libs/ois/OIS_d.lib → Libs/ois/x86/OIS_d.lib
View file

BIN
Libs/spdlog/x64/spdlog.lib Normal file
View file

Binary file not shown.

BIN
Libs/spdlog/x64/spdlogd.lib Normal file
View file

Binary file not shown.

0
Libs/spdlog/spdlog.lib → Libs/spdlog/x86/spdlog.lib
View file

0
Libs/spdlog/spdlogd.lib → Libs/spdlog/x86/spdlogd.lib
View file

BIN
Libs/zlib/dll16/zlib16.lib
View file

Binary file not shown.

BIN
Libs/zlib/dll32/zlib.lib
View file

Binary file not shown.

BIN
Libs/zlib/dll32/zlib_bor.lib
View file

Binary file not shown.

64
Libs/zlib/ioapi.h
View file

@ -1,64 +0,0 @@
/* ioapi.h -- IO base function header for compress/uncompress .zip
files using zlib + zip or unzip API
Version 0.18 beta, Feb 26th, 2002
Copyright (C) 1998-2002 Gilles Vollant
*/
#ifndef _ZLIBIOAPI_H
#define _ZLIBIOAPI_H
#define ZLIB_FILEFUNC_SEEK_CUR (1)
#define ZLIB_FILEFUNC_SEEK_END (2)
#define ZLIB_FILEFUNC_SEEK_SET (0)
#define ZLIB_FILEFUNC_MODE_READ (1)
#define ZLIB_FILEFUNC_MODE_WRITE (2)
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
#define ZLIB_FILEFUNC_MODE_EXISTING (4)
#define ZLIB_FILEFUNC_MODE_CREATE (8)
#ifndef ZCALLBACK
#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK)
#define ZCALLBACK CALLBACK
#else
#define ZCALLBACK
#endif
#endif
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
typedef long (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
typedef struct zlib_filefunc_def_s
{
open_file_func zopen_file;
read_file_func zread_file;
write_file_func zwrite_file;
tell_file_func ztell_file;
seek_file_func zseek_file;
close_file_func zclose_file;
testerror_file_func zerror_file;
voidpf opaque;
} zlib_filefunc_def;
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
#endif

11
Libs/zlib/readme.txt
View file

@ -1,11 +0,0 @@
dll16\zlib16.dll : The 16 bits DLL of ZLib 1.14
dll16\zlib16.lib : The 16 bits import library for the DLL of ZLib 1.14
dll32\zlib.dll : The 32 bits DLL of ZLib 1.14
dll32\zlib.lib : The 32 bits import library for the DLL of ZLib 1.14
static32\zlibstat.lib : The 32 bits statis library of zLib 1.14 for Visual C++
dll32\zlib_bor.lib : The 32 bits import library for the DLL of ZLib 1.14 for Borland C++
I also include a version of zconf.h which must replace the version from zlib114.zip
The zlib.h included is the same version than in zlib114.zip
I've also added unzip.h and zip.h (please visit http://www.winimage.com/zLibDll/unzip.html )

BIN
Libs/zlib/static32/zlibstat.lib
View file

Binary file not shown.

300
Libs/zlib/unzip.h
View file

@ -1,300 +0,0 @@
/* unzip.h -- IO for uncompress .zip files using zlib
Version 0.18 beta, Feb 26th, 2002
Copyright (C) 1998-2002 Gilles Vollant
This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
WinZip, InfoZip tools and compatible.
Encryption and multi volume ZipFile (span) are not supported.
Old compressions used by old PKZip 1.x are not supported
THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
CAN CHANGE IN FUTURE VERSION !!
I WAIT FEEDBACK at mail info@winimage.com
Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
Condition of use and distribution are the same than zlib :
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
/* for more info about .ZIP format, see
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
http://www.info-zip.org/pub/infozip/doc/
PkWare has also a specification at :
ftp://ftp.pkware.com/probdesc.zip
*/
#ifndef _unz_H
#define _unz_H
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _ZLIB_H
#include "zlib.h"
#endif
#ifndef _ZLIBIOAPI_H
#include "ioapi.h"
#endif
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */
typedef struct TagunzFile__ { int unused; } unzFile__;
typedef unzFile__ *unzFile;
#else
typedef voidp unzFile;
#endif
#define UNZ_OK (0)
#define UNZ_END_OF_LIST_OF_FILE (-100)
#define UNZ_ERRNO (Z_ERRNO)
#define UNZ_EOF (0)
#define UNZ_PARAMERROR (-102)
#define UNZ_BADZIPFILE (-103)
#define UNZ_INTERNALERROR (-104)
#define UNZ_CRCERROR (-105)
/* tm_unz contain date/time info */
typedef struct tm_unz_s
{
uInt tm_sec; /* seconds after the minute - [0,59] */
uInt tm_min; /* minutes after the hour - [0,59] */
uInt tm_hour; /* hours since midnight - [0,23] */
uInt tm_mday; /* day of the month - [1,31] */
uInt tm_mon; /* months since January - [0,11] */
uInt tm_year; /* years - [1980..2044] */
} tm_unz;
/* unz_global_info structure contain global data about the ZIPfile
These data comes from the end of central dir */
typedef struct unz_global_info_s
{
uLong number_entry; /* total number of entries in
the central dir on this disk */
uLong size_comment; /* size of the global comment of the zipfile */
} unz_global_info;
/* unz_file_info contain information about a file in the zipfile */
typedef struct unz_file_info_s
{
uLong version; /* version made by 2 bytes */
uLong version_needed; /* version needed to extract 2 bytes */
uLong flag; /* general purpose bit flag 2 bytes */
uLong compression_method; /* compression method 2 bytes */
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */
uLong crc; /* crc-32 4 bytes */
uLong compressed_size; /* compressed size 4 bytes */
uLong uncompressed_size; /* uncompressed size 4 bytes */
uLong size_filename; /* filename length 2 bytes */
uLong size_file_extra; /* extra field length 2 bytes */
uLong size_file_comment; /* file comment length 2 bytes */
uLong disk_num_start; /* disk number start 2 bytes */
uLong internal_fa; /* internal file attributes 2 bytes */
uLong external_fa; /* external file attributes 4 bytes */
tm_unz tmu_date;
} unz_file_info;
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
const char* fileName2,
int iCaseSensitivity));
/*
Compare two filename (fileName1,fileName2).
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
or strcasecmp)
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
(like 1 on Unix, 2 on Windows)
*/
extern unzFile ZEXPORT unzOpen OF((const char *path));
/*
Open a Zip file. path contain the full pathname (by example,
on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
"zlib/zlib113.zip".
If the zipfile cannot be opened (file don't exist or in not valid), the
return value is NULL.
Else, the return value is a unzFile Handle, usable with other function
of this unzip package.
*/
extern unzFile ZEXPORT unzOpen2 OF((const char *path,
zlib_filefunc_def* pzlib_filefunc_def));
/*
Open a Zip file, like unzOpen, but provide a set of file low level API
for read/write the zip file (see ioapi.h)
*/
extern int ZEXPORT unzClose OF((unzFile file));
/*
Close a ZipFile opened with unzipOpen.
If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
return UNZ_OK if there is no problem. */
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
unz_global_info *pglobal_info));
/*
Write info about the ZipFile in the *pglobal_info structure.
No preparation of the structure is needed
return UNZ_OK if there is no problem. */
extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
char *szComment,
uLong uSizeBuf));
/*
Get the global comment std::string of the ZipFile, in the szComment buffer.
uSizeBuf is the size of the szComment buffer.
return the number of byte copied or an error code <0
*/
/***************************************************************************/
/* Unzip package allow you browse the directory of the zipfile */
extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
/*
Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem
*/
extern int ZEXPORT unzGoToNextFile OF((unzFile file));
/*
Set the current file of the zipfile to the next file.
return UNZ_OK if there is no problem
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
*/
extern int ZEXPORT unzLocateFile OF((unzFile file,
const char *szFileName,
int iCaseSensitivity));
/*
Try locate the file szFileName in the zipfile.
For the iCaseSensitivity signification, see unzStringFileNameCompare
return value :
UNZ_OK if the file is found. It becomes the current file.
UNZ_END_OF_LIST_OF_FILE if the file is not found
*/
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
unz_file_info *pfile_info,
char *szFileName,
uLong fileNameBufferSize,
void *extraField,
uLong extraFieldBufferSize,
char *szComment,
uLong commentBufferSize));
/*
Get Info about the current file
if pfile_info!=NULL, the *pfile_info structure will contain somes info about
the current file
if szFileName!=NULL, the filemane std::string will be copied in szFileName
(fileNameBufferSize is the size of the buffer)
if extraField!=NULL, the extra field information will be copied in extraField
(extraFieldBufferSize is the size of the buffer).
This is the Central-header version of the extra field
if szComment!=NULL, the comment std::string of the file will be copied in szComment
(commentBufferSize is the size of the buffer)
*/
/***************************************************************************/
/* for reading the content of the current zipfile, you can open it, read data
from it, and close it (you can close it before reading all the file)
*/
extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
/*
Open for reading data the current file in the zipfile.
If there is no error, the return value is UNZ_OK.
*/
extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
int* method,
int* level,
int raw));
/*
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
*method will receive method of compression, *level will receive level of
compression
note : you can set level parameter as NULL (if you did not want known level,
but you CANNOT set method parameter as NULL
*/
extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
/*
Close the file in zip opened with unzOpenCurrentFile
Return UNZ_CRCERROR if all the file was read but the CRC is not good
*/
extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
voidp buf,
unsigned len));
/*
Read bytes from the current file (opened by unzOpenCurrentFile)
buf contain buffer where data must be copied
len the size of buf.
return the number of byte copied if somes bytes are copied
return 0 if the end of file was reached
return <0 with error code if there is an error
(UNZ_ERRNO for IO error, or zLib error for uncompress error)
*/
extern z_off_t ZEXPORT unztell OF((unzFile file));
/*
Give the current position in uncompressed data
*/
extern int ZEXPORT unzeof OF((unzFile file));
/*
return 1 if the end of file was reached, 0 elsewhere
*/
extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
voidp buf,
unsigned len));
/*
Read extra field from the current file (opened by unzOpenCurrentFile)
This is the local-header version of the extra field (sometimes, there is
more info in the local-header version than in the central-header)
if buf==NULL, it return the size of the local extra field
if buf!=NULL, len is the size of the buffer, the extra header is copied in
buf.
the return value is the number of bytes copied in buf, or (if <0)
the error code
*/
#ifdef __cplusplus
}
#endif
#endif /* _unz_H */

BIN
Libs/zlib/x64/zlib.dll Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x64/zlib.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x64/zlibd.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x64/zlibstatic.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x64/zlibstaticd.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x86/zlib.dll Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x86/zlib.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x86/zlibd.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x86/zlibstatic.lib Normal file
View file

Binary file not shown.

BIN
Libs/zlib/x86/zlibstaticd.lib Normal file
View file

Binary file not shown.

549
Libs/zlib/zconf.h
View file

@ -1,104 +1,261 @@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-1998 Jean-loup Gailly.
* For conditions of distribution and use, see copyright notice in zlib.h
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id$ */
#ifndef _ZCONF_H
#define _ZCONF_H
#ifndef ZCONF_H
#define ZCONF_H
/* #undef Z_PREFIX */
/* #undef Z_HAVE_UNISTD_H */
/*
* If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
* Even better than compiling with -DZ_PREFIX would be to use configure to set
* this permanently in zconf.h using "./configure --zprefix".
*/
#ifdef Z_PREFIX
# define deflateInit_ z_deflateInit_
# define deflate z_deflate
# define deflateEnd z_deflateEnd
# define inflateInit_ z_inflateInit_
# define inflate z_inflate
# define inflateEnd z_inflateEnd
# define deflateInit2_ z_deflateInit2_
# define deflateSetDictionary z_deflateSetDictionary
# define deflateCopy z_deflateCopy
# define deflateReset z_deflateReset
# define deflateParams z_deflateParams
# define inflateInit2_ z_inflateInit2_
# define inflateSetDictionary z_inflateSetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateReset z_inflateReset
# define compress z_compress
# define compress2 z_compress2
# define uncompress z_uncompress
# define adler32 z_adler32
# define crc32 z_crc32
# define get_crc_table z_get_crc_table
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
# define Z_PREFIX_SET
# define Byte z_Byte
# define uInt z_uInt
# define uLong z_uLong
# define Bytef z_Bytef
# define charf z_charf
# define intf z_intf
# define uIntf z_uIntf
# define uLongf z_uLongf
# define voidpf z_voidpf
# define voidp z_voidp
#endif
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
# define WIN32
#endif
#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
# ifndef __32BIT__
# define __32BIT__
/* all linked symbols and init macros */
# define _dist_code z__dist_code
# define _length_code z__length_code
# define _tr_align z__tr_align
# define _tr_flush_bits z__tr_flush_bits
# define _tr_flush_block z__tr_flush_block
# define _tr_init z__tr_init
# define _tr_stored_block z__tr_stored_block
# define _tr_tally z__tr_tally
# define adler32 z_adler32
# define adler32_combine z_adler32_combine
# define adler32_combine64 z_adler32_combine64
# define adler32_z z_adler32_z
# ifndef Z_SOLO
# define compress z_compress
# define compress2 z_compress2
# define compressBound z_compressBound
# endif
# define crc32 z_crc32
# define crc32_combine z_crc32_combine
# define crc32_combine64 z_crc32_combine64
# define crc32_combine_gen z_crc32_combine_gen
# define crc32_combine_gen64 z_crc32_combine_gen64
# define crc32_combine_op z_crc32_combine_op
# define crc32_z z_crc32_z
# define deflate z_deflate
# define deflateBound z_deflateBound
# define deflateCopy z_deflateCopy
# define deflateEnd z_deflateEnd
# define deflateGetDictionary z_deflateGetDictionary
# define deflateInit z_deflateInit
# define deflateInit2 z_deflateInit2
# define deflateInit2_ z_deflateInit2_
# define deflateInit_ z_deflateInit_
# define deflateParams z_deflateParams
# define deflatePending z_deflatePending
# define deflatePrime z_deflatePrime
# define deflateReset z_deflateReset
# define deflateResetKeep z_deflateResetKeep
# define deflateSetDictionary z_deflateSetDictionary
# define deflateSetHeader z_deflateSetHeader
# define deflateTune z_deflateTune
# define deflate_copyright z_deflate_copyright
# define get_crc_table z_get_crc_table
# ifndef Z_SOLO
# define gz_error z_gz_error
# define gz_intmax z_gz_intmax
# define gz_strwinerror z_gz_strwinerror
# define gzbuffer z_gzbuffer
# define gzclearerr z_gzclearerr
# define gzclose z_gzclose
# define gzclose_r z_gzclose_r
# define gzclose_w z_gzclose_w
# define gzdirect z_gzdirect
# define gzdopen z_gzdopen
# define gzeof z_gzeof
# define gzerror z_gzerror
# define gzflush z_gzflush
# define gzfread z_gzfread
# define gzfwrite z_gzfwrite
# define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets
# define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64
# define gzopen z_gzopen
# define gzopen64 z_gzopen64
# ifdef _WIN32
# define gzopen_w z_gzopen_w
# endif
# define gzprintf z_gzprintf
# define gzputc z_gzputc
# define gzputs z_gzputs
# define gzread z_gzread
# define gzrewind z_gzrewind
# define gzseek z_gzseek
# define gzseek64 z_gzseek64
# define gzsetparams z_gzsetparams
# define gztell z_gztell
# define gztell64 z_gztell64
# define gzungetc z_gzungetc
# define gzvprintf z_gzvprintf
# define gzwrite z_gzwrite
# endif
# define inflate z_inflate
# define inflateBack z_inflateBack
# define inflateBackEnd z_inflateBackEnd
# define inflateBackInit z_inflateBackInit
# define inflateBackInit_ z_inflateBackInit_
# define inflateCodesUsed z_inflateCodesUsed
# define inflateCopy z_inflateCopy
# define inflateEnd z_inflateEnd
# define inflateGetDictionary z_inflateGetDictionary
# define inflateGetHeader z_inflateGetHeader
# define inflateInit z_inflateInit
# define inflateInit2 z_inflateInit2
# define inflateInit2_ z_inflateInit2_
# define inflateInit_ z_inflateInit_
# define inflateMark z_inflateMark
# define inflatePrime z_inflatePrime
# define inflateReset z_inflateReset
# define inflateReset2 z_inflateReset2
# define inflateResetKeep z_inflateResetKeep
# define inflateSetDictionary z_inflateSetDictionary
# define inflateSync z_inflateSync
# define inflateSyncPoint z_inflateSyncPoint
# define inflateUndermine z_inflateUndermine
# define inflateValidate z_inflateValidate
# define inflate_copyright z_inflate_copyright
# define inflate_fast z_inflate_fast
# define inflate_table z_inflate_table
# ifndef Z_SOLO
# define uncompress z_uncompress
# define uncompress2 z_uncompress2
# endif
# define zError z_zError
# ifndef Z_SOLO
# define zcalloc z_zcalloc
# define zcfree z_zcfree
# endif
# define zlibCompileFlags z_zlibCompileFlags
# define zlibVersion z_zlibVersion
/* all zlib typedefs in zlib.h and zconf.h */
# define Byte z_Byte
# define Bytef z_Bytef
# define alloc_func z_alloc_func
# define charf z_charf
# define free_func z_free_func
# ifndef Z_SOLO
# define gzFile z_gzFile
# endif
# define gz_header z_gz_header
# define gz_headerp z_gz_headerp
# define in_func z_in_func
# define intf z_intf
# define out_func z_out_func
# define uInt z_uInt
# define uIntf z_uIntf
# define uLong z_uLong
# define uLongf z_uLongf
# define voidp z_voidp
# define voidpc z_voidpc
# define voidpf z_voidpf
/* all zlib structs in zlib.h and zconf.h */
# define gz_header_s z_gz_header_s
# define internal_state z_internal_state
#endif
#if defined(__MSDOS__) && !defined(MSDOS)
# define MSDOS
#endif
#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
# define OS2
#endif
#if defined(_WINDOWS) && !defined(WINDOWS)
# define WINDOWS
#endif
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
# ifndef WIN32
# define WIN32
# endif
#endif
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
# ifndef SYS16BIT
# define SYS16BIT
# endif
# endif
#endif
/*
* Compile with -DMAXSEG_64K if the alloc function cannot allocate more
* than 64k bytes at a time (needed on systems with 16-bit int).
*/
#if defined(MSDOS) && !defined(__32BIT__)
#ifdef SYS16BIT
# define MAXSEG_64K
#endif
#ifdef MSDOS
# define UNALIGNED_OK
#endif
#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32)) && !defined(STDC)
# define STDC
#endif
#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
#ifdef __STDC_VERSION__
# ifndef STDC
# define STDC
# endif
# if __STDC_VERSION__ >= 199901L
# ifndef STDC99
# define STDC99
# endif
# endif
#endif
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
# define STDC
#endif
#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
# define STDC
#endif
#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
# define STDC
#endif
#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
# define STDC
#endif
#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
# define STDC
#endif
#ifndef STDC
# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
# define const
# define const /* note: need a more gentle solution here */
# endif
#endif
/* Some Mac compilers merge all .h files incorrectly: */
#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
# define NO_DUMMY_DECL
#if defined(ZLIB_CONST) && !defined(z_const)
# define z_const const
#else
# define z_const
#endif
/* Old Borland C incorrectly complains about missing returns: */
#if defined(__BORLANDC__) && (__BORLANDC__ < 0x460)
# define NEED_DUMMY_RETURN
#ifdef Z_SOLO
typedef unsigned long z_size_t;
#else
# define z_longlong long long
# if defined(NO_SIZE_T)
typedef unsigned NO_SIZE_T z_size_t;
# elif defined(STDC)
# include <stddef.h>
typedef size_t z_size_t;
# else
typedef unsigned long z_size_t;
# endif
# undef z_longlong
#endif
#if defined(__TURBOC__) && !defined(__BORLANDC__)
# define NEED_DUMMY_RETURN
#endif
/* Maximum value for memLevel in deflateInit2 */
#ifndef MAX_MEM_LEVEL
@ -127,7 +284,7 @@
Of course this will generally degrade compression (there's no free lunch).
The memory requirements for inflate are (in bytes) 1 << windowBits
that is, 32K for windowBits=15 (default value) plus a few kilobytes
that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
for small objects.
*/
@ -141,86 +298,104 @@
# endif
#endif
#ifndef Z_ARG /* function prototypes for stdarg */
# if defined(STDC) || defined(Z_HAVE_STDARG_H)
# define Z_ARG(args) args
# else
# define Z_ARG(args) ()
# endif
#endif
/* The following definitions for FAR are needed only for MSDOS mixed
* model programming (small or medium model with some far allocations).
* This was tested only with MSC; for other MSDOS compilers you may have
* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
* just define FAR to be empty.
*/
#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
/* MSC small or medium model */
# define SMALL_MEDIUM
# ifdef _MSC_VER
# define FAR _far
# else
# define FAR far
# endif
#endif
#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
# ifndef __32BIT__
#ifdef SYS16BIT
# if defined(M_I86SM) || defined(M_I86MM)
/* MSC small or medium model */
# define SMALL_MEDIUM
# define FAR _far
# ifdef _MSC_VER
# define FAR _far
# else
# define FAR far
# endif
# endif
# if (defined(__SMALL__) || defined(__MEDIUM__))
/* Turbo C small or medium model */
# define SMALL_MEDIUM
# ifdef __BORLANDC__
# define FAR _far
# else
# define FAR far
# endif
# endif
#endif
#if defined(WIN32) && (!defined(ZLIB_WIN32_NODLL)) && (!defined(ZLIB_DLL))
# define ZLIB_DLL
#endif
/* Compile with -DZLIB_DLL for Windows DLL support */
#if defined(ZLIB_DLL)
# if defined(_WINDOWS) || defined(WINDOWS) || defined(WIN32)
# ifndef WINAPI
# ifdef FAR
# undef FAR
#if defined(WINDOWS) || defined(WIN32)
/* If building or using zlib as a DLL, define ZLIB_DLL.
* This is not mandatory, but it offers a little performance increase.
*/
# ifdef ZLIB_DLL
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
# ifdef ZLIB_INTERNAL
# define ZEXTERN extern __declspec(dllexport)
# else
# define ZEXTERN extern __declspec(dllimport)
# endif
# include <windows.h>
# endif
# endif /* ZLIB_DLL */
/* If building or using zlib with the WINAPI/WINAPIV calling convention,
* define ZLIB_WINAPI.
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
*/
# ifdef ZLIB_WINAPI
# ifdef FAR
# undef FAR
# endif
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
/* No need for _export, use ZLIB.DEF instead. */
/* For complete Windows compatibility, use WINAPI, not __stdcall. */
# define ZEXPORT WINAPI
# ifdef WIN32
# define ZEXPORT WINAPI
# define ZEXPORTVA WINAPIV
# define ZEXPORTVA WINAPIV
# else
# define ZEXPORT WINAPI _export
# define ZEXPORTVA FAR _cdecl _export
# endif
# endif
# if defined (__BORLANDC__)
# if (__BORLANDC__ >= 0x0500) && defined (WIN32)
# include <windows.h>
# define ZEXPORT __declspec(dllexport) WINAPI
# define ZEXPORTVA __declspec(dllexport) WINAPIV
# else
# if defined (_Windows) && defined (__DLL__)
# define ZEXPORT _export
# define ZEXPORTVA _export
# endif
# define ZEXPORTVA FAR CDECL
# endif
# endif
#endif
#if defined (__BEOS__)
# if defined (ZLIB_DLL)
# define ZEXTERN extern __declspec(dllexport)
# else
# define ZEXTERN extern __declspec(dllimport)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
# define ZEXPORTVA __declspec(dllexport)
# else
# define ZEXPORT __declspec(dllimport)
# define ZEXPORTVA __declspec(dllimport)
# endif
# endif
#endif
#ifndef ZEXTERN
# define ZEXTERN extern
#endif
#ifndef ZEXPORT
# define ZEXPORT
#endif
#ifndef ZEXPORTVA
# define ZEXPORTVA
#endif
#ifndef ZEXTERN
# define ZEXTERN extern
#endif
#ifndef FAR
# define FAR
# define FAR
#endif
#if !defined(MACOS) && !defined(TARGET_OS_MAC)
#if !defined(__MACTYPES__)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
@ -238,55 +413,137 @@ typedef uInt FAR uIntf;
typedef uLong FAR uLongf;
#ifdef STDC
typedef void FAR *voidpf;
typedef void *voidp;
typedef void const *voidpc;
typedef void FAR *voidpf;
typedef void *voidp;
#else
typedef Byte FAR *voidpf;
typedef Byte *voidp;
typedef Byte const *voidpc;
typedef Byte FAR *voidpf;
typedef Byte *voidp;
#endif
#ifdef HAVE_UNISTD_H
# include <sys/types.h> /* for off_t */
# include <unistd.h> /* for SEEK_* and off_t */
# ifdef VMS
# include <unixio.h> /* for off_t */
#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
# include <limits.h>
# if (UINT_MAX == 0xffffffffUL)
# define Z_U4 unsigned
# elif (ULONG_MAX == 0xffffffffUL)
# define Z_U4 unsigned long
# elif (USHRT_MAX == 0xffffffffUL)
# define Z_U4 unsigned short
# endif
# define z_off_t off_t
#endif
#ifndef SEEK_SET
#ifdef Z_U4
typedef Z_U4 z_crc_t;
#else
typedef unsigned long z_crc_t;
#endif
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
# define Z_HAVE_STDARG_H
#endif
#ifdef STDC
# ifndef Z_SOLO
# include <sys/types.h> /* for off_t */
# endif
#endif
#if defined(STDC) || defined(Z_HAVE_STDARG_H)
# ifndef Z_SOLO
# include <stdarg.h> /* for va_list */
# endif
#endif
#ifdef _WIN32
# ifndef Z_SOLO
# include <stddef.h> /* for wchar_t */
# endif
#endif
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
* though the former does not conform to the LFS document), but considering
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
* equivalently requesting no 64-bit operations
*/
#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
# undef _LARGEFILE64_SOURCE
#endif
#ifndef Z_HAVE_UNISTD_H
# ifdef __WATCOMC__
# define Z_HAVE_UNISTD_H
# endif
#endif
#ifndef Z_HAVE_UNISTD_H
# if defined(_LARGEFILE64_SOURCE) && !defined(_WIN32)
# define Z_HAVE_UNISTD_H
# endif
#endif
#ifndef Z_SOLO
# if defined(Z_HAVE_UNISTD_H)
# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
# ifdef VMS
# include <unixio.h> /* for off_t */
# endif
# ifndef z_off_t
# define z_off_t off_t
# endif
# endif
#endif
#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
# define Z_LFS64
#endif
#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
# define Z_LARGE64
#endif
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
# define Z_WANT64
#endif
#if !defined(SEEK_SET) && !defined(Z_SOLO)
# define SEEK_SET 0 /* Seek from beginning of file. */
# define SEEK_CUR 1 /* Seek from current position. */
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
#endif
#ifndef z_off_t
# define z_off_t long
# define z_off_t long
#endif
#if !defined(_WIN32) && defined(Z_LARGE64)
# define z_off64_t off64_t
#else
# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
# define z_off64_t __int64
# else
# define z_off64_t z_off_t
# endif
#endif
/* MVS linker does not support external names larger than 8 bytes */
#if defined(__MVS__)
# pragma map(deflateInit_,"DEIN")
# pragma map(deflateInit2_,"DEIN2")
# pragma map(deflateEnd,"DEEND")
# pragma map(inflateInit_,"ININ")
# pragma map(inflateInit2_,"ININ2")
# pragma map(inflateEnd,"INEND")
# pragma map(inflateSync,"INSY")
# pragma map(inflateSetDictionary,"INSEDI")
# pragma map(inflate_blocks,"INBL")
# pragma map(inflate_blocks_new,"INBLNE")
# pragma map(inflate_blocks_free,"INBLFR")
# pragma map(inflate_blocks_reset,"INBLRE")
# pragma map(inflate_codes_free,"INCOFR")
# pragma map(inflate_codes,"INCO")
# pragma map(inflate_fast,"INFA")
# pragma map(inflate_flush,"INFLU")
# pragma map(inflate_mask,"INMA")
# pragma map(inflate_set_dictionary,"INSEDI2")
# pragma map(inflate_copyright,"INCOPY")
# pragma map(inflate_trees_bits,"INTRBI")
# pragma map(inflate_trees_dynamic,"INTRDY")
# pragma map(inflate_trees_fixed,"INTRFI")
# pragma map(inflate_trees_free,"INTRFR")
#pragma map(deflateInit_,"DEIN")
#pragma map(deflateInit2_,"DEIN2")
#pragma map(deflateEnd,"DEEND")
#pragma map(deflateBound,"DEBND")
#pragma map(inflateInit_,"ININ")
#pragma map(inflateInit2_,"ININ2")
#pragma map(inflateEnd,"INEND")
#pragma map(inflateSync,"INSY")
#pragma map(inflateSetDictionary,"INSEDI")
#pragma map(compressBound,"CMBND")
#pragma map(inflate_table,"INTABL")
#pragma map(inflate_fast,"INFA")
#pragma map(inflate_copyright,"INCOPY")
#endif
#endif /* _ZCONF_H */
#endif /* ZCONF_H */

188
Libs/zlib/zip.h
View file

@ -1,188 +0,0 @@
/* zip.h -- IO for compress .zip files using zlib
Version 0.18 beta, Feb 26th, 2002
Copyright (C) 1998-2002 Gilles Vollant
This unzip package allow creates .ZIP file, compatible with PKZip 2.04g
WinZip, InfoZip tools and compatible.
Encryption and multi volume ZipFile (span) are not supported.
Old compressions used by old PKZip 1.x are not supported
For uncompress .zip file, look at unzip.h
THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
CAN CHANGE IN FUTURE VERSION !!
I WAIT FEEDBACK at mail info@winimage.com
Visit also http://www.winimage.com/zLibDll/unzip.html for evolution
Condition of use and distribution are the same than zlib :
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
/* for more info about .ZIP format, see
http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
http://www.info-zip.org/pub/infozip/doc/
PkWare has also a specification at :
ftp://ftp.pkware.com/probdesc.zip
*/
#ifndef _zip_H
#define _zip_H
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _ZLIB_H
#include "zlib.h"
#endif
#ifndef _ZLIBIOAPI_H
#include "ioapi.h"
#endif
#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
/* like the STRICT of WIN32, we define a pointer that cannot be converted
from (void*) without cast */
typedef struct TagzipFile__ { int unused; } zipFile__;
typedef zipFile__ *zipFile;
#else
typedef voidp zipFile;
#endif
#define ZIP_OK (0)
#define ZIP_ERRNO (Z_ERRNO)
#define ZIP_PARAMERROR (-102)
#define ZIP_INTERNALERROR (-104)
/* tm_zip contain date/time info */
typedef struct tm_zip_s
{
uInt tm_sec; /* seconds after the minute - [0,59] */
uInt tm_min; /* minutes after the hour - [0,59] */
uInt tm_hour; /* hours since midnight - [0,23] */
uInt tm_mday; /* day of the month - [1,31] */
uInt tm_mon; /* months since January - [0,11] */
uInt tm_year; /* years - [1980..2044] */
} tm_zip;
typedef struct
{
tm_zip tmz_date; /* date in understandable format */
uLong dosDate; /* if dos_date == 0, tmu_date is used */
/* uLong flag; */ /* general purpose bit flag 2 bytes */
uLong internal_fa; /* internal file attributes 2 bytes */
uLong external_fa; /* external file attributes 4 bytes */
} zip_fileinfo;
typedef const char* zipcharpc;
extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));
/*
Create a zipfile.
pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on
an Unix computer "zlib/zlib113.zip".
if the file pathname exist and append=1, the zip will be created at the end
of the file. (useful if the file contain a self extractor code)
If the zipfile cannot be opened, the return value is NULL.
Else, the return value is a zipFile Handle, usable with other function
of this zip package.
*/
extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,
int append,
zipcharpc* globalcomment,
zlib_filefunc_def* pzlib_filefunc_def));
extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,
const char* filename,
const zip_fileinfo* zipfi,
const void* extrafield_local,
uInt size_extrafield_local,
const void* extrafield_global,
uInt size_extrafield_global,
const char* comment,
int method,
int level));
/*
Open a file in the ZIP for writing.
filename : the filename in zip (if NULL, '-' without quote will be used
*zipfi contain supplemental information
if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
contains the extrafield data the the local header
if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
contains the extrafield data the the local header
if comment != NULL, comment contain the comment string
method contain the compression method (0 for store, Z_DEFLATED for deflate)
level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
*/
extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,
const char* filename,
const zip_fileinfo* zipfi,
const void* extrafield_local,
uInt size_extrafield_local,
const void* extrafield_global,
uInt size_extrafield_global,
const char* comment,
int method,
int level,
int raw));
/*
Same than zipOpenNewFileInZip, except if raw=1, we write raw file
*/
extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,
const voidp buf,
unsigned len));
/*
Write data in the zipfile
*/
extern int ZEXPORT zipCloseFileInZip OF((zipFile file));
/*
Close the current file in the zipfile
*/
extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,
uLong uncompressed_size,
uLong crc32));
/*
Close the current file in the zipfile, for fiel opened with
parameter raw=1 in zipOpenNewFileInZip2
uncompressed_size and crc32 are value for the uncompressed size
*/
extern int ZEXPORT zipClose OF((zipFile file,
const char* global_comment));
/*
Close the zipfile
*/
#ifdef __cplusplus
}
#endif
#endif /* _zip_H */

1892
Libs/zlib/zlib.h
View file

File diff suppressed because it is too large Load diff

10
TombEngine.sln
View file

@ -1,18 +1,24 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31911.196
# Visual Studio Version 17
VisualStudioVersion = 17.4.33205.214
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TombEngine", "TombEngine\TombEngine.vcxproj", "{15AB0220-541C-4DA1-94EB-ED3C47E4582E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Debug|x64.ActiveCfg = Debug|x64
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Debug|x64.Build.0 = Debug|x64
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Debug|x86.ActiveCfg = Debug|Win32
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Debug|x86.Build.0 = Debug|Win32
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Release|x64.ActiveCfg = Release|x64
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Release|x64.Build.0 = Release|x64
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Release|x86.ActiveCfg = Release|Win32
{15AB0220-541C-4DA1-94EB-ED3C47E4582E}.Release|x86.Build.0 = Release|Win32
EndGlobalSection

32
TombEngine/Game/Lara/lara_struct.h
View file

@ -959,16 +959,14 @@ enum class JumpDirection
struct Ammo
{
using CountType = unsigned short;
private:
CountType Count = 0;
bool IsInfinite = false;
unsigned int Count = 0;
bool IsInfinite = false;
public:
static CountType Clamp(int value)
static unsigned int Clamp(long value)
{
return std::clamp(value, 0, (int)std::numeric_limits<CountType>::max());
return std::clamp<unsigned int>(value, 0, UINT_MAX);
}
bool HasInfinite() const
@ -976,7 +974,7 @@ public:
return IsInfinite;
}
CountType GetCount() const
unsigned int GetCount() const
{
return Count;
}
@ -1013,15 +1011,15 @@ public:
return temp;
}
Ammo& operator =(size_t value)
Ammo& operator =(unsigned int value)
{
Count = Clamp(value);
Count = value;
return *this;
}
bool operator ==(size_t value)
bool operator ==(unsigned int value)
{
return (Count == Clamp(value));
return (Count == value);
}
Ammo& operator =(Ammo& ammo)
@ -1031,30 +1029,30 @@ public:
return *this;
}
Ammo operator +(size_t value)
Ammo operator +(unsigned int value)
{
auto temp = *this;
temp += value;
return temp;
}
Ammo operator -(size_t value)
Ammo operator -(unsigned int value)
{
auto temp = *this;
temp -= value;
return temp;
}
Ammo& operator +=(size_t value)
Ammo& operator +=(unsigned int value)
{
int temp = Count + value;
long temp = Count + value;
Count = Clamp(temp);
return *this;
}
Ammo& operator -=(size_t value)
Ammo& operator -=(unsigned int value)
{
int temp = Count - value;
long temp = Count - value;
Count = Clamp(temp);
return *this;
}

4
TombEngine/Game/control/lot.cpp
View file

@ -245,7 +245,7 @@ void CreateZone(ItemInfo* item)
auto* node = creature->LOT.Node.data();
creature->LOT.ZoneCount = 0;
for (size_t i = 0; i < g_Level.Boxes.size(); i++)
for (int i = 0; i < g_Level.Boxes.size(); i++)
{
node->boxNumber = i;
node++;
@ -263,7 +263,7 @@ void CreateZone(ItemInfo* item)
auto* node = creature->LOT.Node.data();
creature->LOT.ZoneCount = 0;
for (size_t i = 0; i < g_Level.Boxes.size(); i++)
for (int i = 0; i < g_Level.Boxes.size(); i++)
{
if (*zone == zoneNumber || *flippedZone == flippedZoneNumber)
{

4
TombEngine/Game/control/volume.cpp
View file

@ -88,7 +88,7 @@ namespace TEN::Control::Volumes
VolumeState* entryPtr = nullptr;
for (int j = volume.StateQueue.size() - 1; j >= 0; j--)
for (int j = (int)volume.StateQueue.size() - 1; j >= 0; j--)
{
auto& candidate = volume.StateQueue[j];
@ -201,7 +201,7 @@ namespace TEN::Control::Volumes
nodeCatalogs.push_back(path.path().filename().string());
}
if (nodeCatalogs.size() == 0)
if (nodeCatalogs.empty())
return;
TENLog("Loading node scripts...", LogLevel::Info);

2
TombEngine/Game/effects/Streamer.cpp
View file

@ -120,7 +120,7 @@ namespace TEN::Effects::Streamer
// Get and extend streamer with new segment.
auto& streamer = GetStreamer(tag);
streamer.AddSegment(pos, direction, orient2D, color, width, life, vel, scaleRate, rot2D, flags, streamer.Segments.size());
streamer.AddSegment(pos, direction, orient2D, color, width, life, vel, scaleRate, rot2D, flags, (unsigned int)streamer.Segments.size());
}
void StreamerModule::Update()

10
TombEngine/Game/items.cpp
View file

@ -106,17 +106,21 @@ bool ItemInfo::TestMeshSwapFlags(const std::vector<unsigned int>& flags)
void ItemInfo::SetMeshSwapFlags(unsigned int flags, bool clear)
{
bool isMeshSwapPresent = Objects[ObjectNumber].meshSwapSlot != -1 &&
Objects[Objects[ObjectNumber].meshSwapSlot].loaded;
bool isMeshSwapPresent = (Objects[ObjectNumber].meshSwapSlot != -1 &&
Objects[Objects[ObjectNumber].meshSwapSlot].loaded);
for (size_t i = 0; i < Model.MeshIndex.size(); i++)
for (int i = 0; i < Model.MeshIndex.size(); i++)
{
if (isMeshSwapPresent && (flags & (1 << i)))
{
if (clear)
{
Model.MeshIndex[i] = Model.BaseMesh + i;
}
else
{
Model.MeshIndex[i] = Objects[Objects[ObjectNumber].meshSwapSlot].meshIndex + i;
}
}
else
{

11
TombEngine/Game/room.cpp
View file

@ -29,7 +29,7 @@ void DoFlipMap(short group)
{
ROOM_INFO temp;
for (size_t i = 0; i < g_Level.Rooms.size(); i++)
for (int i = 0; i < g_Level.Rooms.size(); i++)
{
auto* room = &g_Level.Rooms[i];
@ -51,10 +51,11 @@ void DoFlipMap(short group)
AddRoomFlipItems(room);
g_Renderer.FlipRooms(static_cast<short>(i), room->flippedRoom);
g_Renderer.FlipRooms(i, room->flippedRoom);
for (auto& fd : room->floor)
fd.Room = i;
for (auto& fd : flipped->floor)
fd.Room = room->flippedRoom;
}
@ -127,10 +128,10 @@ int IsRoomOutside(int x, int y, int z)
int xTable = x / SECTOR(1);
int zTable = z / SECTOR(1);
if (OutsideRoomTable[xTable][zTable].size() == 0)
if (OutsideRoomTable[xTable][zTable].empty())
return NO_ROOM;
for (size_t i = 0; i < OutsideRoomTable[xTable][zTable].size(); i++)
for (int i = 0; i < OutsideRoomTable[xTable][zTable].size(); i++)
{
short roomNumber = OutsideRoomTable[xTable][zTable][i];
auto* room = &g_Level.Rooms[roomNumber];
@ -256,7 +257,7 @@ std::set<int> GetRoomList(int roomNumber)
void InitializeNeighborRoomList()
{
for (size_t i = 0; i < g_Level.Rooms.size(); i++)
for (int i = 0; i < g_Level.Rooms.size(); i++)
{
auto* room = &g_Level.Rooms[i];

2
TombEngine/Objects/TR1/Entity/tr1_ape.cpp
View file

@ -169,7 +169,7 @@ namespace TEN::Entities::Creatures::TR1
if (item->HitPoints <= 0)
{
if (item->Animation.ActiveState != APE_STATE_DEATH)
SetAnimation(item, ApeDeathAnims[Random::GenerateInt(0, ApeDeathAnims.size() - 1)]);
SetAnimation(item, ApeDeathAnims[Random::GenerateInt(0, (int)ApeDeathAnims.size() - 1)]);
}
else
{

2
TombEngine/Objects/TR3/Entity/PunaBoss.cpp
View file

@ -117,7 +117,7 @@ namespace TEN::Entities::Creatures::TR3
if (lizardList.size() == 1)
return lizardList[0];
else
return lizardList[Random::GenerateInt(0, lizardList.size() - 1)];
return lizardList[Random::GenerateInt(0, (int)lizardList.size() - 1)];
}
static bool IsLizardActiveNearby(const ItemInfo& item, bool isInitializing = false)

2
TombEngine/Objects/TR3/Entity/tr3_raptor.cpp
View file

@ -88,7 +88,7 @@ namespace TEN::Entities::Creatures::TR3
if (item->HitPoints <= 0)
{
if (item->Animation.ActiveState != RAPTOR_STATE_DEATH)
SetAnimation(item, RaptorDeathAnims[Random::GenerateInt(0, RaptorDeathAnims.size() - 1)]);
SetAnimation(item, RaptorDeathAnims[Random::GenerateInt(0, (int)RaptorDeathAnims.size() - 1)]);
}
else
{

2
TombEngine/Objects/TR4/Entity/tr4_dog.cpp
View file

@ -106,7 +106,7 @@ namespace TEN::Entities::TR4
if (item->Animation.AnimNumber == object->animIndex + 1)
item->HitPoints = object->HitPoints;
else if (item->Animation.ActiveState != DOG_STATE_DEATH)
SetAnimation(item, DogDeathAnims[Random::GenerateInt(0, DogDeathAnims.size() - 1)]);
SetAnimation(item, DogDeathAnims[Random::GenerateInt(0, (int)DogDeathAnims.size() - 1)]);
}
else
{

2
TombEngine/Objects/TR5/Entity/tr5_lion.cpp
View file

@ -98,7 +98,7 @@ namespace TEN::Entities::Creatures::TR5
item->HitPoints = 0;
if (item->Animation.ActiveState != LION_STATE_DEATH)
SetAnimation(item, LionDeathAnims[Random::GenerateInt(0, LionDeathAnims.size() - 1)]);
SetAnimation(item, LionDeathAnims[Random::GenerateInt(0, (int)LionDeathAnims.size() - 1)]);
}
else
{

2
TombEngine/Renderer/Quad/RenderQuad.cpp
View file

@ -51,7 +51,7 @@ namespace TEN::Renderer
D3D11_SUBRESOURCE_DATA initData = {};
initData.pSysMem = quadVertices.data();
initData.SysMemPitch = sizeof(RendererVertex) * quadVertices.size();
initData.SysMemPitch = sizeof(RendererVertex) * (unsigned int)quadVertices.size();
Utils::throwIfFailed(device->CreateBuffer(&bufferDesc, &initData, quadVertexBuffer.GetAddressOf()));
}
}

22
TombEngine/Renderer/RenderTargetCubeArray/RenderTargetCubeArray.cpp
View file

@ -7,9 +7,9 @@ namespace TEN::Renderer
RenderTargetCubeArray::RenderTargetCubeArray(ID3D11Device* device, size_t resolution, size_t numCubes, DXGI_FORMAT colorFormat,DXGI_FORMAT depthFormat) : numCubes(numCubes), resolution(resolution), viewport(CreateViewport(resolution))
{
D3D11_TEXTURE2D_DESC desc = {};
desc.ArraySize = numCubes*6;
desc.Height = resolution;
desc.Width = resolution;
desc.ArraySize = (unsigned int)numCubes * 6;
desc.Height = (unsigned int)resolution;
desc.Width = (unsigned int)resolution;
desc.MiscFlags = D3D11_RESOURCE_MISC_TEXTURECUBE;
desc.Usage = D3D11_USAGE_DEFAULT;
desc.CPUAccessFlags = 0x0;
@ -27,11 +27,11 @@ namespace TEN::Renderer
viewDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
RenderTargetView.resize(numCubes);
for (int i = 0; i < numCubes - 1; i++)
for (int i = 0; i < (int)numCubes - 1; i++)
{
for (int j = 0; j < 6; j++)
{
viewDesc.Texture2DArray.FirstArraySlice = D3D11CalcSubresource(0, i * numCubes + j, 1);
viewDesc.Texture2DArray.FirstArraySlice = D3D11CalcSubresource(0, i * (unsigned int)numCubes + j, 1);
res = device->CreateRenderTargetView(Texture.Get(), &viewDesc, RenderTargetView[i][j].GetAddressOf());
Utils::throwIfFailed(res);
}
@ -39,7 +39,7 @@ namespace TEN::Renderer
D3D11_SHADER_RESOURCE_VIEW_DESC srvDesc = {};
srvDesc.Format = colorFormat;
srvDesc.TextureCubeArray.NumCubes = numCubes;
srvDesc.TextureCubeArray.NumCubes = (unsigned int)numCubes;
srvDesc.TextureCubeArray.First2DArrayFace = 0;
srvDesc.TextureCubeArray.MipLevels = 1;
srvDesc.TextureCubeArray.MostDetailedMip = 0;
@ -47,10 +47,10 @@ namespace TEN::Renderer
res = device->CreateShaderResourceView(Texture.Get(), &srvDesc,ShaderResourceView.GetAddressOf());
Utils::throwIfFailed(res);
D3D11_TEXTURE2D_DESC depthTexDesc = {};
depthTexDesc.Width = resolution;
depthTexDesc.Height = resolution;
depthTexDesc.Width = (unsigned int)resolution;
depthTexDesc.Height = (unsigned int)resolution;
depthTexDesc.MipLevels = 1;
depthTexDesc.ArraySize = numCubes*6;
depthTexDesc.ArraySize = (unsigned int)numCubes * 6;
depthTexDesc.SampleDesc.Count = 1;
depthTexDesc.SampleDesc.Quality = 0;
depthTexDesc.Format = depthFormat;
@ -68,11 +68,11 @@ namespace TEN::Renderer
dsvDesc.Texture2DArray.ArraySize = 1;
DepthStencilView.resize(numCubes);
for (int i = 0; i < numCubes - 1; i++)
for (int i = 0; i < (int)numCubes - 1; i++)
{
for (int j = 0; j < 6; j++)
{
dsvDesc.Texture2DArray.FirstArraySlice = D3D11CalcSubresource(0, i * numCubes + j, 1);
dsvDesc.Texture2DArray.FirstArraySlice = D3D11CalcSubresource(0, i * (unsigned int)numCubes + j, 1);
res = device->CreateDepthStencilView(DepthStencilTexture.Get(), &dsvDesc, DepthStencilView[i][j].GetAddressOf());
Utils::throwIfFailed(res);
}

31
TombEngine/Renderer/Renderer11.cpp
View file

@ -233,8 +233,8 @@ namespace TEN::Renderer
vertices[i].Bone = 0.0f;
}
this->InnerVertexBuffer = VertexBuffer(devicePtr, vertices.size(), vertices.data());
this->InnerIndexBuffer = IndexBuffer(devicePtr, barIndices.size(), barIndices.data());
InnerVertexBuffer = VertexBuffer(devicePtr, (int)vertices.size(), vertices.data());
InnerIndexBuffer = IndexBuffer(devicePtr, (int)barIndices.size(), barIndices.data());
auto borderVertices = std::array<RendererVertex, barBorderVertices.size()>{};
for (int i = 0; i < barBorderVertices.size(); i++)
@ -246,8 +246,8 @@ namespace TEN::Renderer
borderVertices[i].Bone = 0.0f;
}
this->VertexBufferBorder = VertexBuffer(devicePtr, borderVertices.size(), borderVertices.data());
this->IndexBufferBorder = IndexBuffer(devicePtr, barBorderIndices.size(), barBorderIndices.data());
VertexBufferBorder = VertexBuffer(devicePtr, (int)borderVertices.size(), borderVertices.data());
IndexBufferBorder = IndexBuffer(devicePtr, (int)barBorderIndices.size(), barBorderIndices.data());
}
float Renderer11::CalculateFrameRate()
@ -262,9 +262,9 @@ namespace TEN::Renderer
double t;
time_t this_time;
this_time = clock();
t = (this_time - last_time) / static_cast<double>(CLOCKS_PER_SEC);
t = (this_time - last_time) / (double)CLOCKS_PER_SEC;
last_time = this_time;
fps = static_cast<float>(count / t);
fps = float(count / t);
count = 0;
}
@ -275,7 +275,7 @@ namespace TEN::Renderer
void Renderer11::BindTexture(TEXTURE_REGISTERS registerType, TextureBase* texture, SAMPLER_STATES samplerType)
{
m_context->PSSetShaderResources(static_cast<UINT>(registerType), 1, texture->ShaderResourceView.GetAddressOf());
m_context->PSSetShaderResources((UINT)registerType, 1, texture->ShaderResourceView.GetAddressOf());
ID3D11SamplerState* samplerState = nullptr;
switch (samplerType)
@ -313,7 +313,7 @@ namespace TEN::Renderer
void Renderer11::BindRenderTargetAsTexture(TEXTURE_REGISTERS registerType, RenderTarget2D* target, SAMPLER_STATES samplerType)
{
m_context->PSSetShaderResources(static_cast<UINT>(registerType), 1, target->ShaderResourceView.GetAddressOf());
m_context->PSSetShaderResources((UINT)registerType, 1, target->ShaderResourceView.GetAddressOf());
ID3D11SamplerState* samplerState = nullptr;
switch (samplerType)
@ -352,28 +352,25 @@ namespace TEN::Renderer
void Renderer11::BindRoomLights(std::vector<RendererLight*>& lights)
{
for (int i = 0; i < lights.size(); i++)
{
memcpy(&m_stRoom.RoomLights[i], lights[i], sizeof(ShaderLight));
}
m_stRoom.NumRoomLights = lights.size();
m_stRoom.NumRoomLights = (int)lights.size();
}
void Renderer11::BindStaticLights(std::vector<RendererLight*>& lights)
{
for (int i = 0; i < lights.size(); i++)
{
memcpy(&m_stStatic.Lights[i], lights[i], sizeof(ShaderLight));
}
m_stStatic.NumLights = lights.size();
m_stStatic.NumLights = (int)lights.size();
}
void Renderer11::BindInstancedStaticLights(std::vector<RendererLight*>& lights, int instanceID)
{
for (int i = 0; i < lights.size(); i++)
{
memcpy(&m_stInstancedStaticMeshBuffer.StaticMeshes[instanceID].Lights[i], lights[i], sizeof(ShaderLight));
}
m_stInstancedStaticMeshBuffer.StaticMeshes[instanceID].NumLights = lights.size();
m_stInstancedStaticMeshBuffer.StaticMeshes[instanceID].NumLights = (int)lights.size();
}
void Renderer11::BindMoveableLights(std::vector<RendererLight*>& lights, int roomNumber, int prevRoomNumber, float fade)

90
TombEngine/Renderer/Renderer11Compatibility.cpp
View file

@ -36,13 +36,16 @@ namespace TEN::Renderer
{
TEXTURE* texture = &g_Level.AnimatedTextures[i];
Texture2D normal;
if (texture->normalMapData.size() < 1) {
if (texture->normalMapData.size() < 1)
{
normal = CreateDefaultNormalTexture();
}
else {
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), texture->normalMapData.size());
else
{
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), (int)texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), texture->colorMapData.size()), normal);
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), (int)texture->colorMapData.size()), normal);
m_animatedTextures[i] = tex;
}
@ -76,12 +79,16 @@ namespace TEN::Renderer
{
TEXTURE *texture = &g_Level.RoomTextures[i];
Texture2D normal;
if (texture->normalMapData.size() < 1) {
if (texture->normalMapData.size() < 1)
{
normal = CreateDefaultNormalTexture();
} else {
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), texture->colorMapData.size()), normal);
else
{
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), (int)texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), (int)texture->colorMapData.size()), normal);
m_roomTextures[i] = tex;
#ifdef DUMP_TEXTURES
@ -101,12 +108,16 @@ namespace TEN::Renderer
{
TEXTURE *texture = &g_Level.MoveablesTextures[i];
Texture2D normal;
if (texture->normalMapData.size() < 1) {
if (texture->normalMapData.size() < 1)
{
normal = CreateDefaultNormalTexture();
} else {
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), texture->colorMapData.size()), normal);
else
{
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), (int)texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), (int)texture->colorMapData.size()), normal);
m_moveablesTextures[i] = tex;
#ifdef DUMP_TEXTURES
@ -126,12 +137,16 @@ namespace TEN::Renderer
{
TEXTURE *texture = &g_Level.StaticsTextures[i];
Texture2D normal;
if (texture->normalMapData.size() < 1) {
if (texture->normalMapData.size() < 1)
{
normal = CreateDefaultNormalTexture();
} else {
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), texture->colorMapData.size()), normal);
else
{
normal = Texture2D(m_device.Get(), texture->normalMapData.data(), (int)texture->normalMapData.size());
}
TexturePair tex = std::make_tuple(Texture2D(m_device.Get(), texture->colorMapData.data(), (int)texture->colorMapData.size()), normal);
m_staticsTextures[i] = tex;
#ifdef DUMP_TEXTURES
@ -150,13 +165,13 @@ namespace TEN::Renderer
for (int i = 0; i < g_Level.SpritesTextures.size(); i++)
{
TEXTURE *texture = &g_Level.SpritesTextures[i];
m_spritesTextures[i] = Texture2D(m_device.Get(), texture->colorMapData.data(), texture->colorMapData.size());
m_spritesTextures[i] = Texture2D(m_device.Get(), texture->colorMapData.data(), (int)texture->colorMapData.size());
}
if (m_spritesTextures.size() > 0)
TENLog("Generated " + std::to_string(m_spritesTextures.size()) + " sprite atlases.", LogLevel::Info);
TENLog("Generated " + std::to_string((int)m_spritesTextures.size()) + " sprite atlases.", LogLevel::Info);
m_skyTexture = Texture2D(m_device.Get(), g_Level.SkyTexture.colorMapData.data(), g_Level.SkyTexture.colorMapData.size());
m_skyTexture = Texture2D(m_device.Get(), g_Level.SkyTexture.colorMapData.data(), (int)g_Level.SkyTexture.colorMapData.size());
TENLog("Loaded sky texture.", LogLevel::Info);
@ -207,7 +222,7 @@ namespace TEN::Renderer
if (room.doors.size() != 0)
{
r->Doors.resize(room.doors.size());
r->Doors.resize((int)room.doors.size());
for (int l = 0; l < room.doors.size(); l++)
{
@ -223,8 +238,7 @@ namespace TEN::Renderer
room.x + oldDoor->vertices[k].x,
room.y + oldDoor->vertices[k].y,
room.z + oldDoor->vertices[k].z,
1.0f
);
1.0f);
}
}
}
@ -233,7 +247,7 @@ namespace TEN::Renderer
{
r->Statics.resize(room.mesh.size());
for (int l = 0; l < room.mesh.size(); l++)
for (int l = 0; l < (int)room.mesh.size(); l++)
{
RendererStatic* staticInfo = &r->Statics[l];
MESH_INFO* oldMesh = &room.mesh[l];
@ -252,7 +266,7 @@ namespace TEN::Renderer
}
}
if (room.positions.size() == 0)
if (room.positions.empty())
continue;
for (auto& levelBucket : room.buckets)
@ -307,7 +321,10 @@ namespace TEN::Renderer
vertex->Effects = Vector4(room.effects[index].x, room.effects[index].y, room.effects[index].z, 0);
const unsigned long long primes[]{ 73856093ULL, 19349663ULL, 83492791ULL };
vertex->Hash = std::hash<float>{}((vertex->Position.x)* primes[0]) ^ (std::hash<float>{}(vertex->Position.y)* primes[1]) ^ std::hash<float>{}(vertex->Position.z) * primes[2];
vertex->Hash = (unsigned int)std::hash<float>{}
((vertex->Position.x)* primes[0]) ^
((unsigned int)std::hash<float>{}(vertex->Position.y) * primes[1]) ^
(unsigned int)std::hash<float>{}(vertex->Position.z) * primes[2];
vertex->Bone = 0;
lastVertex++;
@ -408,8 +425,8 @@ namespace TEN::Renderer
}
}
}
m_roomsVertexBuffer = VertexBuffer(m_device.Get(), m_roomsVertices.size(), m_roomsVertices.data());
m_roomsIndexBuffer = IndexBuffer(m_device.Get(), m_roomsIndices.size(), m_roomsIndices.data());
m_roomsVertexBuffer = VertexBuffer(m_device.Get(), (int)m_roomsVertices.size(), m_roomsVertices.data());
m_roomsIndexBuffer = IndexBuffer(m_device.Get(), (int)m_roomsIndices.size(), m_roomsIndices.data());
std::for_each(std::execution::par_unseq,
m_rooms.begin(),
@ -752,8 +769,8 @@ namespace TEN::Renderer
}
}
m_moveablesVertexBuffer = VertexBuffer(m_device.Get(), m_moveablesVertices.size(), m_moveablesVertices.data());
m_moveablesIndexBuffer = IndexBuffer(m_device.Get(), m_moveablesIndices.size(), m_moveablesIndices.data());
m_moveablesVertexBuffer = VertexBuffer(m_device.Get(), (int)m_moveablesVertices.size(), m_moveablesVertices.data());
m_moveablesIndexBuffer = IndexBuffer(m_device.Get(), (int)m_moveablesIndices.size(), m_moveablesIndices.data());
TENLog("Preparing static mesh data...", LogLevel::Info);
@ -795,8 +812,8 @@ namespace TEN::Renderer
if (m_staticsVertices.size() > 0)
{
m_staticsVertexBuffer = VertexBuffer(m_device.Get(), m_staticsVertices.size(), m_staticsVertices.data());
m_staticsIndexBuffer = IndexBuffer(m_device.Get(), m_staticsIndices.size(), m_staticsIndices.data());
m_staticsVertexBuffer = VertexBuffer(m_device.Get(), (int)m_staticsVertices.size(), m_staticsVertices.data());
m_staticsIndexBuffer = IndexBuffer(m_device.Get(), (int)m_staticsIndices.size(), m_staticsIndices.data());
}
else
{
@ -854,7 +871,7 @@ namespace TEN::Renderer
mesh->Sphere = meshPtr->sphere;
mesh->LightMode = LIGHT_MODES(meshPtr->lightMode);
if (meshPtr->positions.size() == 0)
if (meshPtr->positions.empty())
return mesh;
mesh->Positions.resize(meshPtr->positions.size());
@ -873,7 +890,7 @@ namespace TEN::Renderer
bucket.NumVertices = levelBucket->numQuads * 4 + levelBucket->numTriangles * 3;
bucket.NumIndices = levelBucket->numQuads * 6 + levelBucket->numTriangles * 3;
for (int p = 0; p < levelBucket->polygons.size(); p++)
for (int p = 0; p < (int)levelBucket->polygons.size(); p++)
{
POLYGON* poly = &levelBucket->polygons[p];
RendererPolygon newPoly;
@ -886,7 +903,7 @@ namespace TEN::Renderer
int baseVertices = *lastVertex;
for (int k = 0; k < poly->indices.size(); k++)
for (int k = 0; k < (int)poly->indices.size(); k++)
{
RendererVertex vertex;
int v = poly->indices[k];
@ -911,7 +928,10 @@ namespace TEN::Renderer
vertex.OriginalIndex = v;
vertex.Effects = Vector4(meshPtr->effects[v].x, meshPtr->effects[v].y, meshPtr->effects[v].z, poly->shineStrength);
vertex.Hash = std::hash<float>{}(vertex.Position.x) ^ std::hash<float>{}(vertex.Position.y) ^ std::hash<float>{}(vertex.Position.z);
vertex.Hash = (unsigned int)std::hash<float>{}
(vertex.Position.x) ^
(unsigned int)std::hash<float>{}(vertex.Position.y) ^
(unsigned int)std::hash<float>{}(vertex.Position.z);
if (obj->Type == 0)
m_moveablesVertices[*lastVertex] = vertex;

34
TombEngine/Renderer/Renderer11Draw.cpp
View file

@ -106,7 +106,7 @@ namespace TEN::Renderer
else
{
std::copy(nearestSpheres.begin(), nearestSpheres.end(), m_stShadowMap.Spheres);
m_stShadowMap.NumSpheres = nearestSpheres.size();
m_stShadowMap.NumSpheres = (int)nearestSpheres.size();
}
}
@ -527,7 +527,7 @@ namespace TEN::Renderer
{
RendererBucket* bucket = &mesh->Buckets[b];
if (bucket->Polygons.size() == 0)
if (bucket->Polygons.empty())
continue;
DrawIndexedTriangles(bucket->NumIndices, bucket->StartIndex, 0);
@ -728,7 +728,7 @@ namespace TEN::Renderer
{
RendererBucket* bucket = &mesh->Buckets[b];
if (bucket->Polygons.size() == 0)
if (bucket->Polygons.empty())
continue;
DrawIndexedTriangles(bucket->NumIndices, bucket->StartIndex, 0);
@ -1031,7 +1031,7 @@ namespace TEN::Renderer
}
);
for (int r = view.roomsToDraw.size() - 1; r >= 0; r--)
for (int r = (int)view.roomsToDraw.size() - 1; r >= 0; r--)
{
RendererRoom& room = *view.roomsToDraw[r];
@ -1314,10 +1314,10 @@ namespace TEN::Renderer
SetDepthState(DEPTH_STATE_READ_ONLY_ZBUFFER);
SetCullMode(CULL_MODE_CCW);
m_biggestRoomIndexBuffer = std::fmaxf(m_biggestRoomIndexBuffer, m_transparentFacesIndices.size());
m_biggestRoomIndexBuffer = std::fmaxf(m_biggestRoomIndexBuffer, (int)m_transparentFacesIndices.size());
int drawnVertices = 0;
int size = m_transparentFacesIndices.size();
int size = (int)m_transparentFacesIndices.size();
while (drawnVertices < size)
{
@ -1376,7 +1376,7 @@ namespace TEN::Renderer
SetCullMode(CULL_MODE_CCW);
int drawnVertices = 0;
int size = m_transparentFacesIndices.size();
int size = (int)m_transparentFacesIndices.size();
while (drawnVertices < size)
{
@ -1702,10 +1702,10 @@ namespace TEN::Renderer
m_stItem.Color = item->Color;
m_stItem.AmbientLight = item->AmbientLight;
memcpy(m_stItem.BonesMatrices, item->AnimationTransforms, sizeof(Matrix) * MAX_BONES);
for (int k = 0; k < moveableObj.ObjectMeshes.size(); k++)
{
m_stItem.BoneLightModes[k] = moveableObj.ObjectMeshes[k]->LightMode;
}
BindMoveableLights(item->LightsToDraw, item->RoomNumber, item->PrevRoomNumber, item->LightFade);
m_cbItem.updateData(m_stItem, m_context.Get());
BindConstantBufferVS(CB_ITEM, m_cbItem.get());
@ -1744,10 +1744,10 @@ namespace TEN::Renderer
m_stItem.Color = info->color;
m_stItem.AmbientLight = info->item->AmbientLight;
memcpy(m_stItem.BonesMatrices, info->item->AnimationTransforms, sizeof(Matrix) * MAX_BONES);
for (int k = 0; k < moveableObj.ObjectMeshes.size(); k++)
{
for (int k = 0; k < (int)moveableObj.ObjectMeshes.size(); k++)
m_stItem.BoneLightModes[k] = moveableObj.ObjectMeshes[k]->LightMode;
}
BindMoveableLights(info->item->LightsToDraw, info->item->RoomNumber, info->item->PrevRoomNumber, info->item->LightFade);
m_cbItem.updateData(m_stItem, m_context.Get());
BindConstantBufferVS(CB_ITEM, m_cbItem.get());
@ -1766,7 +1766,7 @@ namespace TEN::Renderer
SetCullMode(CULL_MODE_CCW);
int drawnVertices = 0;
int size = m_transparentFacesIndices.size();
int size = (int)m_transparentFacesIndices.size();
while (drawnVertices < size)
{
@ -1924,13 +1924,13 @@ namespace TEN::Renderer
if (DoesBlendModeRequireSorting(bucket.BlendMode))
{
// Collect transparent faces
for (int j = 0; j < bucket.Polygons.size(); j++)
for (int j = 0; j < (int)bucket.Polygons.size(); j++)
{
RendererPolygon* p = &bucket.Polygons[j];
// As polygon distance, for moveables, we use the averaged distance
Vector3 centre = Vector3::Transform(p->centre, msh->World);
int distance = (centre - cameraPosition).Length();
auto centre = Vector3::Transform(p->centre, msh->World);
float distance = (centre - cameraPosition).Length();
RendererTransparentFace face;
face.type = RendererTransparentFaceType::TRANSPARENT_FACE_STATIC;
@ -2001,7 +2001,7 @@ namespace TEN::Renderer
}
m_numRoomsTransparentPolygons = 0;
for (int i = view.roomsToDraw.size() - 1; i >= 0; i--)
for (int i = (int)view.roomsToDraw.size() - 1; i >= 0; i--)
{
int index = i;
RendererRoom* room = view.roomsToDraw[index];

6
TombEngine/Renderer/Renderer11DrawEffect.cpp
View file

@ -1253,7 +1253,7 @@ namespace TEN::Renderer
BindConstantBufferPS(CB_INSTANCED_SPRITES, m_cbInstancedSpriteBuffer.get());
// Draw sprites with instancing.
DrawInstancedTriangles(4, spriteBucket.SpritesToDraw.size(), 0);
DrawInstancedTriangles(4, (unsigned int)spriteBucket.SpritesToDraw.size(), 0);
m_numSpritesDrawCalls++;
}
@ -1338,7 +1338,7 @@ namespace TEN::Renderer
m_context->VSSetShader(m_vsSprites.Get(), NULL, 0);
m_context->PSSetShader(m_psSprites.Get(), NULL, 0);
m_transparentFacesVertexBuffer.Update(m_context.Get(), m_transparentFacesVertices, 0, m_transparentFacesVertices.size());
m_transparentFacesVertexBuffer.Update(m_context.Get(), m_transparentFacesVertices, 0, (int)m_transparentFacesVertices.size());
m_context->IASetVertexBuffers(0, 1, m_transparentFacesVertexBuffer.Buffer.GetAddressOf(), &stride, &offset);
m_context->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
@ -1361,7 +1361,7 @@ namespace TEN::Renderer
BindTexture(TEXTURE_COLOR_MAP, info->sprite->Sprite->Texture, SAMPLER_LINEAR_CLAMP);
DrawTriangles(m_transparentFacesVertices.size(), 0);
DrawTriangles((int)m_transparentFacesVertices.size(), 0);
m_numTransparentDrawCalls++;
m_numSpritesTransparentDrawCalls++;

6
TombEngine/Renderer/Renderer11Frame.cpp
View file

@ -352,7 +352,7 @@ namespace TEN::Renderer
RendererRoom& room = m_rooms[roomNumber];
ROOM_INFO* r = &g_Level.Rooms[room.RoomNumber];
if (r->mesh.size() == 0)
if (r->mesh.empty())
{
return;
}
@ -386,7 +386,7 @@ namespace TEN::Renderer
auto& obj = *m_staticObjects[mesh->ObjectNumber];
if (obj.ObjectMeshes.size() == 0)
if (obj.ObjectMeshes.empty())
{
continue;
}
@ -482,7 +482,7 @@ namespace TEN::Renderer
for (int roomToCheck : room.Neighbors)
{
RendererRoom& currentRoom = m_rooms[roomToCheck];
int numLights = currentRoom.Lights.size();
int numLights = (int)currentRoom.Lights.size();
for (int j = 0; j < numLights; j++)
{

2
TombEngine/Renderer/Renderer11Helper.cpp
View file

@ -449,7 +449,7 @@ namespace TEN::Renderer
// AddLine3D(v1, v2, Vector4::One);
}
return moveable.ObjectMeshes.size();
return (int)moveable.ObjectMeshes.size();
}
void Renderer11::GetBoneMatrix(short itemNumber, int jointIndex, Matrix* outMatrix)

8
TombEngine/Renderer/Utils.cpp
View file

@ -73,8 +73,8 @@ namespace TEN::Renderer::Utils
if constexpr(DebugBuild)
{
char buffer[100];
size_t sz = std::wcstombs(buffer, fileName.c_str(), 100);
shader->SetPrivateData(WKPDID_D3DDebugObjectName, sz, buffer);
unsigned int size = (unsigned int)std::wcstombs(buffer, fileName.c_str(), 100);
shader->SetPrivateData(WKPDID_D3DDebugObjectName, size, buffer);
}
return shader;
@ -91,8 +91,8 @@ namespace TEN::Renderer::Utils
if constexpr(DebugBuild)
{
char buffer[100];
size_t sz = std::wcstombs(buffer, fileName.c_str(), 100);
shader->SetPrivateData(WKPDID_D3DDebugObjectName, sz, buffer);
unsigned int size = (unsigned int)std::wcstombs(buffer, fileName.c_str(), 100);
shader->SetPrivateData(WKPDID_D3DDebugObjectName, size, buffer);
}
return shader;

2
TombEngine/Scripting/Internal/TEN/Flow/FlowHandler.cpp
View file

@ -313,7 +313,7 @@ Level* FlowHandler::GetCurrentLevel()
int FlowHandler::GetNumLevels() const
{
return Levels.size();
return (int)Levels.size();
}
int FlowHandler::GetLevelNumber(const std::string& fileName)

77
TombEngine/Scripting/Internal/TEN/Logic/LogicHandler.cpp
View file

@ -100,6 +100,7 @@ void SetVariable(sol::table tab, sol::object key, sol::object value)
{
ScriptAssert(false, "Variable has an unsupported type.", ErrorMode::Terminate);
}
key.pop();
};
@ -112,6 +113,7 @@ void SetVariable(sol::table tab, sol::object key, sol::object value)
case sol::type::table:
PutVar(tab, key, value);
break;
case sol::type::userdata:
{
if (value.is<Vec2>() ||
@ -126,7 +128,8 @@ void SetVariable(sol::table tab, sol::object key, sol::object value)
UnsupportedValue(tab, key);
}
}
break;
break;
default:
UnsupportedValue(tab, key);
}
@ -268,34 +271,34 @@ bool LogicHandler::SetLevelFuncsMember(sol::table tab, const std::string& name,
}
else if (sol::type::function == value.get_type())
{
// Add the name to the table of names
// Add name to table of names.
auto partName = tab.raw_get<std::string>(strKey);
auto fullName = partName + "." + name;
auto& parentNameTab = m_levelFuncs_tablesOfNames[partName];
parentNameTab.insert_or_assign(name, fullName);
// Create a LevelFunc userdata and add that too
// Create LevelFunc userdata and add that too.
LevelFunc levelFuncObject;
levelFuncObject.m_funcName = fullName;
levelFuncObject.m_handler = this;
m_levelFuncs_levelFuncObjects[fullName] = levelFuncObject;
// Add the function itself
// Add function itself.
m_levelFuncs_luaFunctions[fullName] = value;
}
else if (sol::type::table == value.get_type())
{
// Create and add a new name map
// Create and add new name map.
std::unordered_map<std::string, std::string> newNameMap;
auto fullName = tab.raw_get<std::string>(strKey) + "." + name;
m_levelFuncs_tablesOfNames.insert_or_assign(fullName, newNameMap);
// Create a new table to put in the LevelFuncs hierarchy
// Create new table to put in the LevelFuncs hierarchy.
auto newLevelFuncsTab = MakeSpecialTable(m_handler.GetState(), name, &LogicHandler::GetLevelFuncsMember, &LogicHandler::SetLevelFuncsMember, this);
newLevelFuncsTab.raw_set(strKey, fullName);
tab.raw_set(name, newLevelFuncsTab);
// "populate" the new table. This will trigger the __newindex metafunction and will
// "Populate" new table. This will trigger the __newindex metafunction and will
// thus call this function recursively, handling all subtables and functions.
for (auto& [key, val] : value.as<sol::table>())
newLevelFuncsTab[key] = val;
@ -368,15 +371,15 @@ void LogicHandler::FreeLevelScripts()
m_handler.GetState()->collect_garbage();
}
//Used when loading
void LogicHandler::SetVariables(std::vector<SavedVar> const & vars)
// Used when loading.
void LogicHandler::SetVariables(const std::vector<SavedVar>& vars)
{
ResetGameTables();
ResetLevelTables();
std::unordered_map<uint32_t, sol::table> solTables;
for(std::size_t i = 0; i < vars.size(); ++i)
for(int i = 0; i < vars.size(); ++i)
{
if (std::holds_alternative<IndexTable>(vars[i]))
{
@ -451,14 +454,12 @@ void LogicHandler::SetVariables(std::vector<SavedVar> const & vars)
sol::table gameVars = rootTable[ScriptReserved_GameVars];
for (auto& [first, second] : gameVars)
{
(*m_handler.GetState())[ScriptReserved_GameVars][first] = second;
}
}
template<SavedVarType TypeEnum, typename TypeTo, typename TypeFrom, typename MapType> int32_t Handle(TypeFrom & var, MapType & varsMap, size_t & nVars, std::vector<SavedVar> & vars)
template<SavedVarType TypeEnum, typename TypeTo, typename TypeFrom, typename MapType> int32_t Handle(TypeFrom& var, MapType& varsMap, size_t& numVars, std::vector<SavedVar>& vars)
{
auto [first, second] = varsMap.insert(std::make_pair(&var, nVars));
auto [first, second] = varsMap.insert(std::make_pair(&var, (int)numVars));
if (second)
{
@ -466,7 +467,7 @@ template<SavedVarType TypeEnum, typename TypeTo, typename TypeFrom, typename Map
TypeTo varTo = (TypeTo)var;
savedVar.emplace<(int)TypeEnum>(varTo);
vars.push_back(varTo);
++nVars;
++numVars;
}
return first->second;
@ -486,21 +487,17 @@ std::string LogicHandler::GetRequestedPath() const
{
auto part = std::get<std::string>(key);
if (i > 0)
{
path += "." + part;
}
else
{
path += part;
};
}
}
return path;
}
// Used when saving
void LogicHandler::GetVariables(std::vector<SavedVar> & vars)
// Used when saving.
void LogicHandler::GetVariables(std::vector<SavedVar>& vars)
{
sol::table tab{ *m_handler.GetState(), sol::create };
tab[ScriptReserved_LevelVars] = (*m_handler.GetState())[ScriptReserved_LevelVars];
@ -510,7 +507,7 @@ void LogicHandler::GetVariables(std::vector<SavedVar> & vars)
std::unordered_map<double, uint32_t> numMap;
std::unordered_map<bool, uint32_t> boolMap;
size_t nVars = 0;
size_t numVars = 0;
// The following functions will all try to put their values in a map. If it succeeds
// then the value was not already in the map, so we can put it into the var vector.
@ -522,51 +519,51 @@ void LogicHandler::GetVariables(std::vector<SavedVar> & vars)
auto handleNum = [&](auto num, auto map)
{
auto [first, second] = map.insert(std::make_pair(num, nVars));
auto [first, second] = map.insert(std::make_pair(num, (int)numVars));
if (second)
{
vars.push_back(num);
++nVars;
++numVars;
}
return first->second;
};
auto handleStr = [&](sol::object const& obj)
auto handleStr = [&](const sol::object& obj)
{
auto str = obj.as<sol::string_view>();
auto [first, second] = varsMap.insert(std::make_pair(str.data(), nVars));
auto [first, second] = varsMap.insert(std::make_pair(str.data(), (int)numVars));
if (second)
{
vars.push_back(std::string{ str.data() });
++nVars;
++numVars;
}
return first->second;
};
auto handleFuncName = [&](LevelFunc const& fnh)
auto handleFuncName = [&](const LevelFunc& fnh)
{
auto [first, second] = varsMap.insert(std::make_pair(&fnh, nVars));
auto [first, second] = varsMap.insert(std::make_pair(&fnh, (int)numVars));
if (second)
{
vars.push_back(FuncName{ std::string{ fnh.m_funcName } });
++nVars;
++numVars;
}
return first->second;
};
std::function<uint32_t(const sol::table&)> populate = [&](const sol::table& obj)
std::function<uint32_t(const sol::table&)> populate = [&](const sol::table& obj)
{
auto [first, second] = varsMap.insert(std::make_pair(obj.pointer(), nVars));
auto [first, second] = varsMap.insert(std::make_pair(obj.pointer(), (int)numVars));
if(second)
{
++nVars;
++numVars;
auto id = first->second;
vars.push_back(IndexTable{});
@ -576,7 +573,8 @@ void LogicHandler::GetVariables(std::vector<SavedVar> & vars)
bool validKey = true;
uint32_t keyIndex = 0;
std::variant<std::string, uint32_t> key{uint32_t(0)};
// Strings and numbers can be keys AND values
// Strings and numbers can be keys AND values.
switch (first.get_type())
{
case sol::type::string:
@ -638,19 +636,19 @@ void LogicHandler::GetVariables(std::vector<SavedVar> & vars)
{
if (second.is<Vec2>())
{
putInVars(Handle<SavedVarType::Vec2, Vector2i>(second.as<Vec2>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Vec2, Vector2i>(second.as<Vec2>(), varsMap, numVars, vars));
}
else if (second.is<Vec3>())
{
putInVars(Handle<SavedVarType::Vec3, Vector3i>(second.as<Vec3>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Vec3, Vector3i>(second.as<Vec3>(), varsMap, numVars, vars));
}
else if (second.is<Rotation>())
{
putInVars(Handle<SavedVarType::Rotation, Vector3>(second.as<Rotation>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Rotation, Vector3>(second.as<Rotation>(), varsMap, numVars, vars));
}
else if (second.is<ScriptColor>())
{
putInVars(Handle<SavedVarType::Color, D3DCOLOR>(second.as<ScriptColor>(), varsMap, nVars, vars));
putInVars(Handle<SavedVarType::Color, D3DCOLOR>(second.as<ScriptColor>(), varsMap, numVars, vars));
}
else if (second.is<LevelFunc>())
{
@ -882,12 +880,15 @@ void LogicHandler::OnEnd(GameStatus reason)
case GameStatus::LaraDead:
endReason = LevelEndReason::Death;
break;
case GameStatus::LevelComplete:
endReason = LevelEndReason::LevelComplete;
break;
case GameStatus::ExitToTitle:
endReason = LevelEndReason::ExitToTitle;
break;
case GameStatus::LoadGame:
endReason = LevelEndReason::LoadGame;
break;

2
TombEngine/Specific/BitField.cpp
View file

@ -40,7 +40,7 @@ namespace TEN::Utils
unsigned int BitField::GetSize() const
{
return Bits.size();
return (unsigned int)Bits.size();
}
unsigned int BitField::GetCount() const

8
TombEngine/Specific/IO/ChunkId.cpp
View file

@ -7,7 +7,7 @@ ChunkId::ChunkId(char* bytes, int length)
{
if (length == 0)
{
m_chunkBytes = NULL;
m_chunkBytes = nullptr;
m_length = 0;
}
else
@ -20,18 +20,18 @@ ChunkId::ChunkId(char* bytes, int length)
ChunkId::~ChunkId()
{
if (m_chunkBytes != NULL)
if (m_chunkBytes != nullptr)
delete m_chunkBytes;
}
std::unique_ptr<ChunkId> ChunkId::FromString(const char* str)
{
return std::make_unique<ChunkId>((char*)str, strlen(str));
return std::make_unique<ChunkId>((char*)str, (int)strlen(str));
}
std::unique_ptr<ChunkId> ChunkId::FromString(string* str)
{
return std::make_unique<ChunkId>( (char*)str->c_str(), str->length());
return std::make_unique<ChunkId>((char*)str->c_str(), (int)str->length());
}
std::unique_ptr<ChunkId> ChunkId::FromStream(BaseStream* stream)

22
TombEngine/Specific/Input/Input.cpp
View file

@ -182,12 +182,12 @@ namespace TEN::Input
}
// If controller is XInput and default bindings were successfully assigned, save configuration.
if (ApplyDefaultXInputBindings())
{
g_Configuration.EnableRumble = (OisRumble != nullptr);
g_Configuration.EnableThumbstickCameraControl = true;
SaveConfiguration();
}
if (ApplyDefaultXInputBindings())
{
g_Configuration.EnableRumble = (OisRumble != nullptr);
g_Configuration.EnableThumbstickCameraControl = true;
SaveConfiguration();
}
}
catch (OIS::Exception& ex)
{
@ -759,11 +759,11 @@ namespace TEN::Input
}
}
void ApplyDefaultBindings()
{
ApplyBindings(DefaultBindings);
ApplyDefaultXInputBindings();
}
void ApplyDefaultBindings()
{
ApplyBindings(DefaultBindings);
ApplyDefaultXInputBindings();
}
bool ApplyDefaultXInputBindings()
{

142
TombEngine/Specific/trutils.cpp
View file

@ -10,7 +10,7 @@ namespace TEN::Utils
std::transform(string.begin(), string.end(), string.begin(), [](unsigned char c) { return std::toupper(c); });
return string;
}
std::string ToLower(std::string string)
{
std::transform(string.begin(), string.end(), string.begin(), [](unsigned char c) { return std::tolower(c); });
@ -24,29 +24,29 @@ namespace TEN::Utils
std::string ToString(const wchar_t* string)
{
auto converter = std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>();
auto converter = std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t>();
return converter.to_bytes(std::wstring(string));
}
std::wstring ToWString(const std::string& string)
{
auto cString = string.c_str();
int size = MultiByteToWideChar(CP_UTF8, 0, cString, string.size(), nullptr, 0);
auto wString = std::wstring(size, 0);
MultiByteToWideChar(CP_UTF8, 0, cString, strlen(cString), &wString[0], size);
return wString;
}
std::wstring ToWString(const std::string& string)
{
auto cString = string.c_str();
int size = MultiByteToWideChar(CP_UTF8, 0, cString, (int)string.size(), nullptr, 0);
auto wString = std::wstring(size, 0);
MultiByteToWideChar(CP_UTF8, 0, cString, (int)strlen(cString), &wString[0], size);
return wString;
}
std::wstring ToWString(const char* source)
{
wchar_t buffer[UCHAR_MAX];
std::mbstowcs(buffer, source, UCHAR_MAX);
return std::wstring(buffer);
}
std::wstring ToWString(const char* source)
{
wchar_t buffer[UCHAR_MAX];
std::mbstowcs(buffer, source, UCHAR_MAX);
return std::wstring(buffer);
}
std::vector<std::string> SplitString(const std::string& string)
{
auto strings = std::vector<std::string>{};
auto strings = std::vector<std::string>{};
// String is single line; exit early.
if (string.find('\n') == std::string::npos)
@ -67,66 +67,66 @@ namespace TEN::Utils
return strings;
}
std::vector<unsigned short> GetProductOrFileVersion(bool productVersion)
{
char fileName[UCHAR_MAX] = {};
std::vector<unsigned short> GetProductOrFileVersion(bool productVersion)
{
char fileName[UCHAR_MAX] = {};
if (!GetModuleFileNameA(nullptr, fileName, UCHAR_MAX))
{
TENLog("Can't get current assembly filename", LogLevel::Error);
return {};
}
if (!GetModuleFileNameA(nullptr, fileName, UCHAR_MAX))
{
TENLog("Can't get current assembly filename", LogLevel::Error);
return {};
}
int size = GetFileVersionInfoSizeA(fileName, NULL);
int size = GetFileVersionInfoSizeA(fileName, NULL);
if (size == 0)
{
TENLog("GetFileVersionInfoSizeA failed", LogLevel::Error);
return {};
}
std::unique_ptr<unsigned char> buffer(new unsigned char[size]);
if (size == 0)
{
TENLog("GetFileVersionInfoSizeA failed", LogLevel::Error);
return {};
}
std::unique_ptr<unsigned char> buffer(new unsigned char[size]);
// Load version info.
if (!GetFileVersionInfoA(fileName, 0, size, buffer.get()))
{
TENLog("GetFileVersionInfoA failed", LogLevel::Error);
return {};
}
// Load version info.
if (!GetFileVersionInfoA(fileName, 0, size, buffer.get()))
{
TENLog("GetFileVersionInfoA failed", LogLevel::Error);
return {};
}
VS_FIXEDFILEINFO* info;
unsigned int infoSize;
VS_FIXEDFILEINFO* info;
unsigned int infoSize;
if (!VerQueryValueA(buffer.get(), "\\", (void**)&info, &infoSize))
{
TENLog("VerQueryValueA failed", LogLevel::Error);
return {};
}
if (!VerQueryValueA(buffer.get(), "\\", (void**)&info, &infoSize))
{
TENLog("VerQueryValueA failed", LogLevel::Error);
return {};
}
if (infoSize != sizeof(VS_FIXEDFILEINFO))
{
TENLog("VerQueryValueA returned wrong size for VS_FIXEDFILEINFO", LogLevel::Error);
return {};
}
if (infoSize != sizeof(VS_FIXEDFILEINFO))
{
TENLog("VerQueryValueA returned wrong size for VS_FIXEDFILEINFO", LogLevel::Error);
return {};
}
if (productVersion)
{
return
{
HIWORD(info->dwProductVersionMS),
LOWORD(info->dwProductVersionMS),
HIWORD(info->dwProductVersionLS),
LOWORD(info->dwProductVersionLS)
};
}
else
{
return
{
HIWORD(info->dwFileVersionMS),
LOWORD(info->dwFileVersionMS),
HIWORD(info->dwFileVersionLS),
LOWORD(info->dwFileVersionLS)
};
}
}
if (productVersion)
{
return
{
HIWORD(info->dwProductVersionMS),
LOWORD(info->dwProductVersionMS),
HIWORD(info->dwProductVersionLS),
LOWORD(info->dwProductVersionLS)
};
}
else
{
return
{
HIWORD(info->dwFileVersionMS),
LOWORD(info->dwFileVersionMS),
HIWORD(info->dwFileVersionLS),
LOWORD(info->dwFileVersionLS)
};
}
}
}

8
TombEngine/Specific/winmain.cpp
View file

@ -297,7 +297,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
auto windowName = (std::string("Starting TombEngine version ") +
std::to_string(ver[0]) + "." +
std::to_string(ver[1]) + "." +
std::to_string(ver[2]));
std::to_string(ver[2]) + " " +
#ifdef _WIN64
"(64-bit)"
#else
"(32-bit)"
#endif
);
TENLog(windowName, LogLevel::Info);
SaveGame::AddGameDirToSavePath(gameDir);

313
TombEngine/TombEngine.vcxproj
View file

@ -5,10 +5,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
@ -25,12 +33,24 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@ -39,31 +59,57 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
<ExecutablePath>$(ExecutablePath);$(DXSDK_DIR)Utilities\bin\x86</ExecutablePath>
<IncludePath>$(SolutionDir)Libs;$(SolutionDir)Libs\lua;$(SolutionDir)Libs\sol;$(SolutionDir)Libs\zlib;$(SolutionDir)Libs\spdlog;$(SolutionDir)Libs\ois;$(SolutionDir)Libs\bass;$(IncludePath)</IncludePath>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Libs\spdlog;$(SolutionDir)Libs\lua;$(SolutionDir)Libs\zlib\dll32;$(SolutionDir)Libs\bass;$(SolutionDir)Libs\ois</LibraryPath>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Libs\spdlog\x86;$(SolutionDir)Libs\lua\x86;$(SolutionDir)Libs\zlib\x86;$(SolutionDir)Libs\bass\x86;$(SolutionDir)Libs\ois\x86</LibraryPath>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ExecutablePath>$(ExecutablePath);$(DXSDK_DIR)Utilities\bin\x64</ExecutablePath>
<IncludePath>$(SolutionDir)Libs;$(SolutionDir)Libs\lua;$(SolutionDir)Libs\sol;$(SolutionDir)Libs\zlib;$(SolutionDir)Libs\spdlog;$(SolutionDir)Libs\ois;$(SolutionDir)Libs\bass;$(IncludePath)</IncludePath>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x64;$(SolutionDir)Libs\spdlog\x64;$(SolutionDir)Libs\lua\x64;$(SolutionDir)Libs\zlib\x64;$(SolutionDir)Libs\bass\x64;$(SolutionDir)Libs\ois\x64</LibraryPath>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
<TargetName>$(ProjectName)</TargetName>
<OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
<ExecutablePath>$(ExecutablePath);$(DXSDK_DIR)Utilities\bin\x86</ExecutablePath>
<IncludePath>$(SolutionDir)Libs;$(SolutionDir)Libs\lua;$(SolutionDir)Libs\sol;$(SolutionDir)Libs\ois;$(SolutionDir)Libs\spdlog;$(SolutionDir)Libs\zlib;$(SolutionDir)Libs\bass;$(IncludePath)</IncludePath>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Libs\spdlog;$(SolutionDir)Libs\zlib\dll32;$(SolutionDir)Libs\lua;$(SolutionDir)Libs\ois;$(SolutionDir)Libs\bass</LibraryPath>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x86;$(SolutionDir)Libs\spdlog\x86;$(SolutionDir)Libs\lua\x86;$(SolutionDir)Libs\zlib\x86;$(SolutionDir)Libs\bass\x86;$(SolutionDir)Libs\ois\x86</LibraryPath>
<TargetExt>.exe</TargetExt>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ExecutablePath>$(ExecutablePath);$(DXSDK_DIR)Utilities\bin\x64</ExecutablePath>
<IncludePath>$(SolutionDir)Libs;$(SolutionDir)Libs\lua;$(SolutionDir)Libs\sol;$(SolutionDir)Libs\zlib;$(SolutionDir)Libs\spdlog;$(SolutionDir)Libs\ois;$(SolutionDir)Libs\bass;$(IncludePath)</IncludePath>
<LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x64;$(SolutionDir)Libs\spdlog\x64;$(SolutionDir)Libs\lua\x64;$(SolutionDir)Libs\zlib\x64;$(SolutionDir)Libs\bass\x64;$(SolutionDir)Libs\ois\x64</LibraryPath>
<TargetExt>.exe</TargetExt>
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)Build\$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
<TargetName>$(ProjectName)</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;TombEngine_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;NEW_TIGHTROPE;CREATURE_AI_PRIORITY_OPTIMIZATION;SPDLOG_COMPILED_LIB;SOL_SAFE_USERTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;TombEngine_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;CREATURE_AI_PRIORITY_OPTIMIZATION;SPDLOG_COMPILED_LIB;SOL_SAFE_USERTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)TombEngine;$(SolutionDir)TombEngine\Game;$(SolutionDir)TombEngine\Game\Lara;$(SolutionDir)TombEngine\Objects;$(SolutionDir)TombEngine\Objects\Utils;$(SolutionDir)TombEngine\Objects\Effects;$(SolutionDir)TombEngine\Objects\Generic;$(SolutionDir)TombEngine\Objects\Generic\Doors;$(SolutionDir)TombEngine\Objects\Generic\Switches;$(SolutionDir)TombEngine\Objects\Generic\Object;$(SolutionDir)TombEngine\Objects\TR1;$(SolutionDir)TombEngine\Objects\TR1\Entity;$(SolutionDir)TombEngine\Objects\TR1\Trap;$(SolutionDir)TombEngine\Objects\TR2;$(SolutionDir)TombEngine\Objects\TR2\Entity;$(SolutionDir)TombEngine\Objects\TR2\Trap;$(SolutionDir)TombEngine\Objects\TR2\Vehicles;$(SolutionDir)TombEngine\Objects\TR3;$(SolutionDir)TombEngine\Objects\TR3\Entity;$(SolutionDir)TombEngine\Objects\TR3\Trap;$(SolutionDir)TombEngine\Objects\TR3\Vehicles;$(SolutionDir)TombEngine\Objects\TR4;$(SolutionDir)TombEngine\Objects\TR4\Entity;$(SolutionDir)TombEngine\Objects\TR4\Trap;$(SolutionDir)TombEngine\Objects\TR4\Object;$(SolutionDir)TombEngine\Objects\TR4\Floor;$(SolutionDir)TombEngine\Objects\TR4\Switch;$(SolutionDir)TombEngine\Objects\TR4\Vehicles;$(SolutionDir)TombEngine\Objects\TR5;$(SolutionDir)TombEngine\Objects\TR5\Entity;$(SolutionDir)TombEngine\Objects\TR5\Trap;$(SolutionDir)TombEngine\Objects\TR5\Light;$(SolutionDir)TombEngine\Objects\TR5\Emitter;$(SolutionDir)TombEngine\Objects\TR5\Shatter;$(SolutionDir)TombEngine\Objects\TR5\Switch;$(SolutionDir)TombEngine\Objects\TR5\Object;$(SolutionDir)TombEngine\Objects\Vehicles;$(SolutionDir)TombEngine\Renderer;$(SolutionDir)TombEngine\Specific;$(SolutionDir)TombEngine\Specific\IO;$(SolutionDir)TombEngine\Sound;$(SolutionDir)TombEngine\Game\pickup;$(SolutionDir)TombEngine\Game\itemdata;$(SolutionDir)TombEngine\Game\effects;$(SolutionDir)TombEngine\Scripting\Include;$(SolutionDir)TombEngine\Scripting\Internal;$(SolutionDir)TombEngine\Scripting\Internal\TEN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -94,17 +140,71 @@
<PreBuildEvent>
<Command>CD $(ProjectDir)Specific\savegame\schema\
CALL gen.bat
md "$(TargetDir)\Shaders"
xcopy /Y "$(ProjectDir)Shaders\*.*" "$(TargetDir)\Shaders"
xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
<Message>Generating savegame flatbuffer and copying shaders to output...</Message>
md "$(TargetDir)\Shaders"
xcopy /Y /D "$(ProjectDir)Shaders\*.*" "$(TargetDir)Shaders\"
xcopy /Y /D "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)Shaders\HUD\"
xcopy /Y "$(SolutionDir)Libs\bass\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\lua\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\ois\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\lua\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\zlib\x86\*.dll" "$(TargetDir)"</Command>
<Message>Generating savegame flatbuffer and copying needed files...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;TombEngine_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;CREATURE_AI_PRIORITY_OPTIMIZATION;SPDLOG_COMPILED_LIB;SOL_SAFE_USERTYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)TombEngine;$(SolutionDir)TombEngine\Game;$(SolutionDir)TombEngine\Game\Lara;$(SolutionDir)TombEngine\Objects;$(SolutionDir)TombEngine\Objects\Utils;$(SolutionDir)TombEngine\Objects\Effects;$(SolutionDir)TombEngine\Objects\Generic;$(SolutionDir)TombEngine\Objects\Generic\Doors;$(SolutionDir)TombEngine\Objects\Generic\Switches;$(SolutionDir)TombEngine\Objects\Generic\Object;$(SolutionDir)TombEngine\Objects\TR1;$(SolutionDir)TombEngine\Objects\TR1\Entity;$(SolutionDir)TombEngine\Objects\TR1\Trap;$(SolutionDir)TombEngine\Objects\TR2;$(SolutionDir)TombEngine\Objects\TR2\Entity;$(SolutionDir)TombEngine\Objects\TR2\Trap;$(SolutionDir)TombEngine\Objects\TR2\Vehicles;$(SolutionDir)TombEngine\Objects\TR3;$(SolutionDir)TombEngine\Objects\TR3\Entity;$(SolutionDir)TombEngine\Objects\TR3\Trap;$(SolutionDir)TombEngine\Objects\TR3\Vehicles;$(SolutionDir)TombEngine\Objects\TR4;$(SolutionDir)TombEngine\Objects\TR4\Entity;$(SolutionDir)TombEngine\Objects\TR4\Trap;$(SolutionDir)TombEngine\Objects\TR4\Object;$(SolutionDir)TombEngine\Objects\TR4\Floor;$(SolutionDir)TombEngine\Objects\TR4\Switch;$(SolutionDir)TombEngine\Objects\TR4\Vehicles;$(SolutionDir)TombEngine\Objects\TR5;$(SolutionDir)TombEngine\Objects\TR5\Entity;$(SolutionDir)TombEngine\Objects\TR5\Trap;$(SolutionDir)TombEngine\Objects\TR5\Light;$(SolutionDir)TombEngine\Objects\TR5\Emitter;$(SolutionDir)TombEngine\Objects\TR5\Shatter;$(SolutionDir)TombEngine\Objects\TR5\Switch;$(SolutionDir)TombEngine\Objects\TR5\Object;$(SolutionDir)TombEngine\Objects\Vehicles;$(SolutionDir)TombEngine\Renderer;$(SolutionDir)TombEngine\Specific;$(SolutionDir)TombEngine\Specific\IO;$(SolutionDir)TombEngine\Sound;$(SolutionDir)TombEngine\Game\pickup;$(SolutionDir)TombEngine\Game\itemdata;$(SolutionDir)TombEngine\Game\effects;$(SolutionDir)TombEngine\Scripting\Include;$(SolutionDir)TombEngine\Scripting\Internal;$(SolutionDir)TombEngine\Scripting\Internal\TEN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<LanguageStandard>stdcpp17</LanguageStandard>
<PrecompiledHeaderFile>framework.h</PrecompiledHeaderFile>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<BufferSecurityCheck>false</BufferSecurityCheck>
<AdditionalOptions>/Zc:__cplusplus /experimental:external /external:anglebrackets</AdditionalOptions>
<DisableSpecificWarnings>4244;5051;4018;4554;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>comctl32.lib;lua53.lib;bass.lib;bassmix.lib;bass_fx.lib;D3DCompiler.lib;dxgi.lib;dxguid.lib;d3d11.lib;version.lib;zlib.lib;spdlogd.lib;OIS_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>CD $(ProjectDir)Specific\savegame\schema\
CALL gen.bat
md "$(TargetDir)\Shaders"
xcopy /Y /D "$(ProjectDir)Shaders\*.*" "$(TargetDir)Shaders\"
xcopy /Y /D "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)Shaders\HUD\"
xcopy /Y "$(SolutionDir)Libs\bass\x64\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\lua\x64\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\ois\x64\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\zlib\x64\*.dll" "$(TargetDir)"</Command>
<Message>Generating savegame flatbuffer and copying needed files...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;TombEngine_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;NEW_TIGHTROPE;CREATURE_AI_PRIORITY_OPTIMIZATION;SPDLOG_COMPILED_LIB;SOL_SAFE_USERTYPE;SOL_SAFE_FUNCTION_CALLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;TombEngine_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;CREATURE_AI_PRIORITY_OPTIMIZATION;SPDLOG_COMPILED_LIB;SOL_SAFE_USERTYPE;SOL_SAFE_FUNCTION_CALLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)TombEngine;$(SolutionDir)TombEngine\Game;$(SolutionDir)TombEngine\Game\Lara;$(SolutionDir)TombEngine\Objects;$(SolutionDir)TombEngine\Objects\Utils;$(SolutionDir)TombEngine\Objects\Effects;$(SolutionDir)TombEngine\Objects\Generic;$(SolutionDir)TombEngine\Objects\Generic\Doors;$(SolutionDir)TombEngine\Objects\Generic\Switches;$(SolutionDir)TombEngine\Objects\Generic\Object;$(SolutionDir)TombEngine\Objects\TR1;$(SolutionDir)TombEngine\Objects\TR1\Entity;$(SolutionDir)TombEngine\Objects\TR1\Trap;$(SolutionDir)TombEngine\Objects\TR2;$(SolutionDir)TombEngine\Objects\TR2\Entity;$(SolutionDir)TombEngine\Objects\TR2\Trap;$(SolutionDir)TombEngine\Objects\TR2\Vehicles;$(SolutionDir)TombEngine\Objects\TR3;$(SolutionDir)TombEngine\Objects\TR3\Entity;$(SolutionDir)TombEngine\Objects\TR3\Trap;$(SolutionDir)TombEngine\Objects\TR3\Vehicles;$(SolutionDir)TombEngine\Objects\TR4;$(SolutionDir)TombEngine\Objects\TR4\Entity;$(SolutionDir)TombEngine\Objects\TR4\Trap;$(SolutionDir)TombEngine\Objects\TR4\Object;$(SolutionDir)TombEngine\Objects\TR4\Floor;$(SolutionDir)TombEngine\Objects\TR4\Switch;$(SolutionDir)TombEngine\Objects\TR4\Vehicles;$(SolutionDir)TombEngine\Objects\TR5;$(SolutionDir)TombEngine\Objects\TR5\Entity;$(SolutionDir)TombEngine\Objects\TR5\Trap;$(SolutionDir)TombEngine\Objects\TR5\Light;$(SolutionDir)TombEngine\Objects\TR5\Emitter;$(SolutionDir)TombEngine\Objects\TR5\Shatter;$(SolutionDir)TombEngine\Objects\TR5\Switch;$(SolutionDir)TombEngine\Objects\TR5\Object;$(SolutionDir)TombEngine\Objects\Vehicles;$(SolutionDir)TombEngine\Renderer;$(SolutionDir)TombEngine\Specific;$(SolutionDir)TombEngine\Specific\IO;$(SolutionDir)TombEngine\Sound;$(SolutionDir)TombEngine\Game\pickup;$(SolutionDir)TombEngine\Game\itemdata;$(SolutionDir)TombEngine\Game\effects;$(SolutionDir)TombEngine\Scripting\Include;$(SolutionDir)TombEngine\Scripting\Internal;$(SolutionDir)TombEngine\Scripting\Internal\TEN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -139,16 +239,83 @@ xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>md "$(TargetDir)\Shaders"
xcopy /Y "$(ProjectDir)Shaders\*.*" "$(TargetDir)\Shaders"
xcopy /Y "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)\Shaders\HUD\"</Command>
<Command>
</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>CD $(ProjectDir)Specific\savegame\schema\
CALL gen.bat</Command>
CALL gen.bat
md "$(TargetDir)\Shaders"
xcopy /Y /D "$(ProjectDir)Shaders\*.*" "$(TargetDir)Shaders\"
xcopy /Y /D "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)Shaders\HUD\"
xcopy /Y "$(SolutionDir)Libs\bass\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\lua\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\ois\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\lua\x86\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\zlib\x86\*.dll" "$(TargetDir)"</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Generating savegame flatbuffer...</Message>
<Message>Generating savegame flatbuffer and copying needed files...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;TombEngine_EXPORTS;_WINDOWS;_USRDLL;NOMINMAX;CREATURE_AI_PRIORITY_OPTIMIZATION;SPDLOG_COMPILED_LIB;SOL_SAFE_USERTYPE;SOL_SAFE_FUNCTION_CALLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>false</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir)TombEngine;$(SolutionDir)TombEngine\Game;$(SolutionDir)TombEngine\Game\Lara;$(SolutionDir)TombEngine\Objects;$(SolutionDir)TombEngine\Objects\Utils;$(SolutionDir)TombEngine\Objects\Effects;$(SolutionDir)TombEngine\Objects\Generic;$(SolutionDir)TombEngine\Objects\Generic\Doors;$(SolutionDir)TombEngine\Objects\Generic\Switches;$(SolutionDir)TombEngine\Objects\Generic\Object;$(SolutionDir)TombEngine\Objects\TR1;$(SolutionDir)TombEngine\Objects\TR1\Entity;$(SolutionDir)TombEngine\Objects\TR1\Trap;$(SolutionDir)TombEngine\Objects\TR2;$(SolutionDir)TombEngine\Objects\TR2\Entity;$(SolutionDir)TombEngine\Objects\TR2\Trap;$(SolutionDir)TombEngine\Objects\TR2\Vehicles;$(SolutionDir)TombEngine\Objects\TR3;$(SolutionDir)TombEngine\Objects\TR3\Entity;$(SolutionDir)TombEngine\Objects\TR3\Trap;$(SolutionDir)TombEngine\Objects\TR3\Vehicles;$(SolutionDir)TombEngine\Objects\TR4;$(SolutionDir)TombEngine\Objects\TR4\Entity;$(SolutionDir)TombEngine\Objects\TR4\Trap;$(SolutionDir)TombEngine\Objects\TR4\Object;$(SolutionDir)TombEngine\Objects\TR4\Floor;$(SolutionDir)TombEngine\Objects\TR4\Switch;$(SolutionDir)TombEngine\Objects\TR4\Vehicles;$(SolutionDir)TombEngine\Objects\TR5;$(SolutionDir)TombEngine\Objects\TR5\Entity;$(SolutionDir)TombEngine\Objects\TR5\Trap;$(SolutionDir)TombEngine\Objects\TR5\Light;$(SolutionDir)TombEngine\Objects\TR5\Emitter;$(SolutionDir)TombEngine\Objects\TR5\Shatter;$(SolutionDir)TombEngine\Objects\TR5\Switch;$(SolutionDir)TombEngine\Objects\TR5\Object;$(SolutionDir)TombEngine\Objects\Vehicles;$(SolutionDir)TombEngine\Renderer;$(SolutionDir)TombEngine\Specific;$(SolutionDir)TombEngine\Specific\IO;$(SolutionDir)TombEngine\Sound;$(SolutionDir)TombEngine\Game\pickup;$(SolutionDir)TombEngine\Game\itemdata;$(SolutionDir)TombEngine\Game\effects;$(SolutionDir)TombEngine\Scripting\Include;$(SolutionDir)TombEngine\Scripting\Internal;$(SolutionDir)TombEngine\Scripting\Internal\TEN;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
<LanguageStandard>stdcpp17</LanguageStandard>
<PrecompiledHeaderFile>framework.h</PrecompiledHeaderFile>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>true</WholeProgramOptimization>
<SupportJustMyCode>false</SupportJustMyCode>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<FloatingPointModel>Fast</FloatingPointModel>
<StringPooling>true</StringPooling>
<AdditionalOptions>/Zc:__cplusplus /experimental:external /external:anglebrackets</AdditionalOptions>
<DisableSpecificWarnings>4244;5051;4018;4554;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalDependencies>comctl32.lib;lua53.lib;bass.lib;bassmix.lib;bass_fx.lib;D3DCompiler.lib;dxgi.lib;dxguid.lib;d3d11.lib;version.lib;zlib.lib;spdlog.lib;OIS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>CD $(ProjectDir)Specific\savegame\schema\
CALL gen.bat
md "$(TargetDir)\Shaders"
xcopy /Y /D "$(ProjectDir)Shaders\*.*" "$(TargetDir)Shaders\"
xcopy /Y /D "$(ProjectDir)Shaders\HUD\*.hlsl" "$(TargetDir)Shaders\HUD\"
xcopy /Y "$(SolutionDir)Libs\bass\x64\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\ois\x64\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\lua\x64\*.dll" "$(TargetDir)"
xcopy /Y "$(SolutionDir)Libs\zlib\x64\*.dll" "$(TargetDir)"</Command>
</PreBuildEvent>
<PreBuildEvent>
<Message>Generating savegame flatbuffer and copying needed files...</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
@ -598,7 +765,9 @@ CALL gen.bat</Command>
<ItemGroup>
<ClCompile Include="framework.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Game\animation.cpp" />
<ClCompile Include="Game\camera.cpp" />
@ -902,11 +1071,15 @@ CALL gen.bat</Command>
<ClCompile Include="Renderer\Frustum.cpp" />
<ClCompile Include="Renderer\Quad\RenderQuad.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Use</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Renderer\IndexBuffer\IndexBuffer.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="Renderer\Renderer11.cpp" />
<ClCompile Include="Renderer\Renderer11Compatibility.cpp" />
@ -985,9 +1158,13 @@ CALL gen.bat</Command>
<None Include="Shaders\AnimatedTextures.hlsli" />
<None Include="Shaders\CameraMatrixBuffer.hlsli">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Text</FileType>
</None>
<None Include="Shaders\Blending.hlsli" />
@ -1012,169 +1189,279 @@ CALL gen.bat</Command>
<ItemGroup>
<None Include="Shaders\HUD\DX11_PS_HUD.hlsl">
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
</None>
<None Include="Shaders\HUD\DX11_PS_HUDBar.hlsl">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<AllResourcesBound Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</AllResourcesBound>
<AllResourcesBound Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</AllResourcesBound>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<AllResourcesBound Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</AllResourcesBound>
<AllResourcesBound Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</AllResourcesBound>
</None>
</ItemGroup>
<ItemGroup>
<None Include="Shaders\HUD\DX11_VS_HUD.hlsl">
<FileType>Document</FileType>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.0</ShaderModel>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Vertex</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Vertex</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.0</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.0</ShaderModel>
</None>
</ItemGroup>
<ItemGroup>
<None Include="Shaders\DX11_AmbientCubeMap.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_FinalPass.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_FullscreenQuad.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_Hairs.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_Inventory.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.1</ShaderModel>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.1</ShaderModel>
</None>
<None Include="Shaders\DX11_InstancedSprites.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.1</ShaderModel>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.1</ShaderModel>
</None>
<None Include="Shaders\DX11_Items.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.1</ShaderModel>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.1</ShaderModel>
</None>
<None Include="Shaders\DX11_Rooms.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4.1</ShaderModel>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">SHADOW_MAP_SIZE=512</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">SHADOW_MAP_SIZE=512</PreprocessorDefinitions>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PS</EntryPointName>
<EntryPointName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PS</EntryPointName>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Pixel</ShaderType>
<ShaderType Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Pixel</ShaderType>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4.1</ShaderModel>
<ShaderModel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4.1</ShaderModel>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">SHADOW_MAP_SIZE=512</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">SHADOW_MAP_SIZE=512</PreprocessorDefinitions>
</None>
<None Include="Shaders\DX11_ShadowMap.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_Sky.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_Solid.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_Sprites.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
<None Include="Shaders\DX11_Statics.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
</ItemGroup>
<ItemGroup>
<None Include="Shaders\DX11_InstancedStatics.fx">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<FileType>Document</FileType>
</None>
</ItemGroup>

9
TombEngine/TombEngine.vcxproj.user
View file

@ -8,8 +8,17 @@
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommandArguments>/debug</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerWorkingDirectory>$(SolutionDir)Build\$(Configuration)\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
<LocalDebuggerCommandArguments>/debug</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LocalDebuggerWorkingDirectory>$(SolutionDir)Build\$(Configuration)\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerWorkingDirectory>$(SolutionDir)Build\$(Configuration)\</LocalDebuggerWorkingDirectory>
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>