Skip to content

Commit

Permalink
Adapted to Magnum changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
mosra committed Apr 16, 2012
1 parent e2e46ae commit b2ce52a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/cubemap/CubeMap.cpp
Expand Up @@ -41,7 +41,7 @@ CubeMap::CubeMap(Trade::AbstractImporter* importer, const string& prefix, Object
cube.bindAttribute<CubeMapShader::Vertex>(buffer);
MeshTools::compressIndices(&cube, Buffer::Usage::StaticDraw, *cubeData.indices());

scale(20.0f);
scale(Vector3(20.0f));

/* Textures */
Trade::ImageData2D* image;
Expand Down Expand Up @@ -85,11 +85,11 @@ CubeMap::CubeMap(Trade::AbstractImporter* importer, const string& prefix, Object
tarnishTexture.generateMipmap();

reflector = new Reflector(&texture, &tarnishTexture, scene());
reflector->scale(0.5f);
reflector->scale(Vector3(0.5f));
reflector->translate(Vector3::xAxis(-0.5f));

reflector = new Reflector(&texture, &tarnishTexture, scene());
reflector->scale(0.3f);
reflector->scale(Vector3(0.3f));
reflector->rotate(deg(37.0f), Vector3::xAxis());
reflector->translate(Vector3::xAxis(0.3f));
}
Expand Down
4 changes: 2 additions & 2 deletions src/framebuffer/FramebufferExample.cpp
Expand Up @@ -77,9 +77,9 @@ class FramebufferExample: public AbstractExample {

void mouseEvent(MouseButton button, MouseState state, const Math::Vector2<int>& position) {
if(button == MouseButton::WheelUp)
billboard->scale(5.0f/4);
billboard->scale(Vector3(5.0f/4));
else if(button == MouseButton::WheelDown)
billboard->scale(4.0f/5);
billboard->scale(Vector3(4.0f/5));

previous = position;
redraw();
Expand Down
2 changes: 1 addition & 1 deletion src/motionblur/Icosphere.cpp
Expand Up @@ -22,7 +22,7 @@
namespace Magnum { namespace Examples {

Icosphere::Icosphere(Mesh* mesh, Shaders::PhongShader* shader, const Vector3& color, Object* parent): Object(parent), mesh(mesh), shader(shader), color(color) {
scale(0.1f);
scale(Vector3(0.1f));
}

void Icosphere::draw(const Matrix4& transformationMatrix, Camera* camera) {
Expand Down

0 comments on commit b2ce52a

Please sign in to comment.