Skip to content

Commit 6940ea9

Browse files
flipcoderflipcoder
committed
now compiles with newest Qor
1 parent be736c3 commit 6940ea9

File tree

16 files changed

+22
-22
lines changed

16 files changed

+22
-22
lines changed

‎bin/data/gfx/splash.png

684 KB
Loading

‎bin/data/gfx/title.png

657 KB
Loading

‎bin/data/gfx/title2.png

-3.13 KB
Binary file not shown.

‎premake5.lua

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ workspace("microarmy")
55
configurations {"Debug", "Release"}
66

77
defines {
8+
"META_SHARED",
89
"GLM_FORCE_RADIANS",
910
"GLM_ENABLE_EXPERIMENTAL",
1011
"GLM_FORCE_CTOR_INIT",
@@ -197,12 +198,9 @@ workspace("microarmy")
197198

198199
-- Project Files
199200
files {
200-
"src/**.h",
201201
"src/**.cpp",
202-
"lib/Qor/**.h",
203-
"lib/Qor/**.cpp",
204-
"lib/Qor/lib/kit/**.h",
205-
"lib/Qor/lib/kit/**.cpp"
202+
"lib/Qor/Qor/**.cpp",
203+
"lib/Qor/lib/kit/kit/**.cpp"
206204
}
207205

208206
-- Exluding Files
@@ -223,8 +221,9 @@ workspace("microarmy")
223221
}
224222

225223
includedirs {
226-
"lib/Qor",
227-
"lib/Qor/lib/kit",
224+
"lib/Qor/Qor",
225+
"lib/Qor/lib/kit/kit",
226+
"lib/Qor/lib/kit/lib/local_shared_ptr",
228227
"/usr/local/include/",
229228
"/usr/include/bullet/",
230229
"/usr/include/rapidxml/",

‎src/Game.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class Game: public State {
106106

107107
// Pointers
108108
Qor* m_pQor = nullptr;
109-
Cache<Resource, std::string>* m_pResources = nullptr;
109+
ResourceCache* m_pResources = nullptr;
110110
Input* m_pInput = nullptr;
111111
Pipeline* m_pPipeline = nullptr;
112112
BasicPartitioner* m_pPartitioner = nullptr;

‎src/HUD.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ using namespace glm;
66

77
const std::vector<int> HUD :: STAR_LEVELS = { 7, 6, 2 };
88

9-
HUD :: HUD(Window* window, Input* input, Cache<Resource,std::string>* cache, Player* player):
9+
HUD :: HUD(Window* window, Input* input, ResourceCache* cache, Player* player):
1010
m_pWindow(window),
1111
m_pInput(input),
1212
m_pCache(cache),

‎src/HUD.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class HUD: public Node {
1414
HUD(
1515
Window* window,
1616
Input* input,
17-
Cache<Resource,std::string>* cache,
17+
ResourceCache* cache,
1818
Player* player
1919
);
2020

@@ -44,7 +44,7 @@ class HUD: public Node {
4444
Window* m_pWindow = nullptr;
4545
Input* m_pInput = nullptr;
4646
//std::shared_ptr<Canvas> m_pCanvas;
47-
Cache<Resource, std::string>* m_pCache;
47+
ResourceCache* m_pCache;
4848
std::shared_ptr<Mesh> m_pMesh;
4949
std::shared_ptr<Mesh> m_pHeart;
5050
std::shared_ptr<Mesh> m_pGuy;

‎src/Intro.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void Intro :: preload() {
5858
m_pMusic = m_pQor->make<Sound>("menu.ogg");
5959
m_pRoot->add(m_pMusic);
6060

61-
auto mat = make_shared<Material>("title.png", m_pResources);
61+
auto mat = make_shared<Material>("splash.png", m_pResources);
6262
auto bg = make_shared<Mesh>(
6363
make_shared<MeshGeometry>(Prefab::quad(vec2(sw, sh), vec2(0.0f, 0.0f))),
6464
vector<shared_ptr<IMeshModifier>>{

‎src/Main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ int main(int argc, char* argv[]) {
4545
#endif
4646
return 0;
4747
}
48+

‎src/Monster.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Monster :: Monster(
1818
TileMap* map,
1919
BasicPartitioner* partitioner,
2020
Freq::Timeline* timeline,
21-
Cache<Resource, string>* resources
21+
ResourceCache* resources
2222
): /* Initializers */
2323
Node(config), // Calls the Node Constructor
2424
m_pPlaceholder(placeholder), // Set Monster Placeholder

‎src/Monster.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Monster: public Node {
3737
TileMap* map,
3838
BasicPartitioner* partitioner,
3939
Freq::Timeline* timeline,
40-
Cache<Resource, std::string>* resources
40+
ResourceCache* resources
4141
);
4242

4343

@@ -117,7 +117,7 @@ class Monster: public Node {
117117

118118

119119
// Pointers
120-
Cache<Resource, std::string>* m_pResources = nullptr;
120+
ResourceCache* m_pResources = nullptr;
121121
MapTile* m_pPlaceholder = nullptr;
122122
BasicPartitioner* m_pPartitioner = nullptr;
123123
Game* m_pGame = nullptr;

‎src/Player.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using namespace glm;
1010

1111
Player :: Player(
1212
std::string fn,
13-
Cache<Resource, std::string>* resources,
13+
ResourceCache* resources,
1414
Camera* camera,
1515
Controller* ctrl,
1616
Freq::Timeline* timeline,

‎src/Player.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Player: public Node {
1616
// Constructor
1717
Player(
1818
std::string fn,
19-
Cache<Resource, std::string>* resources,
19+
ResourceCache* resources,
2020
Camera* camera,
2121
Controller* ctrl,
2222
Freq::Timeline* timeline,
@@ -96,7 +96,7 @@ class Player: public Node {
9696
Controller* m_pController;
9797
IPartitioner* m_pPartitioner;
9898
Freq::Timeline* m_pTimeline;
99-
Cache<Resource, std::string>* m_pResources;
99+
ResourceCache* m_pResources;
100100

101101
std::shared_ptr<Sprite> m_pChar;
102102
std::shared_ptr<Sprite> m_pProne;

‎src/Pregame.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void Pregame :: preload() {
5252
m_pMusic = m_pQor->make<Sound>("score.ogg");
5353
m_pRoot->add(m_pMusic);
5454

55-
auto mat = make_shared<Material>("title2.png", m_pResources);
55+
auto mat = make_shared<Material>("splash.png", m_pResources);
5656
auto bg = make_shared<Mesh>(
5757
make_shared<MeshGeometry>(Prefab::quad(vec2(sw, sh), vec2(0.0f, 0.0f))),
5858
vector<shared_ptr<IMeshModifier>>{

‎src/Thing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Thing :: Thing( // Parameters
3232
TileMap* map,
3333
BasicPartitioner* partitioner,
3434
Freq::Timeline* timeline,
35-
Cache<Resource, std::string>* resources
35+
ResourceCache* resources
3636
): // Initialize Variables
3737
Node(config),
3838
m_pPlaceholder(placeholder),

‎src/Thing.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Thing: public Node {
4242
TileMap* map,
4343
BasicPartitioner* partitioner,
4444
Freq::Timeline* timeline,
45-
Cache<Resource, std::string>* resources
45+
ResourceCache* resources
4646
);
4747

4848

@@ -114,7 +114,7 @@ class Thing: public Node {
114114

115115

116116
// Pointers
117-
Cache<Resource, std::string>* m_pResources = nullptr;
117+
ResourceCache* m_pResources = nullptr;
118118
MapTile* m_pPlaceholder = nullptr;
119119
BasicPartitioner* m_pPartitioner = nullptr;
120120
Game* m_pGame = nullptr;

0 commit comments

Comments
 (0)