Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'trunk' of https://github.com/lrre-foss/rnr into trunk

This commit is contained in:
rjindael 2023-07-17 22:45:35 -07:00
parent 7889788a3a 020114f089
commit fc12afa070
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Projects/Client/Common/Source/OgreWidget.cpp
View File

@ -124,7 +124,8 @@ namespace RNR
ogreCamera->getParentSceneNode()->setOrientation(Ogre::Quaternion(cam->getCFrame().getRotation()));
}
ogreRoot->renderOneFrame(this->delta);
if(isVisible())
ogreRoot->renderOneFrame(this->delta);
}
Ogre::NameValuePairList OgreWidget::getRenderOptions()

1
Projects/Engine/Header/App/V8/DataModel/Camera.hpp
View File

@ -13,6 +13,7 @@ namespace RNR
private:
CoordinateFrame m_cframe;
virtual void deserializeProperty(char* prop_name, pugi::xml_node prop);
virtual void addProperties(std::vector<ReflectionProperty>& properties);
public:
Camera();
~Camera();

12
Projects/Engine/Source/App/V8/DataModel/Camera.cpp
View File

@ -20,4 +20,16 @@ namespace RNR
setCFrame(XML::getCFrame(node));
}
}
void Camera::addProperties(std::vector<ReflectionProperty>& properties)
{
ReflectionProperty _properties[] = {
{ this, std::string("CFrame"), std::string(""),
ACCESS_NONE, OPERATION_READWRITE, PROPERTY_CFRAME,
REFLECTION_GETTER(Camera* instance = (Camera*)object; return &instance->m_cframe; ),
REFLECTION_SETTER(Camera* instance = (Camera*)object; instance->setCFrame(*(CoordinateFrame*)value); ) },
};
properties.insert(properties.end(), _properties, _properties+(sizeof(_properties)/sizeof(ReflectionProperty)));
}
}