wucket/Z-Sharp
1
0
Fork 0
mirror of https://github.com/sam-astro/Z-Sharp.git synced 2025-12-13 09:02:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed organization, Also built in Release mode so the FPS is often over 300

Browse Source
This commit is contained in:
sam-astro 2022-01-15 14:54:15 -05:00
parent 687b9c6972
commit 483e2952d0
5 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Slang-Installer/Slang-Installer.vdproj
View File

@ -15,19 +15,13 @@
{ {
"Entry" "Entry"
{ {
"MsmKey" = "8:_470F09C8C84C47A9B548CA24BB8A7EA5" "MsmKey" = "8:_8ADF09B7BD7545E0B2DD721FDB93C744"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry" "Entry"
{ {
"MsmKey" = "8:_5065CD61988E4FEC8746D61328B40134" "MsmKey" = "8:_AA01B7461F5045E383661493B7E7654A"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_846A36F2D3634850B528E42DAF481994"
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
@ -37,6 +31,12 @@
"OwnerKey" = "8:_UNDEFINED" "OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED"
} }
"Entry"
{
"MsmKey" = "8:_D83ED5005DC14298848CCC583C2F42F8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
} }
"Configurations" "Configurations"
{ {
@ -45,7 +45,7 @@
"DisplayName" = "8:Debug" "DisplayName" = "8:Debug"
"IsDebugOnly" = "11:TRUE" "IsDebugOnly" = "11:TRUE"
"IsReleaseOnly" = "11:FALSE" "IsReleaseOnly" = "11:FALSE"
"OutputFilename" = "8:Debug\\Slang-Installer.msi" "OutputFilename" = "8:..\\Releases\\Slang-Installer\\Slang-Installer.msi"
"PackageFilesAs" = "3:2" "PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648" "PackageFileSize" = "3:-2147483648"
"CabType" = "3:1" "CabType" = "3:1"
@ -69,7 +69,7 @@
"DisplayName" = "8:Release" "DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE" "IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE" "IsReleaseOnly" = "11:TRUE"
"OutputFilename" = "8:Release\\Slang-Installer.msi" "OutputFilename" = "8:..\\Releases\\Slang-Installer\\Slang-Installer.msi"
"PackageFilesAs" = "3:2" "PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648" "PackageFileSize" = "3:-2147483648"
"CabType" = "3:1" "CabType" = "3:1"
@ -116,10 +116,10 @@
} }
"File" "File"
{ {
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_470F09C8C84C47A9B548CA24BB8A7EA5" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8ADF09B7BD7545E0B2DD721FDB93C744"
{ {
"SourcePath" = "8:..\\x64\\Debug\\SDL2_ttf.dll" "SourcePath" = "8:..\\Releases\\Slang\\SDL2.dll"
"TargetName" = "8:SDL2_ttf.dll" "TargetName" = "8:SDL2.dll"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2"
"Condition" = "8:" "Condition" = "8:"
@ -136,9 +136,9 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5065CD61988E4FEC8746D61328B40134" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AA01B7461F5045E383661493B7E7654A"
{ {
"SourcePath" = "8:..\\x64\\Debug\\SDL2_image.dll" "SourcePath" = "8:..\\Releases\\Slang\\SDL2_image.dll"
"TargetName" = "8:SDL2_image.dll" "TargetName" = "8:SDL2_image.dll"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2"
@ -156,10 +156,10 @@
"IsDependency" = "11:FALSE" "IsDependency" = "11:FALSE"
"IsolateTo" = "8:" "IsolateTo" = "8:"
} }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_846A36F2D3634850B528E42DAF481994" "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D83ED5005DC14298848CCC583C2F42F8"
{ {
"SourcePath" = "8:..\\x64\\Debug\\SDL2.dll" "SourcePath" = "8:..\\Releases\\Slang\\SDL2_ttf.dll"
"TargetName" = "8:SDL2.dll" "TargetName" = "8:SDL2_ttf.dll"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2"
"Condition" = "8:" "Condition" = "8:"
@ -232,15 +232,15 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Slang" "ProductName" = "8:Slang"
"ProductCode" = "8:{75653829-B1CE-495C-BD0F-AAB6FE9D9287}" "ProductCode" = "8:{B8C14611-5E45-49C8-9280-2D15990A20C6}"
"PackageCode" = "8:{6519E63E-AA71-4B86-A421-EF1D9E169E3B}" "PackageCode" = "8:{C4E9A9C2-0853-4CA9-8BE3-F5267F2B67A1}"
"UpgradeCode" = "8:{8ABDE53F-7FF9-455B-A777-B4C1C624FA13}" "UpgradeCode" = "8:{8ABDE53F-7FF9-455B-A777-B4C1C624FA13}"
"AspNetVersion" = "8:2.0.50727.0" "AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE" "InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.4" "ProductVersion" = "8:1.0.5"
"Manufacturer" = "8:Sam-Astro" "Manufacturer" = "8:Sam-Astro"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"
@ -754,7 +754,7 @@
{ {
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AE404ABD11A04BF7AC95D60AB9EC740C" "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AE404ABD11A04BF7AC95D60AB9EC740C"
{ {
"SourcePath" = "8:..\\x64\\Debug\\Slang.exe" "SourcePath" = "8:..\\Releases\\Slang\\Slang.exe"
"TargetName" = "8:" "TargetName" = "8:"
"Tag" = "8:" "Tag" = "8:"
"Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2"

1
Slang.sln
View File

@ -27,6 +27,7 @@ Global
{42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x64.Build.0 = Release {42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x64.Build.0 = Release
{42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x86.ActiveCfg = Debug {42EA0B7A-2068-4065-B9EB-041F32933A66}.Debug|x86.ActiveCfg = Debug
{42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x64.ActiveCfg = Release {42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x64.ActiveCfg = Release
{42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x64.Build.0 = Release
{42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x86.ActiveCfg = Release {42EA0B7A-2068-4065-B9EB-041F32933A66}.Release|x86.ActiveCfg = Release
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution

16
Slang/Pong-Project/script.slg
View File

@ -4,9 +4,9 @@ int SCREENH = 600
int scoreOne = 0 int scoreOne = 0
int scoreTwo = 0 int scoreTwo = 0
float ballSpeed = 8 float ballSpeed = 400
float paddleMoveSpeed = 16 float paddleMoveSpeed = 800
// Main is always run at the VERY BEGINNING. Start() is the start of GRAPHICS // Main is always run at the VERY BEGINNING. Start() is the start of GRAPHICS
// so if you never call SLB.Grapgics.Init, then Start won't run // so if you never call SLB.Grapgics.Init, then Start won't run
@ -63,7 +63,7 @@ func Update(deltaTime)
{ {
float newX = lPaddle.position.x float newX = lPaddle.position.x
// Subtract from Y to move up, because vertical coordinates are reversed // Subtract from Y to move up, because vertical coordinates are reversed
float newY = lPaddleTargetPosition.y - paddleMoveSpeed float newY = lPaddleTargetPosition.y - paddleMoveSpeed * deltaTime
newY = Clamp(newY, 0 + lPaddle.scale.y / 2, SCREENH - lPaddle.scale.y / 2) newY = Clamp(newY, 0 + lPaddle.scale.y / 2, SCREENH - lPaddle.scale.y / 2)
lPaddleTargetPosition = NVec2(newX, newY) lPaddleTargetPosition = NVec2(newX, newY)
} }
@ -71,7 +71,7 @@ func Update(deltaTime)
{ {
float newX = lPaddle.position.x float newX = lPaddle.position.x
// Add to Y to move down, because vertical coordinates are reversed // Add to Y to move down, because vertical coordinates are reversed
float newY = lPaddleTargetPosition.y + paddleMoveSpeed float newY = lPaddleTargetPosition.y + paddleMoveSpeed * deltaTime
newY = Clamp(newY, 0 + lPaddle.scale.y / 2, SCREENH - lPaddle.scale.y / 2) newY = Clamp(newY, 0 + lPaddle.scale.y / 2, SCREENH - lPaddle.scale.y / 2)
lPaddleTargetPosition = NVec2(newX, newY) lPaddleTargetPosition = NVec2(newX, newY)
} }
@ -88,7 +88,7 @@ func Update(deltaTime)
{ {
float newX = rPaddle.position.x float newX = rPaddle.position.x
// Subtract from Y to move up, because vertical coordinates are reversed // Subtract from Y to move up, because vertical coordinates are reversed
float newY = rPaddleTargetPosition.y - paddleMoveSpeed float newY = rPaddleTargetPosition.y - paddleMoveSpeed * deltaTime
newY = Clamp(newY, 0 + rPaddle.scale.y / 2, SCREENH - rPaddle.scale.y / 2) newY = Clamp(newY, 0 + rPaddle.scale.y / 2, SCREENH - rPaddle.scale.y / 2)
rPaddleTargetPosition = NVec2(newX, newY) rPaddleTargetPosition = NVec2(newX, newY)
} }
@ -96,7 +96,7 @@ func Update(deltaTime)
{ {
float newX = rPaddle.position.x float newX = rPaddle.position.x
// Add to Y to move down, because vertical coordinates are reversed // Add to Y to move down, because vertical coordinates are reversed
float newY = rPaddleTargetPosition.y + paddleMoveSpeed float newY = rPaddleTargetPosition.y + paddleMoveSpeed * deltaTime
newY = Clamp(newY, 0 + rPaddle.scale.y / 2, SCREENH - rPaddle.scale.y / 2) newY = Clamp(newY, 0 + rPaddle.scale.y / 2, SCREENH - rPaddle.scale.y / 2)
rPaddleTargetPosition = NVec2(newX, newY) rPaddleTargetPosition = NVec2(newX, newY)
} }
@ -107,7 +107,9 @@ func Update(deltaTime)
float lerpedY = Lerp(oldY, newY, stopSpeed) float lerpedY = Lerp(oldY, newY, stopSpeed)
rPaddle.position = NVec2(newX, lerpedY) rPaddle.position = NVec2(newX, lerpedY)
ballSpr.position += ballVelocity Vec2 scaledVelocity = ballVelocity
scaledVelocity *= deltaTime
ballSpr.position += scaledVelocity
// Finally draws all of the sprites // Finally draws all of the sprites
SLB.Graphics.Draw(ballSpr) SLB.Graphics.Draw(ballSpr)

7
Slang/Slang.vcxproj
View File

@ -82,9 +82,13 @@
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>D:\Code\SDL2-2.0.18\include;D:\Code\SDL2_image-2.0.5\include;D:\Code\SDL2_ttf-2.0.15\include;$(IncludePath)</IncludePath> <IncludePath>D:\Code\SDL2-2.0.18\include;D:\Code\SDL2_image-2.0.5\include;D:\Code\SDL2_ttf-2.0.15\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\Code\SDL2_ttf-2.0.15\lib\x64;D:\Code\SDL2-2.0.18\lib\x64;D:\Code\SDL2_image-2.0.5\lib\x64;$(LibraryPath)</LibraryPath> <LibraryPath>D:\Code\SDL2_ttf-2.0.15\lib\x64;D:\Code\SDL2-2.0.18\lib\x64;D:\Code\SDL2_image-2.0.5\lib\x64;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\Releases\$(ProjectName)</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>D:\Code\SDL2-2.0.18\include;D:\Code\SDL2_image-2.0.5\include;D:\Code\SDL2_ttf-2.0.15\include;$(IncludePath)</IncludePath>
<LibraryPath>D:\Code\SDL2_ttf-2.0.15\lib\x64;D:\Code\SDL2-2.0.18\lib\x64;D:\Code\SDL2_image-2.0.5\lib\x64;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\Releases\$(ProjectName)</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@ -140,12 +144,15 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>D:\Code\SDL2_ttf-2.0.15;D:\Code\boost;D:\Code\SDL2-2.0.18;D:\Code\SDL2_image-2.0.5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>D:\Code\SDL2_ttf-2.0.15\lib\x64;D:\Code\SDL2-2.0.18\lib\x64;D:\Code\boost\libs;D:\Code\SDL2_image-2.0.5\lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_ttf.lib;SDL2_image.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

1
Slang/boost_x64_release.props
View File

@ -8,6 +8,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>D:\Code\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>D:\Code\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>None</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>D:\Code\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>D:\Code\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>