Просмотр исходного кода

Disable vSync stuff in SDL Core (seems to be causing issues for people), fixed mouse clicks in UIHSlider after resize, fixed material editor not setting shader options correctly

Ivan Safrin 12 лет назад
Родитель
Сommit
1562852c6b

+ 2 - 2
Core/Contents/Source/PolySDLCore.cpp

@@ -131,7 +131,7 @@ void SDLCore::setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int
 	if(resizableWindow) {
 		flags |= SDL_RESIZABLE;
 	}
-
+/*
 	if(vSync) {
 		flags |= SDL_DOUBLEBUF;
 		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
@@ -140,7 +140,7 @@ void SDLCore::setVideoMode(int xRes, int yRes, bool fullScreen, bool vSync, int
 		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 0);
 		SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 0);
 	}
-
+*/
 	SDL_SetVideoMode(xRes, yRes, 0, flags);
 	
 	renderer->Resize(xRes, yRes);

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

@@ -470,12 +470,14 @@ void MaterialEditorPane::setMaterial(Material *material) {
 		if(shader) {
 			if(currentMaterial->getShader(0)->getName() == shader->getName()) {
 				shaderProp->set(i);
+				shaderProp->dispatchEvent(new Event(), Event::CHANGE_EVENT);
 				break;
 			}
 		}
 	}
 	} else {
 		shaderProp->set(0);
+		shaderProp->dispatchEvent(new Event(), Event::CHANGE_EVENT);		
 	}	
 	
 	nameProp->set(currentMaterial->getName());

+ 1 - 0
Modules/Contents/UI/Source/PolyUIHSlider.cpp

@@ -107,6 +107,7 @@ void UIHSlider::Resize(Number width, Number height) {
 	sliderWidth = width;
 	gripRect->setDragLimits(Rectangle(0,floor(bgHeight/2.0),width,0));	
 	setSliderValue(sliderValue);
+	bgHitBox->setShapeSize(width,  gripRect->getHeight());
 }
 			
 void UIHSlider::handleEvent(Event *event) {