Procházet zdrojové kódy

Added missing polycodeGLGetNumberv, fixed typos in IDE code

Ivan Safrin před 12 roky
rodič
revize
4a3c56119f

+ 7 - 0
Core/Contents/Source/PolyGLRenderer.cpp

@@ -84,6 +84,13 @@ PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
 #endif
 using namespace Polycode;
 
+inline void polycodeGLGetNumberv( GLenum pname, GLdouble *params ) {
+    glGetDoublev(pname, params);
+}
+inline void polycodeGLGetNumberv( GLenum pname, GLfloat *params ) {
+	glGetFloatv(pname, params);
+}
+
 OpenGLRenderer::OpenGLRenderer() : Renderer() {
 
 	verticesToDraw = 0;

+ 2 - 2
IDE/Contents/Source/PolycodeEntityEditor.cpp

@@ -1511,8 +1511,8 @@ void PolycodeEntityEditor::saveEntityToObjectEntry(Entity *entity, ObjectEntry *
         ObjectEntry *cameraEntry = entry->addChild("Camera");
         
         cameraEntry->addChild("exposure", camera->getExposureLevel());
-        cameraEntry->addChild("nearClip", camera->getNearClipppingPlane());
-        cameraEntry->addChild("farClip", camera->getFarClipppingPlane());
+        cameraEntry->addChild("nearClip", camera->getNearClippingPlane());
+        cameraEntry->addChild("farClip", camera->getFarClippingPlane());
         cameraEntry->addChild("ortho", camera->getOrthoMode());
         if(camera->getOrthoMode()) {
             cameraEntry->addChild("sizeMode", camera->getOrthoSizeMode());

+ 0 - 3
IDE/Contents/Source/PolycodeMaterialEditor.cpp

@@ -534,9 +534,6 @@ PostPreviewBox::PostPreviewBox() : UIElement() {
 	previewScene = new Scene(Scene::SCENE_3D, true);	
 	
 	renderTexture = new SceneRenderTexture(previewScene, previewScene->getDefaultCamera(), 256, 256, true);
-	
-
-	CoreServices::getInstance()->getRenderer()->setClippingPlanes(0.1, 100.0);
 
 	previewScene->clearColor.setColor(0.0, 0.0, 0.0, 1.0);	
 	previewScene->ambientColor.setColor(0.0, 0.0, 0.0, 1.0);

+ 4 - 4
IDE/Contents/Source/PolycodeProps.cpp

@@ -3093,10 +3093,10 @@ void CameraSheet::handleEvent(Event *event) {
         camera->setOrthoSize(camera->getOrthoSizeX(), orthoHeightProp->get());
         dispatchEvent(new Event(), Event::CHANGE_EVENT);
     } else if(event->getDispatcher() == nearClipPlane) {
-        camera->setClippingPlanes(nearClipPlane->get(), camera->getFarClipppingPlane());
+        camera->setClippingPlanes(nearClipPlane->get(), camera->getFarClippingPlane());
         dispatchEvent(new Event(), Event::CHANGE_EVENT);
     } else if(event->getDispatcher() == farClipPlane) {
-        camera->setClippingPlanes(camera->getNearClipppingPlane(),farClipPlane->get());
+        camera->setClippingPlanes(camera->getNearClippingPlane(),farClipPlane->get());
         dispatchEvent(new Event(), Event::CHANGE_EVENT);
     } else if(event->getDispatcher() == orthoSizeTypeProp) {
         camera->setOrthoSizeMode(orthoSizeTypeProp->get());
@@ -3117,8 +3117,8 @@ void CameraSheet::setCamera(Camera *camera) {
         orthoProp->set(camera->getOrthoMode());
         orthoWidthProp->set(camera->getOrthoSizeX());
         orthoHeightProp->set(camera->getOrthoSizeY());
-        nearClipPlane->set(camera->getNearClipppingPlane());
-        farClipPlane->set(camera->getFarClipppingPlane());
+        nearClipPlane->set(camera->getNearClippingPlane());
+        farClipPlane->set(camera->getFarClippingPlane());
         
         orthoSizeTypeProp->set(camera->getOrthoSizeMode());
         fovProp->set(camera->getFOV());