- gen_geosphere(priv->shape[SHAPE_SPHERE], 1.0, 2);
- gen_box(priv->shape[SHAPE_BOX], 1, 1, 1);
- gen_torus(priv->shape[SHAPE_TORUS], 0.9, 0.2, 16, 8);
- gen_cone(priv->shape[SHAPE_CONE], 0.8, 1.0, 8, 2);
+ Mat4 xform;
+
+ gen_geosphere(priv->shape[SHAPE_SPHERE], 0.5 * s, 0);
+ gen_box(priv->shape[SHAPE_BOX], 0.7 * s, 0.7 * s, 0.7 * s);
+ gen_torus(priv->shape[SHAPE_TORUS], 0.4 * s, 0.1 * s, 12, 6);
+
+ gen_cone(priv->shape[SHAPE_CONE], 0.5 * s, 1.0 * s, 8, 2, 1);
+ xform.translation(0, -0.33 * s, 0);
+ priv->shape[SHAPE_CONE]->apply_xform(xform, Mat4::identity);