xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Camera width resize with viewport. GetMainCamera exposed to scripts #362

Merged
maverickdgg merged 3 commits from SP3-141-Camera-System into main 2023-02-24 17:20:13 +08:00
Conversation 0 Commits 3 Files Changed 5 +35 -3
5 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scenes/MainMenu.shade
View File

@ -113,8 +113,7 @@
Pitch: 0 Pitch: 0
Yaw: 0 Yaw: 0
Roll: 0 Roll: 0
Width: 1319 Width: 1175
Height: 622
Near: 0.00999999978 Near: 0.00999999978
Far: 10000 Far: 10000
Perspective: true Perspective: true

21
SHADE_Engine/src/Camera/SHCameraSystem.cpp
View File

@ -144,8 +144,24 @@ namespace SHADE
//std::cout << EVENT_DATA->resizeWidth << std::endl; //std::cout << EVENT_DATA->resizeWidth << std::endl;
//std::cout << EVENT_DATA->resizeHeight << std::endl; //std::cout << EVENT_DATA->resizeHeight << std::endl;
screenAspectRatio = (float)EVENT_DATA->resizeWidth / (float)EVENT_DATA->resizeHeight; screenAspectRatio = (float)EVENT_DATA->resizeWidth / (float)EVENT_DATA->resizeHeight;
#ifdef SHEDITOR
auto editor = SHSystemManager::GetSystem<SHEditor>();
if (editor->editorState != SHEditor::State::PLAY)
return eventPtr->handle;
#endif // SHEDITOR
for (auto& director : directorHandleList)
{
auto camera = SHComponentManager::GetComponent_s<SHCameraComponent>(director->mainCameraEID);
if (camera)
{
camera->SetWidth(EVENT_DATA->resizeWidth);
}
}
return eventPtr->handle; return eventPtr->handle;
} }
@ -574,4 +590,9 @@ namespace SHADE
#endif #endif
} }
EntityID SHCameraSystem::GetMainCameraEID() const noexcept
{
return directorHandleList[0]->mainCameraEID;
}
} }

1
SHADE_Engine/src/Camera/SHCameraSystem.h
View File

@ -65,6 +65,7 @@ namespace SHADE
void SetCameraViewMatrix(SHCameraComponent& camera, SHMatrix const& viewMatrix, bool takePos) noexcept; void SetCameraViewMatrix(SHCameraComponent& camera, SHMatrix const& viewMatrix, bool takePos) noexcept;
void CameraLookAt(SHCameraComponent& camera, SHVec3 target) noexcept; void CameraLookAt(SHCameraComponent& camera, SHVec3 target) noexcept;
void UpdateEditorArm(double dt,bool active ,SHVec3 const& targetPos) noexcept; void UpdateEditorArm(double dt,bool active ,SHVec3 const& targetPos) noexcept;
EntityID GetMainCameraEID() const noexcept;
SHVec2 GetCameraWidthHeight(size_t index) noexcept; SHVec2 GetCameraWidthHeight(size_t index) noexcept;
}; };

7
SHADE_Managed/src/Components/Camera.cxx
View File

@ -13,7 +13,6 @@ namespace SHADE
} }
float Camera::Pitch::get() float Camera::Pitch::get()
{ {
return (GetNativeComponent()->GetPitch()); return (GetNativeComponent()->GetPitch());
@ -126,4 +125,10 @@ namespace SHADE
} }
Camera^ Camera::GetMainCamera()
{
auto system = SHSystemManager::GetSystem<SHCameraSystem>();
return ECS::GetComponent<Camera^>(system->GetMainCameraEID());
}
} }

6
SHADE_Managed/src/Components/Camera.hxx
View File

@ -15,6 +15,9 @@ namespace SHADE
Camera(Entity entity); Camera(Entity entity);
public: public:
property float Pitch property float Pitch
{ {
float get(); float get();
@ -65,5 +68,8 @@ namespace SHADE
Vector3 GetForward(); Vector3 GetForward();
Vector3 GetRight(); Vector3 GetRight();
static Camera^ GetMainCamera();
}; };
} }