Changeset 646

Timestamp:

11/17/06 14:48:40 (2 years ago)

Author:

leo

Message:

Added Model menu and moved time variables to the model class.

Location:

trunk

Files:

• common/keyboard.cpp (modified) (2 diffs)
• common/lc_model.cpp (modified) (4 diffs)
• common/lc_model.h (modified) (3 diffs)
• common/project.cpp (modified) (80 diffs)
• common/project.h (modified) (3 diffs)
• common/system.h (modified) (3 diffs)
• common/typedefs.h (modified) (2 diffs)
• win/Cadview.cpp (modified) (2 diffs)
• win/LeoCAD.rc (modified) (4 diffs)
• win/Mainfrm.cpp (modified) (5 diffs)
• win/System.cpp (modified) (1 diff)
• win/resource.h (modified) (4 diffs)

trunk/common/keyboard.cpp

@@ -24 +24 @@
     { LC_FILE_POVRAY, "Export POV-Ray", 0, 0, 0 },
     { LC_FILE_WAVEFRONT, "Export Wavefront", 0, 0, 0 },
-    { LC_FILE_PROPERTIES, "Project Properties", 0, 0, 0 },
 //  { LC_FILE_TERRAIN, "Terrain Editor", 0, 0, 0 },
     { LC_FILE_LIBRARY, "Piece Library Manager", 0, 0, 0 },
@@ -53 +52 @@
     { LC_PIECE_NEXT, "Piece Next Step", 0, 0, 0 },
     { LC_VIEW_PREFERENCES, "Preferences", 0, 0, 0 },
+    { LC_MODEL_NEW, "New Model", 0, 0, 0 },
+    { LC_MODEL_DELETE, "Delete Properties", 0, 0, 0 },
+    { LC_MODEL_PROPERTIES, "Model Properties", 0, 0, 0 },
 //  { LC_VIEW_ZOOM, "", 0, 0, 0 },
     { LC_VIEW_ZOOMIN, "Zoom In", 0, 0, 0 },

trunk/common/lc_model.cpp

@@ -7 +7 @@
     m_Pieces = NULL;
     m_Name = Name;
-    m_CurTime = 1;
+    m_CurFrame = 1;
+    m_TotalFrames = 1;
 }
 
@@ -67 +68 @@
 {
     for (Piece* piece = m_Pieces; piece; piece = (Piece*)piece->m_Next)
-        if ((piece->IsVisible(m_CurTime)) && piece->IsSelected())
+        if ((piece->IsVisible(m_CurFrame)) && piece->IsSelected())
             return true;
 
@@ -78 +79 @@
 
     for (Piece* piece = m_Pieces; piece; piece = (Piece*)piece->m_Next)
-        if (piece->IsVisible(m_CurTime))
+        if (piece->IsVisible(m_CurFrame))
             piece->Select(Select, FocusOnly);
 }
@@ -86 +87 @@
     for (Piece* piece = m_Pieces; piece; piece = (Piece*)piece->m_Next)
     {
-        if (piece->IsVisible(m_CurTime))
+        if (piece->IsVisible(m_CurFrame))
         {
             if (piece->IsSelected())

trunk/common/lc_model.h

@@ -3 +3 @@
 
 #include "str.h"
+#include "config.h"
 
 class Piece;
@@ -13 +14 @@
 
 public:
+    // Returns the model's name.
+    const String& GetName() const
+    { return m_Name; }
+
     // Adds a piece to this model.
     void AddPiece(Piece* NewPiece);
@@ -43 +48 @@
     // Making these public for now.
     Piece* m_Pieces;
-    int m_CurTime;
+
+    u32 m_CurFrame;
+    u32 m_TotalFrames;
 
 protected:

trunk/common/project.cpp

@@ -141 +141 @@
     SystemUpdateCurrentCamera(NULL, m_ActiveView->GetCamera(), m_pCameras);
     UpdateSelection();
-    SystemUpdateTime(false, m_ActiveModel->m_CurTime, 255);
+    SystemUpdateTime(false, m_ActiveModel->m_CurFrame, 255);
 
     for (int i = 0; i < m_ViewList.GetSize(); i++)
@@ -312 +312 @@
     m_fGradient2[2] = (float)((unsigned char) ((rgb) >> 16))/255;
     m_nFPS = Sys_ProfileLoadInt ("Default", "FPS", 24);
-    m_nTotalFrames = 100;
     SystemUpdateTime(false, 1, 255);
     m_nScene = Sys_ProfileLoadInt ("Default", "Scene", 0);
@@ -749 +748 @@
                 file->ReadByte (&m_nFPS, 1);
                 file->ReadLong (&i, 1); //m_nCurFrame = i;
-                file->ReadShort (&m_nTotalFrames, 1);
+                file->ReadShort (&sh, 1); // m_nTotalFrames
                 file->ReadLong (&i, 1); //m_nGridSize = i;
                 file->ReadLong (&i, 1); //m_nMoveSnap = i;
@@ -760 +759 @@
                 file->ReadByte (&m_nFPS, 1);
                 file->ReadShort (&sh, 1); // m_nCurFrame
-                file->ReadShort (&m_nTotalFrames, 1);
+                file->ReadShort (&sh, 1); // m_nTotalFrames
                 file->ReadShort (&sh, 1); // m_nGridSize
                 file->ReadShort (&sh, 1);
@@ -809 +808 @@
     SystemUpdateCurrentCamera(NULL, m_ActiveView->GetCamera(), m_pCameras);
     UpdateSelection();
-    SystemUpdateTime(false, m_ActiveModel->m_CurTime, 255);
+    SystemUpdateTime(false, m_ActiveModel->m_CurFrame, 255);
     UpdateAllViews ();
 
@@ -838 +837 @@
     i = m_nCurColor; file->WriteLong (&i, 1);
     i = m_nCurAction; file->WriteLong (&i, 1);
-    i = m_ActiveModel->m_CurTime; file->WriteLong (&i, 1);
+    i = m_ActiveModel->m_CurFrame; file->WriteLong (&i, 1);
     file->WriteLong (&m_nScene, 1);
 
@@ -902 +901 @@
     file->WriteByte (&m_nFPS, 1);
     sh = 1; file->WriteShort (&sh, 1); // m_nCurFrame
-    file->WriteShort (&m_nTotalFrames, 1);
+    sh = 1; file->WriteShort (&sh, 1); // m_nTotalFrames
     sh = 10; file->WriteShort (&sh, 1); // m_nGridSize
     file->WriteShort (&m_nMoveSnap, 1);
@@ -928 +927 @@
             opts.format = LC_IMAGE_GIF;
 
-            i = m_ActiveModel->m_CurTime;
+            i = m_ActiveModel->m_CurFrame;
             CreateImages(image, 120, 100, i, i, false);
             image[0].FileSave (*file, &opts);
@@ -1431 +1430 @@
                 FileReadLDraw(&file, &mat, &ok, m_nCurColor, &step, FileArray, FilePath);
 
-            m_ActiveModel->m_CurTime = step;
-            SystemUpdateTime(false, m_ActiveModel->m_CurTime, 255);
+            m_ActiveModel->m_CurFrame = step;
+            SystemUpdateTime(false, m_ActiveModel->m_CurFrame, 255);
             SystemUpdateFocus(NULL);
             UpdateSelection();
@@ -1980 +1979 @@
         lcMesh* Mesh = piece->GetMesh();
 
-        if (!piece->IsVisible(m_ActiveModel->m_CurTime))
+        if (!piece->IsVisible(m_ActiveModel->m_CurFrame))
             continue;
 
@@ -2967 +2966 @@
 
     for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-        if (pPiece->IsVisible(m_ActiveModel->m_CurTime))
+        if (pPiece->IsVisible(m_ActiveModel->m_CurFrame))
             pPiece->RenderBox(bHilite, m_fLineWidth);
 }
@@ -3082 +3081 @@
     for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
     {
-        pPiece->UpdatePosition(m_ActiveModel->m_CurTime);
+        pPiece->UpdatePosition(m_ActiveModel->m_CurFrame);
         PieceCount++;
     }
@@ -3091 +3090 @@
     for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
     {
-        pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurTime, false, false);
+        pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurFrame, false, false);
         SytemStepProgressBar();
     }
@@ -3099 +3098 @@
 
     for (pCamera = m_pCameras; pCamera; pCamera = (Camera*)pCamera->m_Next)
-        pCamera->UpdatePosition(m_ActiveModel->m_CurTime);
+        pCamera->UpdatePosition(m_ActiveModel->m_CurFrame);
 
     for (pLight = m_pLights; pLight; pLight = (Light*)pLight->m_Next)
-        pLight->UpdatePosition(m_ActiveModel->m_CurTime);
+        pLight->UpdatePosition(m_ActiveModel->m_CurFrame);
 }
 
@@ -3336 +3335 @@
     if (Frames)
     {
-        m_ActiveModel->m_CurTime += Frames;
-        while (m_ActiveModel->m_CurTime > m_nTotalFrames)
-            m_ActiveModel->m_CurTime -= m_nTotalFrames;
+        m_ActiveModel->m_CurFrame += Frames;
+        while (m_ActiveModel->m_CurFrame > m_ActiveModel->m_TotalFrames)
+            m_ActiveModel->m_CurFrame -= m_ActiveModel->m_TotalFrames;
 
         CalculateStep();
-        SystemUpdateTime(true, m_ActiveModel->m_CurTime, m_nTotalFrames);
+        SystemUpdateTime(true, m_ActiveModel->m_CurFrame, m_ActiveModel->m_TotalFrames);
 
         UpdateAllViews();
@@ -3362 +3361 @@
     void* render = Sys_StartMemoryRender (width, height);
     unsigned char* buf = (unsigned char*)malloc (width*height*3);
-    oldtime = m_ActiveModel->m_CurTime;
+    oldtime = m_ActiveModel->m_CurFrame;
 
     View view(this, NULL);
@@ -3375 +3374 @@
     for (int i = from; i <= to; i++)
     {
-        m_ActiveModel->m_CurTime = i;
+        m_ActiveModel->m_CurFrame = i;
 
         if (hilite)
@@ -3393 +3392 @@
     }
 
-    m_ActiveModel->m_CurTime = (unsigned char)oldtime;
+    m_ActiveModel->m_CurFrame = (unsigned char)oldtime;
     CalculateStep();
     free (buf);
@@ -3517 +3516 @@
 
             if (Pos != mod->Position)
-                pPiece->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->Position, LC_PK_POSITION);
+                pPiece->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->Position, LC_PK_POSITION);
 
             if (mod->Rotation[0] != Angles[0] || mod->Rotation[1] != Angles[1] || mod->Rotation[2] != Angles[2])
@@ -3524 +3523 @@
                 Vector4 AxisAngle = MatrixToAxisAngle(mat);
                 AxisAngle[3] *= LC_RTOD;
-                pPiece->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, AxisAngle, LC_PK_ROTATION);
+                pPiece->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, AxisAngle, LC_PK_ROTATION);
             }
 
@@ -3537 +3536 @@
             pPiece->SetName(mod->name);
             pPiece->SetColor(mod->color);
-            pPiece->UpdatePosition(m_ActiveModel->m_CurTime);
-            pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurTime, false, true);
+            pPiece->UpdatePosition(m_ActiveModel->m_CurFrame);
+            pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurFrame, false, true);
 
             SetModifiedFlag(true);
@@ -3561 +3560 @@
 
             if (pCamera->GetEyePosition() != mod->Eye)
-                pCamera->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->Eye, LC_CK_EYE);
+                pCamera->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->Eye, LC_CK_EYE);
 
             if (pCamera->GetTargetPosition() != mod->Target)
-                pCamera->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->Target, LC_CK_TARGET);
+                pCamera->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->Target, LC_CK_TARGET);
 
             if (pCamera->GetRoll() != mod->Roll)
-                pCamera->SetRoll(mod->Roll, m_ActiveModel->m_CurTime, m_bAddKeys);
+                pCamera->SetRoll(mod->Roll, m_ActiveModel->m_CurFrame, m_bAddKeys);
 
             pCamera->SetName(mod->name);
@@ -3574 +3573 @@
             pCamera->m_zFar = mod->zfar;
 
-            pCamera->UpdatePosition(m_ActiveModel->m_CurTime);
+            pCamera->UpdatePosition(m_ActiveModel->m_CurFrame);
             UpdateAllViews();
         } break;
@@ -3589 +3588 @@
 
             if (light->GetPosition() != mod->Position)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->Position, LC_LK_POSITION);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->Position, LC_LK_POSITION);
 
             if (light->GetTargetPosition() != mod->Target)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->Target, LC_LK_TARGET);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->Target, LC_LK_TARGET);
 
             if (light->GetAmbientColor() != mod->AmbientColor)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->AmbientColor, LC_LK_AMBIENT_COLOR);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->AmbientColor, LC_LK_AMBIENT_COLOR);
 
             if (light->GetDiffuseColor() != mod->DiffuseColor)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->DiffuseColor, LC_LK_DIFFUSE_COLOR);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->DiffuseColor, LC_LK_DIFFUSE_COLOR);
 
             if (light->GetSpecularColor() != mod->SpecularColor)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, mod->SpecularColor, LC_LK_SPECULAR_COLOR);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, mod->SpecularColor, LC_LK_SPECULAR_COLOR);
 
             if (light->GetConstantAttenuation() != mod->ConstantAttenuation)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, &mod->ConstantAttenuation, LC_LK_CONSTANT_ATTENUATION);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, &mod->ConstantAttenuation, LC_LK_CONSTANT_ATTENUATION);
 
             if (light->GetLinearAttenuation() != mod->LinearAttenuation)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, &mod->LinearAttenuation, LC_LK_LINEAR_ATTENUATION);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, &mod->LinearAttenuation, LC_LK_LINEAR_ATTENUATION);
 
             if (light->GetQuadraticAttenuation() != mod->QuadraticAttenuation)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, &mod->QuadraticAttenuation, LC_LK_QUADRATIC_ATTENUATION);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, &mod->QuadraticAttenuation, LC_LK_QUADRATIC_ATTENUATION);
 
             if (light->GetSpotCutoff() != mod->SpotCutoff)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, &mod->SpotCutoff, LC_LK_SPOT_CUTOFF);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, &mod->SpotCutoff, LC_LK_SPOT_CUTOFF);
 
             if (light->GetSpotExponent() != mod->SpotExponent)
-                light->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, &mod->SpotExponent, LC_LK_SPOT_EXPONENT);
+                light->ChangeKey(m_ActiveModel->m_CurFrame, m_bAddKeys, &mod->SpotExponent, LC_LK_SPOT_EXPONENT);
 
             light->SetName(mod->name);
 
-            light->UpdatePosition(m_ActiveModel->m_CurTime);
+            light->UpdatePosition(m_ActiveModel->m_CurFrame);
             UpdateAllViews();
         } break;
@@ -3693 +3692 @@
             LC_IMAGEDLG_OPTS opts;
             opts.from = 1;
-            opts.to = m_nTotalFrames;
+            opts.to = m_ActiveModel->m_TotalFrames;
             opts.multiple = false;
             opts.imopts.background[0] = (unsigned char)(m_fBackground[0]*255);
@@ -3714 +3713 @@
                 }
                 else
-                    opts.from = opts.to = m_ActiveModel->m_CurTime;
+                    opts.from = opts.to = m_ActiveModel->m_CurFrame;
 
                 Image* images = new Image[opts.to-opts.from+1];
@@ -4405 +4404 @@
         } break;
 
-        case LC_FILE_PROPERTIES:
+        case LC_MODEL_NEW:
+        {
+        } break;
+
+        case LC_MODEL_DELETE:
+        {
+        } break;
+
+        case LC_MODEL_PROPERTIES:
         {
             LC_PROPERTIESDLG_OPTS opts;
@@ -4642 +4649 @@
                 pPasted = (Piece*)pPasted->m_Next;
                 pPiece->CreateName(m_ActiveModel->m_Pieces);
-                pPiece->SetTimeShow(m_ActiveModel->m_CurTime);
+                pPiece->SetTimeShow(m_ActiveModel->m_CurFrame);
                 AddPiece(pPiece);
                 pPiece->Select(true, false);
@@ -4722 +4729 @@
             Piece* pPiece;
             for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-                if (pPiece->IsVisible(m_ActiveModel->m_CurTime))
+                if (pPiece->IsVisible(m_ActiveModel->m_CurFrame))
                     pPiece->Select(true, false);
 
@@ -4742 +4749 @@
             Piece* pPiece;
             for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-                if (pPiece->IsVisible(m_ActiveModel->m_CurTime))
+                if (pPiece->IsVisible(m_ActiveModel->m_CurFrame))
                 {
                     if (pPiece->IsSelected())
@@ -4764 +4771 @@
 
             for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-                if (pPiece->IsVisible(m_ActiveModel->m_CurTime))
+                if (pPiece->IsVisible(m_ActiveModel->m_CurFrame))
                     i++;
 
@@ -4790 +4797 @@
 
             for (pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-                if (pPiece->IsVisible(m_ActiveModel->m_CurTime))
+                if (pPiece->IsVisible(m_ActiveModel->m_CurFrame))
                 {
                     opts[i].name = pPiece->GetName();
@@ -4895 +4902 @@
                 GetPieceInsertPosition(pLast, Pos, Rot);
 
-                pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_ActiveModel->m_CurTime, m_nCurColor);
-
-                pPiece->ChangeKey(m_ActiveModel->m_CurTime, false, Rot, LC_PK_ROTATION);
-                pPiece->UpdatePosition(m_ActiveModel->m_CurTime);
+                pPiece->Initialize(Pos[0], Pos[1], Pos[2], m_ActiveModel->m_CurFrame, m_nCurColor);
+
+                pPiece->ChangeKey(m_ActiveModel->m_CurFrame, false, Rot, LC_PK_ROTATION);
+                pPiece->UpdatePosition(m_ActiveModel->m_CurFrame);
             }
             else
-                pPiece->Initialize(0, 0, -m_pCurPiece->m_fDimensions[5], m_ActiveModel->m_CurTime, m_nCurColor);
+                pPiece->Initialize(0, 0, -m_pCurPiece->m_fDimensions[5], m_ActiveModel->m_CurFrame, m_nCurColor);
 
             SelectAndFocusNone(false);
             pPiece->CreateName(m_ActiveModel->m_Pieces);
             AddPiece(pPiece);
-            pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurTime, true, true);
+            pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurFrame, true, true);
             pPiece->Select (true, true);
             messenger->Dispatch (LC_MSG_FOCUS_CHANGED, pPiece);
@@ -4950 +4957 @@
               Piece* pPiece = new Piece(wiz->m_Info[i]);
 
-              pPiece->Initialize(wiz->m_Position[i][0], wiz->m_Position[i][1], wiz->m_Position[i][2], m_ActiveModel->m_CurTime, wiz->m_Colors[i]);
+              pPiece->Initialize(wiz->m_Position[i][0], wiz->m_Position[i][1], wiz->m_Position[i][2], m_ActiveModel->m_CurFrame, wiz->m_Colors[i]);
               pPiece->CreateName(m_ActiveModel->m_Pieces);
               AddPiece(pPiece);
@@ -4956 +4963 @@
 
               pPiece->ChangeKey(1, false, wiz->m_Rotation[i], LC_PK_ROTATION);
-              pPiece->UpdatePosition(m_ActiveModel->m_CurTime);
-              pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurTime, false, true);
+              pPiece->UpdatePosition(m_ActiveModel->m_CurFrame);
+              pPiece->CalculateConnections(m_pConnections, m_ActiveModel->m_CurFrame, false, true);
 
               SystemPieceComboAdd(wiz->m_Info[i]->m_strDescription);
@@ -5086 +5093 @@
                                 pLast = pFirst = new Piece(pPiece->GetPieceInfo());
 
-                            pLast->Initialize(pos[0]+i*opts.fMove[0], pos[1]+i*opts.fMove[1], pos[2]+i*opts.fMove[2], m_ActiveModel->m_CurTime, pPiece->GetColor());
+                            pLast->Initialize(pos[0]+i*opts.fMove[0], pos[1]+i*opts.fMove[1], pos[2]+i*opts.fMove[2], m_ActiveModel->m_CurFrame, pPiece->GetColor());
                             pLast->ChangeKey(1, false, param, LC_PK_ROTATION);
                         }
@@ -5106 +5113 @@
 
                                 pLast->Initialize(pos[0]+i*opts.fMove[0]+j*opts.f2D[0], pos[1]+i*opts.fMove[1]+j*opts.f2D[1], pos[2]+i*opts.fMove[2]+j*opts.f2D[2],
-                                    m_ActiveModel->m_CurTime, pPiece->GetColor());
+                                    m_ActiveModel->m_CurFrame, pPiece->GetColor());
                                 pLast->ChangeKey(1, false, param, LC_PK_ROTATION);
                             }
@@ -5124 +5131 @@
 
                                 pLast->Initialize(pos[0]+i*opts.fMove[0]+j*opts.f2D[0]+k*opts.f3D[0], pos[1]+i*opts.fMove[1]+j*opts.f2D[1]+k*opts.f3D[1], pos[2]+i*opts.fMove[2]+j*opts.f2D[2]+k*opts.f3D[2],
-                                    m_ActiveModel->m_CurTime, pPiece->GetColor());
+                                    m_ActiveModel->m_CurFrame, pPiece->GetColor());
                                 pLast->ChangeKey(1, false, param, LC_PK_ROTATION);
                             }
@@ -5135 +5142 @@
                     pPiece = (Piece*)pFirst->m_Next;
                     pFirst->CreateName(m_ActiveModel->m_Pieces);
-                    pFirst->UpdatePosition(m_ActiveModel->m_CurTime);
+                    pFirst->UpdatePosition(m_ActiveModel->m_CurFrame);
                     AddPiece(pFirst);
-                    pFirst->CalculateConnections(m_pConnections, m_ActiveModel->m_CurTime, false, true);
+                    pFirst->CalculateConnections(m_pConnections, m_ActiveModel->m_CurFrame, false, true);
                     pFirst = pPiece;
                 }
@@ -5159 +5166 @@
                 if (pPiece->IsSelected())
                 {
-                    pPiece->CalculateSingleKey (m_ActiveModel->m_CurTime, LC_PK_POSITION, move);
-                    pPiece->ChangeKey(m_ActiveModel->m_CurTime, move, LC_PK_POSITION);
-                    pPiece->ChangeKey(m_ActiveModel->m_CurTime, rot, LC_PK_ROTATION);
+                    pPiece->CalculateSingleKey (m_ActiveModel->m_CurFrame, LC_PK_POSITION, move);
+                    pPiece->ChangeKey(m_ActiveModel->m_CurFrame, move, LC_PK_POSITION);
+                    pPiece->ChangeKey(m_ActiveModel->m_CurFrame, rot, LC_PK_ROTATION);
                 }
 
@@ -5425 +5432 @@
                         pPiece->SetTimeShow(t+1);
 
-                        if (pPiece->IsSelected () && t == m_ActiveModel->m_CurTime)
+                        if (pPiece->IsSelected () && t == m_ActiveModel->m_CurFrame)
                             pPiece->Select (false, false);
                     }
@@ -5496 +5503 @@
         case LC_VIEW_ZOOM:
         {
-            m_ActiveView->GetCamera()->DoZoom(nParam, m_nMouse, m_ActiveModel->m_CurTime, m_bAddKeys);
+            m_ActiveView->GetCamera()->DoZoom(nParam, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
             SystemUpdateFocus(NULL);
             UpdateOverlayScale();
@@ -5504 +5511 @@
         case LC_VIEW_ZOOMIN:
         {
-            m_ActiveView->GetCamera()->DoZoom(-1, m_nMouse, m_ActiveModel->m_CurTime, m_bAddKeys);
+            m_ActiveView->GetCamera()->DoZoom(-1, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
             SystemUpdateFocus(NULL);
             UpdateOverlayScale();
@@ -5512 +5519 @@
         case LC_VIEW_ZOOMOUT:
         {
-            m_ActiveView->GetCamera()->DoZoom(1, m_nMouse, m_ActiveModel->m_CurTime, m_bAddKeys);
+            m_ActiveView->GetCamera()->DoZoom(1, m_nMouse, m_ActiveModel->m_CurFrame, m_bAddKeys);
             SystemUpdateFocus(NULL);
             UpdateOverlayScale();
@@ -5527 +5534 @@
 
             for (Piece* pPiece = m_ActiveModel->m_Pieces; pPiece; pPiece = (Piece*)pPiece->m_Next)
-                if (pPiece->IsVisible(m_ActiveModel->m_CurTime))
+                if (pPiece->IsVisible(m_ActiveModel->m_CurFrame))
                     pPiece->CompareBoundingBox(bs);
 
@@ -5561 +5568 @@
                 Vector3 Front = Target - Eye;
 
-                camera->ChangeKey(m_ActiveModel->m_CurTime, m_bAddKeys, Eye, LC_CK_EYE);
-                camera-