diff --git a/.gitignore b/.gitignore index ed1a67da9..f826c25cf 100644 --- a/.gitignore +++ b/.gitignore @@ -37,8 +37,8 @@ Thumbs.db /Plugin/GFX/lib /Plugin/GFX/map /Plugin/GFX/pdb -/Plugin/GFX/PJ64Glide64.dll -/Plugin/GFX/PJ64Glide64_d.dll +/Plugin/GFX/Project64-Video.dll +/Plugin/GFX/Project64-Video_d.dll /Plugin/Input/lib /Plugin/Input/map /Plugin/Input/pdb diff --git a/Android/Script/copySource.cmd b/Android/Script/copySource.cmd index ec16d0e5e..1d38caef9 100644 --- a/Android/Script/copySource.cmd +++ b/Android/Script/copySource.cmd @@ -23,18 +23,6 @@ echo copy Common xcopy "%base_dir%/Source/Common" "%base_dir%/Android/jni/Common/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) -echo copy Glide64 -xcopy "%base_dir%/Source/Glide64" "%base_dir%/Android/jni/Glide64/" /D /I /F /Y /E -IF %ERRORLEVEL% NEQ 0 (exit /B 1) - -echo copy GlideHQ -xcopy "%base_dir%/Source/GlideHQ" "%base_dir%/Android/jni/GlideHQ/" /D /I /F /Y /E -IF %ERRORLEVEL% NEQ 0 (exit /B 1) - -echo copy Glitch64 -xcopy "%base_dir%/Source/Glitch64" "%base_dir%/Android/jni/Glitch64/" /D /I /F /Y /E -IF %ERRORLEVEL% NEQ 0 (exit /B 1) - echo copy PluginAudio xcopy "%base_dir%/Source/Android/PluginAudio" "%base_dir%/Android/jni/PluginAudio/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) @@ -55,6 +43,10 @@ echo copy Project64-core xcopy "%base_dir%/Source/Project64-core" "%base_dir%/Android/jni/Project64-core/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) +echo copy Project64-video +xcopy "%base_dir%/Source/Project64-video" "%base_dir%/Android/jni/Project64-video/" /D /I /F /Y /E +IF %ERRORLEVEL% NEQ 0 (exit /B 1) + echo copy Settings xcopy "%base_dir%/Source/Settings" "%base_dir%/Android/jni/Settings/" /D /I /F /Y /E IF %ERRORLEVEL% NEQ 0 (exit /B 1) diff --git a/Android/copySource.xml b/Android/copySource.xml index 05f90eed6..1924a8b22 100644 --- a/Android/copySource.xml +++ b/Android/copySource.xml @@ -13,15 +13,6 @@ - - - - - - - - - @@ -37,6 +28,9 @@ + + + diff --git a/Project64.sln b/Project64.sln index 6dcb5fdd6..1f500f53b 100644 --- a/Project64.sln +++ b/Project64.sln @@ -4,8 +4,6 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glide", "Glide", "{9FE699A5-41C3-4441-92AB-639B3D77DE26}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}" @@ -56,11 +54,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginRSP", "Source\Android EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JniBridge", "Source\Android\Bridge\Bridge.vcxproj", "{593B00E6-1987-415D-A62C-26533FC3E95C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Project64-video\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Project64-video\Renderer\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\Project64-video\TextureEnhancer\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64-video", "Source\Project64-video\Project64-video.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -187,22 +181,6 @@ Global {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32 {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64 {A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|x64 - {462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.Build.0 = Debug|x64 - {462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32 - {462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|x64 - {462C2608-182F-452C-944F-AF201E19300B}.Release|x64.Build.0 = Release|x64 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|x64 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.Build.0 = Debug|x64 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|x64 - {2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -216,8 +194,5 @@ Global {1133A1CC-A9E5-4026-B20D-6A2987130D4E} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58} {B685BB34-D700-4FCC-8503-9B6AA1A0C95D} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58} {593B00E6-1987-415D-A62C-26533FC3E95C} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58} - {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} - {462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} - {2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} EndGlobalSection EndGlobal diff --git a/Source/Project64-video/Glide64.vcxproj b/Source/Project64-video/Project64-video.vcxproj similarity index 68% rename from Source/Project64-video/Glide64.vcxproj rename to Source/Project64-video/Project64-video.vcxproj index 51c554bf8..8858722ae 100644 --- a/Source/Project64-video/Glide64.vcxproj +++ b/Source/Project64-video/Project64-video.vcxproj @@ -20,7 +20,7 @@ {A4D13408-A794-4199-8FC7-4A9A32505005} - n64Glide + Project64-video DynamicLibrary @@ -32,8 +32,8 @@ - PJ64Glide64 - PJ64Glide64_d + Project64-Video + Project64-Video_d $(SolutionDir)Plugin\GFX\ $(SolutionDir)Plugin64\GFX\ @@ -51,6 +51,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -98,6 +118,10 @@ + + + + @@ -111,6 +135,24 @@ + + + + + + + + + + + + + + + + + + @@ -144,11 +186,5 @@ {8b9961b1-88d9-4ea3-a752-507a00dd9f3d} false - - {462c2608-182f-452c-944f-af201e19300b} - - - {2daddaa5-0f57-46ed-a974-747908ddc7f3} - \ No newline at end of file diff --git a/Source/Project64-video/Glide64.vcxproj.filters b/Source/Project64-video/Project64-video.vcxproj.filters similarity index 67% rename from Source/Project64-video/Glide64.vcxproj.filters rename to Source/Project64-video/Project64-video.vcxproj.filters index 451d50bfa..af44832b5 100644 --- a/Source/Project64-video/Glide64.vcxproj.filters +++ b/Source/Project64-video/Project64-video.vcxproj.filters @@ -20,6 +20,9 @@ {f0e9ed7a-3046-4b82-a4b1-5f58e1fe7446} + + {2f56a742-ee60-47e1-ae68-6d19d9be996a} + @@ -131,6 +134,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -156,6 +179,36 @@ + + + + + + + + + + + + + + + + + + + + Renderer + + + Renderer + + + Renderer + + + Renderer + diff --git a/Source/Project64-video/Renderer/Glitch64.vcxproj b/Source/Project64-video/Renderer/Glitch64.vcxproj deleted file mode 100644 index 1315eb677..000000000 --- a/Source/Project64-video/Renderer/Glitch64.vcxproj +++ /dev/null @@ -1,71 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {462C2608-182F-452C-944F-AF201E19300B} - glide3x - - - StaticLibrary - - - - - - - - - - inc;%(AdditionalIncludeDirectories) - - - - OpenGL32.lib;%(AdditionalDependencies) - - - - - - true - - - true - - - true - - - true - - - true - - - - - - - - - true - - - - \ No newline at end of file diff --git a/Source/Project64-video/Renderer/Glitch64.vcxproj.filters b/Source/Project64-video/Renderer/Glitch64.vcxproj.filters deleted file mode 100644 index 88266b53a..000000000 --- a/Source/Project64-video/Renderer/Glitch64.vcxproj.filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - {67046859-ebd4-4537-aed8-a6d9f2fd82b5} - *.h - - - {2b6170d8-e8e8-4f3a-94af-a88d7b8ce7d9} - *.cpp - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Headers - - - Source Files - - - Headers - - - \ No newline at end of file diff --git a/Source/Project64-video/Renderer/OGLEScombiner.cpp b/Source/Project64-video/Renderer/OGLEScombiner.cpp index 491e61dfb..a348d68cd 100644 --- a/Source/Project64-video/Renderer/OGLEScombiner.cpp +++ b/Source/Project64-video/Renderer/OGLEScombiner.cpp @@ -29,8 +29,8 @@ #include #include "glide.h" #include "glitchmain.h" -#include -#include +#include +#include #include void vbo_draw(); diff --git a/Source/Project64-video/Renderer/OGLESgeometry.cpp b/Source/Project64-video/Renderer/OGLESgeometry.cpp index 122ffeb56..10cd0f883 100644 --- a/Source/Project64-video/Renderer/OGLESgeometry.cpp +++ b/Source/Project64-video/Renderer/OGLESgeometry.cpp @@ -25,9 +25,9 @@ #endif // _WIN32 #include "glide.h" #include "glitchmain.h" -#include "../Glide64/winlnxdefs.h" -#include "../Glide64/rdp.h" -#include +#include +#include +#include #define Z_MAX (65536.0f) #define VERTEX_SIZE sizeof(VERTEX) //Size of vertex struct diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index e3274a1eb..8e6f8daed 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -35,7 +35,7 @@ #include "glide.h" #include "g3ext.h" #include "glitchmain.h" -#include +#include #define OPENGL_CHECK_ERRORS { const GLenum errcode = glGetError(); if (errcode != GL_NO_ERROR) LOG("OpenGL Error code %i in '%s' line %i\n", errcode, __FILE__, __LINE__-1); } diff --git a/Source/Project64-video/Renderer/OGLEStextures.cpp b/Source/Project64-video/Renderer/OGLEStextures.cpp index 5a715b6a4..c3e869696 100644 --- a/Source/Project64-video/Renderer/OGLEStextures.cpp +++ b/Source/Project64-video/Renderer/OGLEStextures.cpp @@ -26,7 +26,7 @@ #include "glide.h" #include "glitchmain.h" #include -#include +#include /* Napalm extensions to GrTextureFormat_t */ #define GR_TEXFMT_ARGB_CMP_FXT1 0x11 diff --git a/Source/Project64-video/TextureEnhancer/GlideHQ.vcxproj b/Source/Project64-video/TextureEnhancer/GlideHQ.vcxproj deleted file mode 100644 index d45cbc503..000000000 --- a/Source/Project64-video/TextureEnhancer/GlideHQ.vcxproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2DADDAA5-0F57-46ED-A974-747908DDC7F3} - GlideHQ - - - StaticLibrary - - - - - - - - - - - Level3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {731bd205-2826-4631-b7af-117658e88dbc} - - - {b4a4b994-9111-42b1-93c2-6f1ca8bc4421} - false - - - \ No newline at end of file diff --git a/Source/Project64-video/TextureEnhancer/GlideHQ.vcxproj.filters b/Source/Project64-video/TextureEnhancer/GlideHQ.vcxproj.filters deleted file mode 100644 index cdc181abd..000000000 --- a/Source/Project64-video/TextureEnhancer/GlideHQ.vcxproj.filters +++ /dev/null @@ -1,125 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {e42072d3-97be-40c3-b6eb-6a250288e739} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - tc-1.1+ - - - tc-1.1+ - - - tc-1.1+ - - - tc-1.1+ - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - tc-1.1+ - - - tc-1.1+ - - - tc-1.1+ - - - \ No newline at end of file