AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Committing a couple things that should've been in the last commit

This commit is contained in:
parax0 2016-01-06 03:47:18 -07:00
parent d66b3dee8e
commit a2bb48f53f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Scene/CScene.cpp
View File

@ -201,7 +201,7 @@ void CScene::ClearScene()
void CScene::AddSceneToRenderer(CRenderer *pRenderer, const SViewInfo& ViewInfo) void CScene::AddSceneToRenderer(CRenderer *pRenderer, const SViewInfo& ViewInfo)
{ {
// Override show flags in game mode // Override show flags in game mode
FShowFlags ShowFlags = (ViewInfo.GameMode ? gGameModeShowFlags : ViewInfo.ShowFlags); FShowFlags ShowFlags = (ViewInfo.GameMode ? gkGameModeShowFlags : ViewInfo.ShowFlags);
for (auto it = mNodes.begin(); it != mNodes.end(); it++) for (auto it = mNodes.begin(); it != mNodes.end(); it++)
{ {
@ -218,7 +218,7 @@ void CScene::AddSceneToRenderer(CRenderer *pRenderer, const SViewInfo& ViewInfo)
SRayIntersection CScene::SceneRayCast(const CRay& Ray, const SViewInfo& ViewInfo) SRayIntersection CScene::SceneRayCast(const CRay& Ray, const SViewInfo& ViewInfo)
{ {
FShowFlags ShowFlags = (ViewInfo.GameMode ? gGameModeShowFlags : ViewInfo.ShowFlags); FShowFlags ShowFlags = (ViewInfo.GameMode ? gkGameModeShowFlags : ViewInfo.ShowFlags);
CRayCollisionTester Tester(Ray); CRayCollisionTester Tester(Ray);
for (auto it = mNodes.begin(); it != mNodes.end(); it++) for (auto it = mNodes.begin(); it != mNodes.end(); it++)

4
src/Editor/CSceneViewport.h
View File

@ -31,11 +31,7 @@ public:
CSceneViewport(QWidget *pParent = 0); CSceneViewport(QWidget *pParent = 0);
~CSceneViewport(); ~CSceneViewport();
void SetScene(INodeEditor *pEditor, CScene *pScene); void SetScene(INodeEditor *pEditor, CScene *pScene);
<<<<<<< Updated upstream
void SetSkyEnabled(bool b);
=======
void SetShowFlag(EShowFlag Flag, bool Visible); void SetShowFlag(EShowFlag Flag, bool Visible);
>>>>>>> Stashed changes
CRenderer* Renderer(); CRenderer* Renderer();
CSceneNode* HoverNode(); CSceneNode* HoverNode();
CVector3f HoverPoint(); CVector3f HoverPoint();