bradybod-usu/cs3460-cpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing

Browse Source
This commit is contained in:
bbod
2019-11-06 11:19:23 -07:00
parent 9204af78c9
commit 57010211a1
31 changed files with 71 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Hw6/LifeSimulator.cpp
View File

@@ -6,8 +6,8 @@ LifeSimulator::LifeSimulator(std::uint8_t sizeX, std::uint8_t sizeY) :
// Initializing vectors with padding for easy searches
for (std::uint8_t i = 0; i < sizeY + 2; i++)
{
currentScreen.push_back(std::vector<bool>());
nextScreen.push_back(std::vector<bool>());
currentScreen.emplace_back();
nextScreen.emplace_back();
for (std::uint8_t j = 0; j < sizeX + 2; j++)
{
currentScreen[i].push_back(false);
@@ -18,15 +18,15 @@ LifeSimulator::LifeSimulator(std::uint8_t sizeX, std::uint8_t sizeY) :
void LifeSimulator::insertPattern(const Pattern& pattern, std::uint8_t startX, std::uint8_t startY)
{
// Adding offset for padded borders
startX += 1;
startY += 1;
if ((pattern.getSizeY() + startY) <= (currentScreen.size() - 1) && (pattern.getSizeX() + startX) <= (currentScreen[0].size() - 1))
std::cout << pattern.getCell(0, 0) << std::endl;
if (((currentScreen.size() - 1) >= pattern.getSizeY() + startY) &&
(pattern.getSizeX() + startX) <= (currentScreen[0].size() - 1))
{
for (int y = 0; y < pattern.getSizeY(); y++)
for (std::uint8_t y = 0; y < pattern.getSizeY(); y++)
{
for (int x = 0; x < pattern.getSizeX(); x++)
for (std::uint8_t x = 0; x < pattern.getSizeX(); x++)
{
if (pattern.getCell(x, y))
{
@@ -51,32 +51,23 @@ void LifeSimulator::update()
nextScreen[i][j] = false;
}
}
// For loop to update nextScreen vector
for (int i = 1; i < currentScreen.size() - 1; i++)
{
for (int j = 1; j < currentScreen[0].size() - 1; j++)
{
// Checking each pixel
int count = 0;
int liveCount = 0;
for (int y = -1; y < 2; y++)
{
for (int x = -1; x < 2; x++)
{
if (y == 0 && x == 0)
;
else
{
if (!(y == 0 && x == 0))
if (currentScreen[i + y][j + x])
count++;
}
liveCount++;
}
}
/*
* Any live cell with two or three live neighbours lives on to the next generation.
* Any live cell with more than three live neighbours dies, as if by overpopulation.
* Any dead cell with exactly three live neighbours becomes a live cell, as if by reproduction.
*/
if (count > 1 && count < 4)
if (liveCount > 1 && liveCount < 4)
{
if (currentScreen[i][j])
{
@@ -84,7 +75,7 @@ void LifeSimulator::update()
}
else
{
if (count == 3)
if (liveCount == 3)
{
nextScreen[i][j] = true;
}