merge
This commit is contained in:
commit
cfee60d71a
14 files changed
+975
-15
No files matched your search
+14
-1
@@ -23,6 +23,7 @@
|
||||
#include <unordered_map>
|
||||
#include "dialogue/DialogueSystem.h"
|
||||
#include "render/ShadowMap.h"
|
||||
#include "navigation/PathFinder.h"
|
||||
#include <unordered_set>
|
||||
|
||||
namespace ZL {
|
||||
@@ -41,6 +42,7 @@ namespace ZL {
|
||||
bool requestDialogueStart(const std::string& dialogueId);
|
||||
void setDialogueFlag(const std::string& flag, int value);
|
||||
int getDialogueFlag(const std::string& flag) const;
|
||||
bool setNavigationAreaAvailable(const std::string& areaName, bool available);
|
||||
|
||||
Renderer renderer;
|
||||
TaskManager taskManager;
|
||||
@@ -85,6 +87,11 @@ namespace ZL {
|
||||
// Public access for ScriptEngine
|
||||
MenuManager menuManager;
|
||||
ScriptEngine scriptEngine;
|
||||
PathFinder navigation;
|
||||
|
||||
#ifdef SHOW_PATH
|
||||
std::vector<VertexRenderStruct> debugNavMeshes;
|
||||
#endif
|
||||
|
||||
private:
|
||||
bool rightMouseDown = false;
|
||||
@@ -101,12 +108,18 @@ namespace ZL {
|
||||
void drawLoading();
|
||||
void drawShadowDepthPass();
|
||||
void drawGameWithShadows();
|
||||
void setupNavigation();
|
||||
void handleDown(int64_t fingerId, int mx, int my);
|
||||
void handleUp(int64_t fingerId, int mx, int my);
|
||||
void handleMotion(int64_t fingerId, int mx, int my);
|
||||
InteractiveObject* raycastInteractiveObjects(const Eigen::Vector3f& rayOrigin, const Eigen::Vector3f& rayDir);
|
||||
Character* raycastNpcs(const Eigen::Vector3f& rayOrigin, const Eigen::Vector3f& rayDir, float maxDistance = 100.0f);
|
||||
|
||||
#ifdef SHOW_PATH
|
||||
void buildDebugNavMeshes();
|
||||
void drawDebugNavigation();
|
||||
#endif
|
||||
|
||||
#ifdef EMSCRIPTEN
|
||||
static Game* s_instance;
|
||||
static void onResourcesZipLoaded(const char* filename);
|
||||
@@ -130,4 +143,4 @@ namespace ZL {
|
||||
};
|
||||
|
||||
|
||||
} // namespace ZL
|
||||
} // namespace ZL
|
||||
Reference in new issue
Block a user