diff --git a/.appveyor.yml b/.appveyor.yml index 278d6812..20adee80 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,19 +5,50 @@ configuration: - Release platform: - win-x86-librw_d3d9-mss +- win-x86-librw_gl3_glfw-mss environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true + GLEW_VER: "2.1.0" + GLFW_VER: "3.3.2" + GLEW_BASE: glew-%GLEW_VER% + GLFW_BASE: glfw-%GLFW_VER%.bin.WIN32 + GLEW_FILE: "%GLEW_BASE%-win32.zip" + GLFW_FILE: "%GLFW_BASE%.zip" + GLEW_URL: https://github.com/nigels-com/glew/releases/download/%GLEW_BASE%/%GLEW_FILE% + GLFW_URL: https://github.com/glfw/glfw/releases/download/%GLFW_VER%/%GLFW_FILE% install: +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] IF NOT EXIST %GLEW_FILE% appveyor DownloadFile %GLEW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLEW_FILE%" +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] 7z x "%APPVEYOR_BUILD_FOLDER%/%GLEW_FILE%" +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] IF NOT EXIST %GLFW_FILE% appveyor DownloadFile %GLFW_URL% -FileName "%APPVEYOR_BUILD_FOLDER%/%GLFW_FILE%" +- IF [%PLATFORM%] == [win-x86-librw_gl3_glfw-mss] 7z x "%APPVEYOR_BUILD_FOLDER%/%GLFW_FILE%" - cmd: >- git submodule update --init --recursive - premake5 vs2019 --with-librw + premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE% build: project: build/re3.sln verbosity: minimal +after_build: +- 7z a "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" bin/%PLATFORM%/%CONFIGURATION%/re3.exe bin/%PLATFORM%/%CONFIGURATION%/re3.pdb artifacts: -- path: bin/%PLATFORM%/%CONFIGURATION%/re3.exe - name: re3.exe -- path: bin/%PLATFORM%/%CONFIGURATION%/re3.pdb - name: re3.pdb +- path: "re3_%configuration%_%platform%_%APPVEYOR_BUILD_VERSION%.zip" + name: re3 +deploy: +- provider: BinTray + username: shfil119 + api_key: + secure: xWnYDfNWM87iPoBFbz6L1XAduxijJRWSpQLhMDOjznmzbMCsORtdx2tmWmFLTwf6 + subject: gtamodding + repo: re3 + package: "%configuration%_%platform%" + version: "%APPVEYOR_BUILD_VERSION%" + artifact: re3 + publish: true + on: + branch: master + APPVEYOR_REPO_TAG: false + +cache: +- "%GLEW_FILE%" +- "%GLFW_FILE%" diff --git a/README.md b/README.md index 11bfe6fc..2affcc96 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # re3 [![Build status](https://ci.appveyor.com/api/projects/status/hyiwgegks122h8jg?svg=true)](https://ci.appveyor.com/project/aap/re3/branch/master) - - +| Platform | Debug | Release | +|------------------|-------------|-------------| +| Windows Direct3D9 | [![Download](https://api.bintray.com/packages/gtamodding/re3/Debug_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Debug_win-x86-librw_d3d9-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/re3/Release_win-x86-librw_d3d9-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Release_win-x86-librw_d3d9-mss/_latestVersion) | +| Windows OpenGL3.3 | [![Download](https://api.bintray.com/packages/gtamodding/re3/Debug_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Debug_win-x86-librw_gl3_glfw-mss/_latestVersion) | [![Download](https://api.bintray.com/packages/gtamodding/re3/Release_win-x86-librw_gl3_glfw-mss/images/download.svg)](https://bintray.com/gtamodding/re3/Release_win-x86-librw_gl3_glfw-mss/_latestVersion) | ## Intro diff --git a/librw b/librw index dfedaee3..b3ad490d 160000 --- a/librw +++ b/librw @@ -1 +1 @@ -Subproject commit dfedaee353ccbf4dcfcfd3eb4024e0dd8e9b4b69 +Subproject commit b3ad490d1be3c1f41b416d3ceeaff3453bd2d28d diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 7bb18688..5ef3c036 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -26,6 +26,7 @@ #include "PlayerPed.h" #include "Radar.h" #include "debugmenu.h" +#include "Frontend.h" #include @@ -325,6 +326,9 @@ DebugMenuPopulate(void) #ifdef LIBRW DebugMenuAddVarBool8("Render", "PS2 Alpha test Emu", &gPS2alphaTest, nil); #endif + DebugMenuAddVarBool8("Render", "Frame limiter", &FrontEndMenuManager.m_PrefsFrameLimiter, nil); + DebugMenuAddVarBool8("Render", "VSynch", &FrontEndMenuManager.m_PrefsVsync, nil); + DebugMenuAddVar("Render", "Max FPS", &RsGlobal.maxFPS, nil, 1, 1, 1000, nil); DebugMenuAddVarBool8("Debug", "Draw hud", &CHud::m_Wants_To_Draw_Hud, nil); DebugMenuAddVarBool8("Debug", "Edit on", &CSceneEdit::m_bEditOn, nil); diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp index d2547815..9cee41c7 100644 --- a/src/fakerw/fake.cpp +++ b/src/fakerw/fake.cpp @@ -126,8 +126,8 @@ rwFrameList *rwFrameListStreamRead(RwStream *stream, rwFrameList *fl) { return f RwCamera *RwCameraBeginUpdate(RwCamera * camera) { camera->beginUpdate(); return camera; } RwCamera *RwCameraEndUpdate(RwCamera * camera) { camera->endUpdate(); return camera; } RwCamera *RwCameraClear(RwCamera * camera, RwRGBA * colour, RwInt32 clearMode) { camera->clear(colour, clearMode); return camera; } -// WARNING: ignored arguments -RwCamera *RwCameraShowRaster(RwCamera * camera, void *pDev, RwUInt32 flags) { camera->showRaster(); return camera; } +// WARNING: ignored argument +RwCamera *RwCameraShowRaster(RwCamera * camera, void *pDev, RwUInt32 flags) { camera->showRaster(flags); return camera; } RwBool RwCameraDestroy(RwCamera * camera) { camera->destroy(); return true; } RwCamera *RwCameraCreate(void) { return rw::Camera::create(); } RwCamera *RwCameraClone(RwCamera * camera) { return camera->clone(); }