From efdfdfe6a57c2225e2c314bd138bf13159d706a9 Mon Sep 17 00:00:00 2001 From: leo Date: Thu, 23 Feb 2006 18:05:46 +0000 Subject: Moved all LeoCAD units conversion code to a single function, Fixed a bug moving the camera with the modify dialog. git-svn-id: http://svn.leocad.org/trunk@489 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- common/typedefs.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'common/typedefs.h') diff --git a/common/typedefs.h b/common/typedefs.h index a12882c..ce68b1f 100644 --- a/common/typedefs.h +++ b/common/typedefs.h @@ -7,9 +7,11 @@ class Group; class Piece; class PieceInfo; +class Camera; #include "defines.h" #include "str.h" +#include "algebra.h" typedef enum { @@ -225,10 +227,10 @@ typedef struct typedef struct { - void* piece; + Piece* piece; + Vector3 Position; + Vector3 Rotation; char name[81]; - float pos[3]; - float rot[3]; int from; int to; bool hidden; @@ -237,11 +239,11 @@ typedef struct typedef struct { - void* camera; + Camera* camera; + Vector3 Eye; + Vector3 Target; + Vector3 Up; char name[81]; - float eye[3]; - float target[3]; - float up[3]; float fovy; float znear; float zfar; -- cgit v1.2.3