From 4f960ce6851e35846786090684af4e5791e19c25 Mon Sep 17 00:00:00 2001 From: sam-astro <77079540+sam-astro@users.noreply.github.com> Date: Sat, 15 Jan 2022 15:53:55 -0500 Subject: [PATCH] Revert "Rename to StuLang" This reverts commit c11f089178b58189558dad072df29a8fd3beac13. --- README.md | 4 ++-- .../Slang-Installer.vdproj | 16 ++++++++-------- {StuLang => Slang}/Main.cpp | 4 ++-- .../Pong-Example-Project/arial.ttf | Bin Slang/Pong-Example-Project/circle.png | Bin 0 -> 802 bytes {StuLang => Slang}/Pong-Example-Project/net.png | Bin .../Pong-Example-Project/script.slg | 0 .../Pong-Example-Project/square.png | Bin {StuLang => Slang}/SLB.h | 0 StuLang/StuLang.rc => Slang/Slang.rc | 0 StuLang/StuLang.vcxproj => Slang/Slang.vcxproj | 1 - .../Slang.vcxproj.filters | 0 {StuLang => Slang}/anyops.h | 0 {StuLang => Slang}/boost_x64_release.props | 0 {StuLang => Slang}/builtin.h | 4 ++-- {StuLang => Slang}/eval.cpp | 0 {StuLang => Slang}/eval.h | 0 {StuLang => Slang}/graphics.h | 8 +++++++- {StuLang => Slang}/icon.ico | Bin {StuLang => Slang}/main.h | 0 {StuLang => Slang}/resource.h | 0 {StuLang => Slang}/strops.cpp | 0 {StuLang => Slang}/strops.h | 0 23 files changed, 21 insertions(+), 16 deletions(-) rename {StuLang-Installer => Slang-Installer}/Slang-Installer.vdproj (98%) rename {StuLang => Slang}/Main.cpp (99%) rename {StuLang => Slang}/Pong-Example-Project/arial.ttf (100%) create mode 100644 Slang/Pong-Example-Project/circle.png rename {StuLang => Slang}/Pong-Example-Project/net.png (100%) rename {StuLang => Slang}/Pong-Example-Project/script.slg (100%) rename {StuLang => Slang}/Pong-Example-Project/square.png (100%) rename {StuLang => Slang}/SLB.h (100%) rename StuLang/StuLang.rc => Slang/Slang.rc (100%) rename StuLang/StuLang.vcxproj => Slang/Slang.vcxproj (99%) rename StuLang/StuLang.vcxproj.filters => Slang/Slang.vcxproj.filters (100%) rename {StuLang => Slang}/anyops.h (100%) rename {StuLang => Slang}/boost_x64_release.props (100%) rename {StuLang => Slang}/builtin.h (97%) rename {StuLang => Slang}/eval.cpp (100%) rename {StuLang => Slang}/eval.h (100%) rename {StuLang => Slang}/graphics.h (99%) rename {StuLang => Slang}/icon.ico (100%) rename {StuLang => Slang}/main.h (100%) rename {StuLang => Slang}/resource.h (100%) rename {StuLang => Slang}/strops.cpp (100%) rename {StuLang => Slang}/strops.h (100%) diff --git a/README.md b/README.md index 5d526b9..5048ed9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# StuLang -StuLang, which stands for ***Stu****pid **Lang**uage* is a custom programming language I made because I don't like c++ very much (StuLang's interpreter is written in c++ though). StuLang scripts have the file extension .slg. The base syntax and formatting I would say is quite similar to C#, but differs as task complexity increases. It has support for graphics using SDL2, and by default is not enabled. Here is some example code. +# Slang +Slang, which stands for ***S****tupid **Lang**uage* is a custom programming language I made because I don't like c++ very much (Slang's interpreter is written in c++ though). Slang scripts have the file extension .slg. The base syntax and formatting I would say is quite similar to C#, but differs as task complexity increases. It has support for graphics using SDL2, and by default is not enabled. Here is some example code. ```c# // Comments are indicated by two forward slashes // They can only be on their own line diff --git a/StuLang-Installer/Slang-Installer.vdproj b/Slang-Installer/Slang-Installer.vdproj similarity index 98% rename from StuLang-Installer/Slang-Installer.vdproj rename to Slang-Installer/Slang-Installer.vdproj index 7b836d5..7ddaea4 100644 --- a/StuLang-Installer/Slang-Installer.vdproj +++ b/Slang-Installer/Slang-Installer.vdproj @@ -3,7 +3,7 @@ "VSVersion" = "3:800" "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:StuLang-Installer" +"ProjectName" = "8:Slang-Installer" "LanguageId" = "3:1033" "CodePage" = "3:1252" "UILanguageId" = "3:1033" @@ -231,24 +231,24 @@ "Product" { "Name" = "8:Microsoft Visual Studio" - "ProductName" = "8:StuLang" - "ProductCode" = "8:{73C5A50E-101B-40BC-BFD0-CF0BE1CA1034}" - "PackageCode" = "8:{13B0CB72-D249-410A-BFF4-09C8B47D9696}" + "ProductName" = "8:Slang" + "ProductCode" = "8:{506D3959-3D6F-4A4D-8F4C-E7A0F500EFDD}" + "PackageCode" = "8:{F1C0D6B7-AD54-4E72-9BBC-F85826A6A3D7}" "UpgradeCode" = "8:{8ABDE53F-7FF9-455B-A777-B4C1C624FA13}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.1" + "ProductVersion" = "8:1.1.0" "Manufacturer" = "8:Sam-Astro" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" - "Title" = "8:StuLang" + "Title" = "8:Slang" "Subject" = "8:" "ARPCONTACT" = "8:Sam-Astro" "Keywords" = "8:" - "ARPCOMMENTS" = "8:Installer for Stlang interpreter" + "ARPCOMMENTS" = "8:Installer for Slang interpreter" "ARPURLINFOABOUT" = "8:" "ARPPRODUCTICON" = "8:" "ARPIconIndex" = "3:0" @@ -754,7 +754,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_AE404ABD11A04BF7AC95D60AB9EC740C" { - "SourcePath" = "8:..\\Releases\\StuLang\\StuLang.exe" + "SourcePath" = "8:..\\Releases\\Slang\\Slang.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_BCDF457FF4564F7BBFD6AEF054FE16C2" diff --git a/StuLang/Main.cpp b/Slang/Main.cpp similarity index 99% rename from StuLang/Main.cpp rename to Slang/Main.cpp index 157d8c2..86b05a6 100644 --- a/StuLang/Main.cpp +++ b/Slang/Main.cpp @@ -562,7 +562,7 @@ boost::any ExecuteFunction(const string& functionName, const vector& return nullType; } -int parseStuLang(string script) +int parseSlang(string script) { script = replace(script, " ", "\t"); @@ -684,7 +684,7 @@ int main(int argc, char* argv[]) system("pause"); - parseStuLang(scriptString.str()); + parseSlang(scriptString.str()); return 0; } diff --git a/StuLang/Pong-Example-Project/arial.ttf b/Slang/Pong-Example-Project/arial.ttf similarity index 100% rename from StuLang/Pong-Example-Project/arial.ttf rename to Slang/Pong-Example-Project/arial.ttf diff --git a/Slang/Pong-Example-Project/circle.png b/Slang/Pong-Example-Project/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..9508851878cec0c9f37f13a36d4739f2f3ec568c GIT binary patch literal 802 zcmV+-1Ks?IP)Px%+(|@1RCt{2-QjJ6Fc5~}BkCC0A{%s$N?oO^MCu&fpj&j0_D6K8aUcQXyZa8l z_iqDOJTX*lf(J>|`}fap%XZhxdFVYBt6&G(dh(ZsiUcz#Yk+5=0EG`C8lo;5Cgk8~ z2y;c?xE?SIM4cy$%Ym{&)Oo;|A7C#Snl*~q&i4jUX9Z)j)4gM87AW0!coYn+H%hmi z9Sx$c7fhF(934aJfwFlA#2B{~Wz)vQm~IP7^M=HDTq{b`M#NZF3(D#Zh_SAm_;sEq#2xK7Y;Im%~Wv(OCj}Q@6md+;6WSL99<2G721s*U3Uf8ANdI z9}y=B>7H`EoCmlWa`a$8qAnq5mo69(b_)U|`du1*{IV0u4V~S7xeA{lDDO^`afE}g zaRdR2AYc&$EP{YV5U>aW7D2!Y2SNGsH_AA|LD)D5kmz@3^zq9eK-ho$7cS83;Jw<66B4GKiW?<65&hya3!*q_WP#99 zfM{!AvO#F6zCpFu%5P9X{+4y*__gTZ__b*82m%(LbrKk#b&?=HFDocMFDprW#9u&7 zkNDGw(l4GjAQI_Sh{d5f150f8-1f83-41eb-a195-1b5c3ca9322a} Slang 10.0 - StuLang diff --git a/StuLang/StuLang.vcxproj.filters b/Slang/Slang.vcxproj.filters similarity index 100% rename from StuLang/StuLang.vcxproj.filters rename to Slang/Slang.vcxproj.filters diff --git a/StuLang/anyops.h b/Slang/anyops.h similarity index 100% rename from StuLang/anyops.h rename to Slang/anyops.h diff --git a/StuLang/boost_x64_release.props b/Slang/boost_x64_release.props similarity index 100% rename from StuLang/boost_x64_release.props rename to Slang/boost_x64_release.props diff --git a/StuLang/builtin.h b/Slang/builtin.h similarity index 97% rename from StuLang/builtin.h rename to Slang/builtin.h index 76f75a0..10e5077 100644 --- a/StuLang/builtin.h +++ b/Slang/builtin.h @@ -69,7 +69,7 @@ int InterpreterLog(const string& logText) int Min = bt.tm_min; int Sec = bt.tm_sec; - cout << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mStuLang: \x1B[32m" << logText << "\033[0m\t\t" << endl; + cout << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mSlang: \x1B[32m" << logText << "\033[0m\t\t" << endl; return 1; } @@ -92,7 +92,7 @@ int LogCriticalError(const string& errorText) int Min = bt.tm_min; int Sec = bt.tm_sec; - cerr << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mStuLang: \x1B[31mERROR: " << errorText << "\033[0m\t\t" << endl; + cerr << "\x1B[34m[" + to_string(Hour) + ":" + to_string(Min) + ":" + to_string(Sec) + "] \x1B[33mSlang: \x1B[31mERROR: " << errorText << "\033[0m\t\t" << endl; exit(EXIT_FAILURE); return 2; } diff --git a/StuLang/eval.cpp b/Slang/eval.cpp similarity index 100% rename from StuLang/eval.cpp rename to Slang/eval.cpp diff --git a/StuLang/eval.h b/Slang/eval.h similarity index 100% rename from StuLang/eval.h rename to Slang/eval.h diff --git a/StuLang/graphics.h b/Slang/graphics.h similarity index 99% rename from StuLang/graphics.h rename to Slang/graphics.h index d78a87c..dbfd7c9 100644 --- a/StuLang/graphics.h +++ b/Slang/graphics.h @@ -360,6 +360,9 @@ public: rect.y = static_cast(position.y); rect.w = scale.x; rect.h = scale.y; + // Centers + rect.x = position.x - (rect.w / 2); + rect.y = position.y - (rect.h / 2); Load(); } @@ -384,6 +387,9 @@ public: int Draw() { SDL_RenderCopy(gRenderer, texture, NULL, &rect); + // Centers + rect.x = position.x - (rect.w / 2); + rect.y = position.y - (rect.h / 2); return 0; } @@ -535,7 +541,7 @@ public: // Centers rect.x = position.x - (rect.w / 2); - rect.y = rect.y - (rect.h / 2); + rect.y = position.y - (rect.h / 2); SDL_FreeSurface(surface); return 0; diff --git a/StuLang/icon.ico b/Slang/icon.ico similarity index 100% rename from StuLang/icon.ico rename to Slang/icon.ico diff --git a/StuLang/main.h b/Slang/main.h similarity index 100% rename from StuLang/main.h rename to Slang/main.h diff --git a/StuLang/resource.h b/Slang/resource.h similarity index 100% rename from StuLang/resource.h rename to Slang/resource.h diff --git a/StuLang/strops.cpp b/Slang/strops.cpp similarity index 100% rename from StuLang/strops.cpp rename to Slang/strops.cpp diff --git a/StuLang/strops.h b/Slang/strops.h similarity index 100% rename from StuLang/strops.h rename to Slang/strops.h