X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=511c901b5d5b3c70aa9ef086f775ff4ca72cf302;hb=54cb832334a83fc266b59e2c9b60ee936db7118f;hp=a45026410915e611511bd15878349251e9f92e9c;hpb=78d36019ec11d62d6fd016fcbe19f566d11771ff;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index a450264..511c901 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -68,7 +68,9 @@ Designer::Designer(int argc, char **argv): cat_layout_3d = new Layout3D(catalogue.get_layout()); layout = new Layout(catalogue); + layout->get_clock().set_current_time(12*Time::hour); layout_3d = new Layout3D(*layout); + layout_3d->tick(); if(argc>1) { @@ -518,7 +520,7 @@ Object *Designer::pick_object(const Vector &pointer) const GL::Vector3 &cpos = view.get_camera().get_position(); GL::Vector4 cray = view.get_camera().unproject(GL::Vector4(pointer.x, pointer.y, 0, 0)); - return view.get_layout().get_layout().pick(Ray(cpos, Vector(cray))); + return view.get_layout().get_layout().pick(Ray(cpos, cray.slice<3>(0))); } void Designer::update_object_icon(Object &obj)