Skip to content

Commit

Permalink
v.0.0.9 - release (super rough version)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sampenland
sampenland committed Apr 20, 2022
1 parent f80f182 commit 89d2b22
Show file tree
Hide file tree
Showing 167 changed files with 239 additions and 2,616 deletions.
7 changes: 1 addition & 6 deletions nova2d/nova-zero/nova-zero.vcxproj
View file
Expand Up @@ -156,9 +156,6 @@
<ClCompile Include="src\components\HitDisplay.cpp" />
<ClCompile Include="src\components\SimpleStatBar.cpp" />
<ClCompile Include="src\controllers\BasicController.cpp" />
<ClCompile Include="src\controllers\SimpleBulletController.cpp" />
<ClCompile Include="src\controllers\SimpleController.cpp" />
<ClCompile Include="src\controllers\UDRLController.cpp" />
<ClCompile Include="src\core\BoundUser.cpp" />
<ClCompile Include="src\core\Camera.cpp" />
<ClCompile Include="src\core\Environment.cpp" />
Expand Down Expand Up @@ -245,6 +242,7 @@
<ClInclude Include="src\gui\imgui\imstb_textedit.h" />
<ClInclude Include="src\gui\imgui\imstb_truetype.h" />
<ClInclude Include="src\input\ScrollInput.h" />
<ClInclude Include="src\maths\Maths.h" />
<ClInclude Include="src\physics\PhyBase.h" />
<ClInclude Include="src\physics\PhyContactListener.h" />
<ClInclude Include="src\physics\ai\PhySimpleFollower.h" />
Expand All @@ -253,9 +251,6 @@
<ClInclude Include="src\utils\AudioManager.h" />
<ClInclude Include="src\components\HitDisplay.h" />
<ClInclude Include="src\components\SimpleStatBar.h" />
<ClInclude Include="src\controllers\SimpleBulletController.h" />
<ClInclude Include="src\controllers\SimpleController.h" />
<ClInclude Include="src\controllers\UDRLController.h" />
<ClInclude Include="src\core\BoundUser.h" />
<ClInclude Include="src\core\Camera.h" />
<ClInclude Include="src\core\NovaCore.h" />
Expand Down
21 changes: 3 additions & 18 deletions nova2d/nova-zero/nova-zero.vcxproj.filters
View file
Expand Up @@ -42,21 +42,12 @@
<ClCompile Include="src\input\InputHandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\controllers\SimpleController.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\core\EventListener.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\graphics\DrawLayers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\controllers\UDRLController.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\controllers\SimpleBulletController.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\utils\AssetManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -284,24 +275,15 @@
<ClInclude Include="src\input\InputHandler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\controllers\SimpleController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\core\EventListener.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\graphics\DrawLayers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\controllers\UDRLController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\maths\Rect.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\controllers\SimpleBulletController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\utils\AssetManager.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -524,6 +506,9 @@
<ClInclude Include="src\controllers\BasicController.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\maths\Maths.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Font Include="res\fonts\pixel1.ttf" />
Expand Down
4 changes: 2 additions & 2 deletions nova2d/nova-zero/src/ai/SimpleWeakAI.cpp
View file
Expand Up @@ -80,12 +80,12 @@ namespace novazero

void SimpleWeakAI::SetAllPatrol(std::vector<Vec2*> points, std::vector<std::function<void()>> funcs)
{
LOG(LVL_WARNING, "Function Set All Patrol not implemented.");
LOG(LVL_WARNING, "Function Set All Patrol not implemented.", __FILE__, __LINE__);
return;

if (points.size() != funcs.size())
{
LOG(LVL_WARNING, "Weak AI cannot set patrol points.");
LOG(LVL_WARNING, "Weak AI cannot set patrol points.", __FILE__, __LINE__);
return;
}

Expand Down
22 changes: 11 additions & 11 deletions nova2d/nova-zero/src/audio/Audio.cpp
View file
Expand Up @@ -14,7 +14,7 @@ namespace novazero
if (!m_Music)
{
std::string err = Mix_GetError();
LOG(LVL_NFE, "Failed to load music: " + assetName + ". Error: " + err);
LOG(LVL_NFE, "Failed to load music: " + assetName + ". Error: " + err, __FILE__, __LINE__);
return;
}
}
Expand All @@ -23,14 +23,14 @@ namespace novazero
{
if (!m_Music)
{
LOG(LVL_WARNING, "Couldn't play music: music not loaded properly.");
LOG(LVL_WARNING, "Couldn't play music: music not loaded properly.", __FILE__, __LINE__);
return;
}

if (Mix_PlayMusic(m_Music, 0) == -1)
{
std::string err = Mix_GetError();
LOG(LVL_WARNING, "Music failed to place. Error: " + err);
LOG(LVL_WARNING, "Music failed to place. Error: " + err, __FILE__, __LINE__);
return;
}
}
Expand All @@ -39,14 +39,14 @@ namespace novazero
{
if (!m_Music)
{
LOG(LVL_WARNING, "Couldn't play music: music not loaded properly.");
LOG(LVL_WARNING, "Couldn't play music: music not loaded properly.", __FILE__, __LINE__);
return;
}

if (Mix_PlayMusic(m_Music, -1) == -1)
{
std::string err = Mix_GetError();
LOG(LVL_WARNING, "Music failed to place. Error: " + err);
LOG(LVL_WARNING, "Music failed to place. Error: " + err, __FILE__, __LINE__);
return;
}
}
Expand All @@ -55,7 +55,7 @@ namespace novazero
{
if (!m_Music)
{
LOG(LVL_WARNING, "Couldn't stop music: music not loaded properly.");
LOG(LVL_WARNING, "Couldn't stop music: music not loaded properly.", __FILE__, __LINE__);
return;
}

Expand Down Expand Up @@ -88,7 +88,7 @@ namespace novazero
if (!m_SoundEffect)
{
std::string err = Mix_GetError();
LOG(LVL_NFE, "Failed to load sound effect: " + assetName + ". Error: " + err);
LOG(LVL_NFE, "Failed to load sound effect: " + assetName + ". Error: " + err, __FILE__, __LINE__);
return;
}
}
Expand All @@ -98,15 +98,15 @@ namespace novazero
if (!m_SoundEffect)
{
std::string err = Mix_GetError();
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err);
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err, __FILE__, __LINE__);
return;
}

m_Channel = Mix_PlayChannel(-1, m_SoundEffect, 0);
if (m_Channel == -1)
{
std::string err = Mix_GetError();
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err);
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err, __FILE__, __LINE__);
return;
}
}
Expand All @@ -116,7 +116,7 @@ namespace novazero
if (!m_SoundEffect)
{
std::string err = Mix_GetError();
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err);
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err, __FILE__, __LINE__);
return;
}

Expand All @@ -125,7 +125,7 @@ namespace novazero
{

std::string err = Mix_GetError();
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err);
LOG(LVL_NFE, "Failed to play sound effect. Error: " + err, __FILE__, __LINE__);
return;
}
}
Expand Down
6 changes: 5 additions & 1 deletion nova2d/nova-zero/src/audio/Audio.h
View file
@@ -1,5 +1,9 @@
#pragma once
#include "SDL_mixer.h"
#ifdef NOVA_ENSCRIPTEN
#include <SDL2/SDL_mixer.h>
#else
#include "SDL_mixer.h"
#endif
#include <string>

namespace novazero
Expand Down
3 changes: 2 additions & 1 deletion nova2d/nova-zero/src/components/SimpleStatBar.cpp
View file
Expand Up @@ -110,7 +110,8 @@ namespace novazero
}

m_Foreground->w = (int)(GetSize().x * scale);
m_Foreground->h = (int)(m_Value * scale);
m_Foreground->y = (int)(oY + GetSize().y * scale);
m_Foreground->h = (int)(-m_Value * scale);
}
else
{
Expand Down
4 changes: 2 additions & 2 deletions nova2d/nova-zero/src/controllers/BasicController.cpp
View file
Expand Up @@ -31,7 +31,7 @@ namespace novazero
{
if (controllerID >= SDL_NumJoysticks())
{
LOG(LVL_FATAL_ERROR, "A controller was not found, may cause unplayable game.");
LOG(LVL_FATAL_ERROR, "A controller was not found, may cause unplayable game.", __FILE__, __LINE__);
return;
}

Expand All @@ -52,7 +52,7 @@ namespace novazero

void BasicController::ControllerUpdate()
{
m_HealthBar->Update(m_Health / 100 * 32, GetX() + GetWidth() + 5, GetY());
m_HealthBar->Update((int)(m_Health / 100 * 32), (int)(GetX() + GetWidth() + 5), (int)(GetY()));

Controls();
}
Expand Down
95 changes: 0 additions & 95 deletions nova2d/nova-zero/src/controllers/SimpleBulletController.cpp
View file

This file was deleted.

54 changes: 0 additions & 54 deletions nova2d/nova-zero/src/controllers/SimpleBulletController.h
View file

This file was deleted.

0 comments on commit 89d2b22

Please sign in to comment.