Skip to content

Commit

Permalink
Make game ready for a new release!
Browse files Browse the repository at this point in the history
  • Loading branch information
@IsakTheHacker
IsakTheHacker committed Jan 6, 2021
1 parent 526a8a4 commit 712e04d
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 23 deletions.
132 changes: 129 additions & 3 deletions Panda Project MSI Installer/Panda Project MSI Installer.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@
}
"Entry"
{
"MsmKey" = "8:_58F933C8E3524EB98804014053A48F14"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_5C5DCE4F64FC41588B2086AC0365F97F"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -189,6 +195,12 @@
}
"Entry"
{
"MsmKey" = "8:_A047BA47A8E5435CBAD6F1CB1F2960EB"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_A3D324371F76404BA3C9355E96B93B68"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand All @@ -207,6 +219,12 @@
}
"Entry"
{
"MsmKey" = "8:_CA2EA395C13C408692A80EA54365DAD4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_CB809E1618CE4064B4B275D8F71102D4"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -261,6 +279,12 @@
}
"Entry"
{
"MsmKey" = "8:_FD03E8CBE49044CDBC7EEF06BA6B599D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_FD759FE891F04AF5870A3D453A073F90"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -678,6 +702,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_58F933C8E3524EB98804014053A48F14"
{
"SourcePath" = "8:..\\Panda project\\data\\assets\\blockproperties\\rotational-complex.blockproperties"
"TargetName" = "8:rotational-complex.blockproperties"
"Tag" = "8:"
"Folder" = "8:_0A32381248EE4E158488A52C80DE5819"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_5C5DCE4F64FC41588B2086AC0365F97F"
{
"SourcePath" = "8:..\\Panda project\\libpandaexpress.dll"
Expand Down Expand Up @@ -918,6 +962,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A047BA47A8E5435CBAD6F1CB1F2960EB"
{
"SourcePath" = "8:..\\Panda project\\universes\\Test\\universe"
"TargetName" = "8:universe"
"Tag" = "8:"
"Folder" = "8:_ABF8782CF7234A4B8B64BD4AB55EFB31"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D324371F76404BA3C9355E96B93B68"
{
"SourcePath" = "8:..\\Panda project\\libp3assimp.dll"
Expand Down Expand Up @@ -978,6 +1042,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA2EA395C13C408692A80EA54365DAD4"
{
"SourcePath" = "8:..\\Panda project\\universes\\Test\\index"
"TargetName" = "8:index"
"Tag" = "8:"
"Folder" = "8:_ABF8782CF7234A4B8B64BD4AB55EFB31"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB809E1618CE4064B4B275D8F71102D4"
{
"SourcePath" = "8:..\\Panda project\\data\\scripts\\readOptions.py"
Expand Down Expand Up @@ -1158,6 +1242,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD03E8CBE49044CDBC7EEF06BA6B599D"
{
"SourcePath" = "8:..\\Panda project\\universes\\Test\\profiles\\0.prof"
"TargetName" = "8:0.prof"
"Tag" = "8:"
"Folder" = "8:_B0842512DCB9497A940259EA4E92366E"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FD759FE891F04AF5870A3D453A073F90"
{
"SourcePath" = "8:..\\Panda project\\models\\egg\\half_block_wedge_incline.egg"
Expand Down Expand Up @@ -1356,6 +1460,28 @@
"Property" = "8:_1797F5D6C8984A99A7F13002834FFECD"
"Folders"
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_ABF8782CF7234A4B8B64BD4AB55EFB31"
{
"Name" = "8:Test"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Property" = "8:_3008D09F024A4BC1A16CFBE445FA0780"
"Folders"
{
"{9EF0B969-E518-4E46-987F-47570745A589}:_B0842512DCB9497A940259EA4E92366E"
{
"Name" = "8:profiles"
"AlwaysCreate" = "11:FALSE"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Property" = "8:_D7442B1548884D368BD84E1C94BE9776"
"Folders"
{
}
}
}
}
}
}
}
Expand Down Expand Up @@ -1420,15 +1546,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Panda Project"
"ProductCode" = "8:{2027752F-3365-44F2-9524-0CBF91E737B3}"
"PackageCode" = "8:{BF0233F4-91B6-4D38-A7CC-056DE581880F}"
"ProductCode" = "8:{C86D25C8-98B6-412E-92FC-D4F8D733AB2C}"
"PackageCode" = "8:{524BCBBF-C349-4E7E-B940-7347EA187069}"
"UpgradeCode" = "8:{85F4E197-8AE8-4284-85E5-9F8BC2D8CBC2}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:0.1.0"
"ProductVersion" = "8:0.1.1"
"Manufacturer" = "8:Placeholder Company"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/IsakTheHacker/Panda-project"
Expand Down
Binary file modified Panda project/Panda Project Source.exe
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions Panda project/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int main(int argc, char* argv[]) {
// Open a new window framework and set the title
PandaFramework framework;
framework.open_framework(argc, argv);
framework.set_window_title("The Panda Project: Alpha 0.1.0");
framework.set_window_title("The Panda Project: Alpha 0.1.1");

// Open the window
WindowFramework* window = framework.open_window();
Expand Down Expand Up @@ -319,13 +319,13 @@ int main(int argc, char* argv[]) {
window->get_render().set_light(dlnp);


PNMImage pnmImage("images/noise_0000.png");
for (size_t i = 0; i < pnmImage.get_x_size(); i++) {
for (size_t j = 0; j < pnmImage.get_y_size(); j++) {
auto pixel = pnmImage.get_pixel(i, j);
//std::cout << "Pixel: " << i << "," << j << " " << pixel << std::endl;
}
}
//PNMImage pnmImage("images/noise_0000.png");
//for (size_t i = 0; i < pnmImage.get_x_size(); i++) {
// for (size_t j = 0; j < pnmImage.get_y_size(); j++) {
// auto pixel = pnmImage.get_pixel(i, j);
// //std::cout << "Pixel: " << i << "," << j << " " << pixel << std::endl;
// }
//}

std::vector<double> doubles;
PerlinNoise3 perlinNoise(128, 128, 128, 256, seed);
Expand Down
13 changes: 1 addition & 12 deletions Panda project/universes/Test/index
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
0.0.chunk
-1.0.chunk
-1.1.chunk
0.1.chunk
1.1.chunk
1.2.chunk
2.2.chunk
2.3.chunk
3.3.chunk
3.2.chunk
3.1.chunk
2.1.chunk
1.0.chunk
2.0.chunk
2.-1.chunk

0 comments on commit 712e04d

Please sign in to comment.