hush

src/scenemanager.hh

@@ -6,27 +6,113 @@
 #include <psyqo/vector.hh>
 #include <psyqo/gpu.hh>
 
+#include "bvh.hh"
 #include "camera.hh"
+#include "collision.hh"
 #include "controls.hh"
 #include "gameobject.hh"
 #include "lua.h"
 #include "splashpack.hh"
+#include "worldcollision.hh"
+#include "navregion.hh"
+#include "audiomanager.hh"
+#include "interactable.hh"
+#include "luaapi.hh"
+#include "sceneloader.hh"
 
 namespace psxsplash {
 class SceneManager {
   public:
     void InitializeScene(uint8_t* splashpackData);
     void GameTick(psyqo::GPU &gpu);
+    
+    // Trigger event callbacks (called by CollisionSystem)
+    void fireTriggerEnter(uint16_t triggerObjIdx, uint16_t otherObjIdx);
+    void fireTriggerStay(uint16_t triggerObjIdx, uint16_t otherObjIdx);
+    void fireTriggerExit(uint16_t triggerObjIdx, uint16_t otherObjIdx);
+    
+    // Get game object by index (for collision callbacks)
+    GameObject* getGameObject(uint16_t index) {
+        if (index < m_gameObjects.size()) return m_gameObjects[index];
+        return nullptr;
+    }
+    
+    // Get total object count
+    size_t getGameObjectCount() const { return m_gameObjects.size(); }
+    
+    // Get object name by index (returns nullptr if no name table or out of range)
+    const char* getObjectName(uint16_t index) const {
+        if (index < m_objectNames.size()) return m_objectNames[index];
+        return nullptr;
+    }
+    
+    // Find first object with matching name (linear scan, case-sensitive)
+    GameObject* findObjectByName(const char* name) const;
+    
+    // Find audio clip index by name (returns -1 if not found)
+    int findAudioClipByName(const char* name) const;
+    
+    // Get audio clip name by index (returns nullptr if out of range)
+    const char* getAudioClipName(int index) const {
+        if (index >= 0 && index < (int)m_audioClipNames.size()) return m_audioClipNames[index];
+        return nullptr;
+    }
+    
+    // Public API for game systems
+    // Interaction system - call from Lua or native code
+    void triggerInteraction(GameObject* interactable);
+    
+    // GameObject state control with events
+    void setObjectActive(GameObject* go, bool active);
+    
+    // Public accessors for Lua API
+    Controls& getControls() { return m_controls; }
+    Camera& getCamera() { return m_currentCamera; }
+    Lua& getLua() { return L; }
+    AudioManager& getAudio() { return m_audio; }
+    
+    // Scene loading (for multi-scene support via PCdrv)
+    void requestSceneLoad(int sceneIndex);
+    int getCurrentSceneIndex() const { return m_currentSceneIndex; }
+    
+    // Check and process pending scene load (called from GameTick)
+    void processPendingSceneLoad();
 
   private:
     psxsplash::Lua L;
     psxsplash::SplashPackLoader m_loader;
-
+    CollisionSystem m_collisionSystem;
+    BVHManager m_bvh;  // Spatial acceleration for frustum culling
+    WorldCollision m_worldCollision;   // Triangle-level world collision (v7+)
+    NavRegionSystem m_navRegions;      // Convex region navigation (v7+)
+    uint16_t m_playerNavRegion = NAV_NO_REGION; // Current nav region for player
+    
+    // Scene type and render path: 0=exterior (BVH), 1=interior (room/portal)
+    uint16_t m_sceneType = 0;
+    
+    // Room/portal data (v11+ interior scenes). Pointers into splashpack data.
+    const RoomData* m_rooms = nullptr;
+    uint16_t m_roomCount = 0;
+    const PortalData* m_portals = nullptr;
+    uint16_t m_portalCount = 0;
+    const TriangleRef* m_roomTriRefs = nullptr;
+    uint16_t m_roomTriRefCount = 0;
 
     eastl::vector<LuaFile*> m_luaFiles;
     eastl::vector<GameObject*> m_gameObjects;
-    eastl::vector<Navmesh*> m_navmeshes;
-
+    
+    // Object name table (v9+): parallel to m_gameObjects, points into splashpack data
+    eastl::vector<const char*> m_objectNames;
+    
+    // Audio clip name table (v10+): parallel to audio clips, points into splashpack data
+    eastl::vector<const char*> m_audioClipNames;
+    
+    // Component arrays
+    eastl::vector<Interactable*> m_interactables;
+    
+    // Audio system
+    AudioManager m_audio;
+    
     psxsplash::Controls m_controls;
 
     psxsplash::Camera m_currentCamera;
@@ -35,8 +121,29 @@ class SceneManager {
     psyqo::Angle playerRotationX, playerRotationY, playerRotationZ;
 
     psyqo::FixedPoint<12, uint16_t> m_playerHeight;
+    
+    // Movement physics (v8+)
+    int32_t m_playerRadius;           // Collision radius in fp12 (replaces hardcoded PLAYER_RADIUS)
+    int32_t m_velocityY;              // Vertical velocity in fp12 per second (negative = up)
+    int32_t m_gravityPerFrame;        // Gravity velocity change per frame (fp12)
+    int32_t m_jumpVelocityRaw;        // Initial jump velocity in fp12 per second
+    bool m_isGrounded;                // On the ground (can jump)
+    
+    // Frame timing
+    uint32_t m_lastFrameTime;         // gpu.now() timestamp of previous frame
+    int m_deltaFrames;                // Elapsed frame count (1 normally, 2+ if dropped)
 
-    bool previewNavmesh = false;
     bool freecam = false;
+    
+    // Scene transition state
+    int m_currentSceneIndex = 0;
+    int m_pendingSceneIndex = -1;        // -1 = no pending load
+    uint8_t* m_currentSceneData = nullptr; // Owned pointer to loaded data
+    
+    // System update methods (called from GameTick)
+    void updateInteractionSystem();
+    void processEnableDisableEvents();
+    void clearScene();  // Deallocate current scene objects
 };
-};  // namespace psxsplash
+};  // namespace psxsplash
+  // namespace psxsplash