summaryrefslogtreecommitdiff
path: root/common/project.h
diff options
context:
space:
mode:
authorleo2000-07-23 20:28:23 +0000
committerleo2000-07-23 20:28:23 +0000
commit948aff6514227352baf716e5399d5343ec775663 (patch)
tree1ade32809bf53af5c178ca87e29c9a3180b3fb46 /common/project.h
parentf9a73f52978ec54dee4ed05bd20088d83fbe3ea4 (diff)
Changes to make use of the new Object class
git-svn-id: http://svn.leocad.org/trunk@95 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'common/project.h')
-rw-r--r--common/project.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/common/project.h b/common/project.h
index 181982c..651c199 100644
--- a/common/project.h
+++ b/common/project.h
@@ -1,17 +1,15 @@
#ifndef _PROJECT_H_
#define _PROJECT_H_
+#include "object.h"
#include "defines.h"
#include "typedefs.h"
-#ifdef LC_WINDOWS
-#include "stdafx.h"
-#endif
-#include <GL/gl.h>
+#include "opengl.h"
typedef enum
{
- LC_TRACK_NONE, LC_TRACK_START_LEFT, LC_TRACK_LEFT,
- LC_TRACK_START_RIGHT, LC_TRACK_RIGHT
+ LC_TRACK_NONE, LC_TRACK_START_LEFT, LC_TRACK_LEFT,
+ LC_TRACK_START_RIGHT, LC_TRACK_RIGHT
} LC_MOUSE_TRACK;
class Piece;
@@ -19,7 +17,6 @@ class Camera;
class Light;
class Group;
class Texture;
-class BoundingBox;
class Terrain;
class PieceInfo;
class Matrix;
@@ -55,6 +52,8 @@ public:
unsigned char GetLastStep();
bool IsAnimation()
{ return m_bAnimation; }
+ unsigned short GetCurrentTime ()
+ { return m_bAnimation ? m_nCurFrame : m_nCurStep; }
int GetPieceLibraryCount()
{ return m_nPieceCount; }
const char* GetLibraryPath()
@@ -138,7 +137,7 @@ protected:
void AddPiece(Piece* pPiece);
void RemovePiece(Piece* pPiece);
bool RemoveSelectedObjects();
- BoundingBox* FindObjectFromPoint(int x, int y);
+ void FindObjectFromPoint(int x, int y, LC_CLICKLINE* pLine);
void SelectAndFocusNone(bool bFocusOnly);
void CalculateStep();
void MoveSelectedObjects(float x, float y, float z);