yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-02-22 14:08:47 +0100 (Sun, 22 Feb 2009)
New Revision: 1679

Modified:
   trunk/pkg/snow/PreProcessor/Voxel/DataSurface.cpp
   trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp
Log:
1. Define Janek's functions to convert from/to QGLViewer vector where they are used.



Modified: trunk/pkg/snow/PreProcessor/Voxel/DataSurface.cpp
===================================================================
--- trunk/pkg/snow/PreProcessor/Voxel/DataSurface.cpp	2009-02-22 10:30:11 UTC (rev 1678)
+++ trunk/pkg/snow/PreProcessor/Voxel/DataSurface.cpp	2009-02-22 13:08:47 UTC (rev 1679)
@@ -63,6 +63,8 @@
 		return point_plane_dist(p1,s_local_camera) > point_plane_dist(p2,s_local_camera);
 	}
 
+inline Vector3r toVec(qglviewer::Vec v){return Vector3r(v[0],v[1],v[2]);};
+
 void DataSurface::draw(SafeVectors3& axes,SafeVectors3& colors,Config& c,const std::vector<Vector3r>& centers)
 {
 	if(!c.draw_using_surfaces())

Modified: trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp
===================================================================
--- trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp	2009-02-22 10:30:11 UTC (rev 1678)
+++ trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp	2009-02-22 13:08:47 UTC (rev 1679)
@@ -13,6 +13,8 @@
 #include<yade/core/MetaBody.hpp>
 #include<yade/lib-QGLViewer/qglviewer.h>
 
+inline qglviewer::Vec toQGLViewierVec(Vector3r v){return qglviewer::Vec(v[0],v[1],v[2]);};
+
 bool light_selection(int which)
 {
 	GLfloat matAmbient[4];