diff options
Diffstat (limited to 'Magic2/MagicView.cpp')
-rw-r--r-- | Magic2/MagicView.cpp | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/Magic2/MagicView.cpp b/Magic2/MagicView.cpp index e29e5d3..09e6314 100644 --- a/Magic2/MagicView.cpp +++ b/Magic2/MagicView.cpp @@ -238,7 +238,7 @@ MagicDoc* MagicView::GetDocument() // non-debug version is inline // +--------------------------------------------------------------------+ -void MagicView::OnInitialUpdate() +void MagicView::OnInitialUpdate() { CView::OnInitialUpdate(); Color::SetPalette(standard_palette, 256, inverse_palette); @@ -271,7 +271,7 @@ void MagicView::OnInitialUpdate() } ::Print(" Created screen object (%d x %d).\n", w, h); - + if (!screen->SetBackgroundColor(Color::Black)) ::Print(" WARNING: could not set video background color to Black\n"); @@ -323,7 +323,7 @@ void MagicView::OnInitialUpdate() screen->AddWindow(main_win); - DWORD view_types[] = { + DWORD view_types[] = { ModelView::VIEW_PLAN, ModelView::VIEW_PROJECT, ModelView::VIEW_SIDE, @@ -334,13 +334,13 @@ void MagicView::OnInitialUpdate() for (int col = 0; col < 2; col++) { int index = 2*row + col; - ActiveWindow* win = new ActiveWindow(screen, - col*w/2, - row*h/2, - w/2, - h/2, - 101+index, - WIN_BLACK_FRAME, + ActiveWindow* win = new ActiveWindow(screen, + col*w/2, + row*h/2, + w/2, + h/2, + 101+index, + WIN_BLACK_FRAME, main_win); win->SetCells(col, row, 1, 1); @@ -531,13 +531,13 @@ MagicView::GetModelViewByIndex(int index) // +--------------------------------------------------------------------+ -void MagicView::OnPaint() +void MagicView::OnPaint() { ValidateRect(0); OnRender(); } -void MagicView::OnDraw(CDC* dc) +void MagicView::OnDraw(CDC* dc) { } @@ -580,7 +580,7 @@ void MagicView::ResizeVideo() } if (screen) - screen->Resize(video_settings->window_width, + screen->Resize(video_settings->window_width, video_settings->window_height); video->InvalidateCache(); @@ -590,7 +590,7 @@ void MagicView::ResizeVideo() // +--------------------------------------------------------------------+ -void MagicView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) +void MagicView::OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) { CView::OnUpdate(pSender, lHint, pHint); @@ -627,7 +627,7 @@ MagicView::LPtoWP(const CPoint& p) // // MagicView message handlers -void MagicView::OnEnterSizeMove() +void MagicView::OnEnterSizeMove() { is_sizing = true; } @@ -638,7 +638,7 @@ void MagicView::OnExitSizeMove() ResizeVideo(); } -void MagicView::OnSize(UINT nType, int cx, int cy) +void MagicView::OnSize(UINT nType, int cx, int cy) { CView::OnSize(nType, cx, cy); @@ -670,9 +670,9 @@ void MagicView::OnSize(UINT nType, int cx, int cy) ResizeVideo(); } else { - // If we're neither maximized nor minimized, the window size - // is changing by the user dragging the window edges. In this - // case, we don't reset the device yet -- we wait until the + // If we're neither maximized nor minimized, the window size + // is changing by the user dragging the window edges. In this + // case, we don't reset the device yet -- we wait until the // user stops dragging, and a WM_EXITSIZEMOVE message comes. } } @@ -680,9 +680,9 @@ void MagicView::OnSize(UINT nType, int cx, int cy) // +--------------------------------------------------------------------+ -void MagicView::OnRender() +void MagicView::OnRender() { - if (!screen || !video) + if (!screen || !video) return; double s = sin(timeGetTime() * 0.001); @@ -729,66 +729,66 @@ void MagicView::CloseUVEditor() // +--------------------------------------------------------------------+ -void MagicView::OnViewAll() +void MagicView::OnViewAll() { CloseUVEditor(); view_mode = VIEW_ALL; SetupModelViews(); } -void MagicView::OnUpdateViewAll(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewAll(CCmdUI* pCmdUI) { if (pCmdUI) pCmdUI->SetCheck(view_mode == VIEW_ALL); } -void MagicView::OnViewFront() +void MagicView::OnViewFront() { CloseUVEditor(); view_mode = VIEW_FRONT; SetupModelViews(); } -void MagicView::OnUpdateViewFront(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewFront(CCmdUI* pCmdUI) { if (pCmdUI) pCmdUI->SetCheck(view_mode == VIEW_FRONT); } -void MagicView::OnViewPerspective() +void MagicView::OnViewPerspective() { CloseUVEditor(); view_mode = VIEW_PERSPECTIVE; SetupModelViews(); } -void MagicView::OnUpdateViewPerspective(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewPerspective(CCmdUI* pCmdUI) { if (pCmdUI) pCmdUI->SetCheck(view_mode == VIEW_PERSPECTIVE); } -void MagicView::OnViewSide() +void MagicView::OnViewSide() { CloseUVEditor(); view_mode = VIEW_SIDE; SetupModelViews(); } -void MagicView::OnUpdateViewSide(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewSide(CCmdUI* pCmdUI) { if (pCmdUI) pCmdUI->SetCheck(view_mode == VIEW_SIDE); } -void MagicView::OnViewTop() +void MagicView::OnViewTop() { CloseUVEditor(); view_mode = VIEW_TOP; SetupModelViews(); } -void MagicView::OnUpdateViewTop(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewTop(CCmdUI* pCmdUI) { if (pCmdUI) pCmdUI->SetCheck(view_mode == VIEW_TOP); @@ -796,7 +796,7 @@ void MagicView::OnUpdateViewTop(CCmdUI* pCmdUI) // +--------------------------------------------------------------------+ -void MagicView::OnFileImport() +void MagicView::OnFileImport() { DWORD err = 0; char filename[256]; @@ -823,7 +823,7 @@ void MagicView::OnFileImport() } } -void MagicView::OnFileExport() +void MagicView::OnFileExport() { DWORD err = 0; char filename[256]; @@ -851,13 +851,13 @@ void MagicView::OnFileExport() // +--------------------------------------------------------------------+ -void MagicView::OnSurfaceProperties() +void MagicView::OnSurfaceProperties() { SurfacePropertiesDialog dlg(this); dlg.DoModal(); } -void MagicView::OnUpdateSurfaceProperties(CCmdUI* pCmdUI) +void MagicView::OnUpdateSurfaceProperties(CCmdUI* pCmdUI) { Solid* solid = GetDocument()->GetSolid(); pCmdUI->Enable(solid && solid->GetModel()); @@ -865,7 +865,7 @@ void MagicView::OnUpdateSurfaceProperties(CCmdUI* pCmdUI) // +--------------------------------------------------------------------+ -void MagicView::OnTextureMap() +void MagicView::OnTextureMap() { TextureMapDialog dlg(this); if (dlg.DoModal() == IDOK) { @@ -893,7 +893,7 @@ void MagicView::OnTextureMap() } } -void MagicView::OnUpdateTextureMap(CCmdUI* pCmdUI) +void MagicView::OnUpdateTextureMap(CCmdUI* pCmdUI) { Solid* solid = GetDocument()->GetSolid(); Selection* seln = GetDocument()->GetSelection(); @@ -901,7 +901,7 @@ void MagicView::OnUpdateTextureMap(CCmdUI* pCmdUI) pCmdUI->Enable(solid && solid->GetModel() && seln && seln->GetPolys().size() > 0); } -void MagicView::OnModifyMaterial() +void MagicView::OnModifyMaterial() { MaterialDialog dlg(this); dlg.DoModal(); @@ -911,13 +911,13 @@ void MagicView::OnModifyMaterial() GetDocument()->UpdateAllViews(this); } -void MagicView::OnUpdateModifyMaterial(CCmdUI* pCmdUI) +void MagicView::OnUpdateModifyMaterial(CCmdUI* pCmdUI) { Solid* solid = GetDocument()->GetSolid(); pCmdUI->Enable(solid && solid->GetModel()); } -void MagicView::OnModifyUVMap() +void MagicView::OnModifyUVMap() { Selection* seln = GetDocument()->GetSelection(); @@ -934,32 +934,32 @@ void MagicView::OnModifyUVMap() } } -void MagicView::OnUpdateModifyUVMap(CCmdUI* pCmdUI) +void MagicView::OnUpdateModifyUVMap(CCmdUI* pCmdUI) { OnUpdateTextureMap(pCmdUI); } // +--------------------------------------------------------------------+ -void MagicView::OnGridProperties() +void MagicView::OnGridProperties() { GridProps dlg(grid, this); dlg.DoModal(); } -void MagicView::OnGridShow() +void MagicView::OnGridShow() { if (grid) grid->SetShow(!grid->IsShow()); } -void MagicView::OnGridSnap() +void MagicView::OnGridSnap() { if (grid) grid->SetSnap(!grid->IsSnap()); } -void MagicView::OnUpdateGridSnap(CCmdUI* pCmdUI) +void MagicView::OnUpdateGridSnap(CCmdUI* pCmdUI) { if (grid) pCmdUI->SetCheck(grid->IsSnap()); @@ -967,7 +967,7 @@ void MagicView::OnUpdateGridSnap(CCmdUI* pCmdUI) // +--------------------------------------------------------------------+ -void MagicView::OnLButtonDown(UINT nFlags, CPoint point) +void MagicView::OnLButtonDown(UINT nFlags, CPoint point) { CView::OnLButtonDown(nFlags, point); SetCapture(); @@ -1008,7 +1008,7 @@ void MagicView::OnLButtonDown(UINT nFlags, CPoint point) } } -void MagicView::OnLButtonUp(UINT nFlags, CPoint point) +void MagicView::OnLButtonUp(UINT nFlags, CPoint point) { CView::OnLButtonUp(nFlags, point); ReleaseCapture(); @@ -1025,7 +1025,7 @@ void MagicView::OnLButtonUp(UINT nFlags, CPoint point) selector->End(); } -void MagicView::OnLButtonDblClk(UINT nFlags, CPoint point) +void MagicView::OnLButtonDblClk(UINT nFlags, CPoint point) { CView::OnLButtonDblClk(nFlags, point); @@ -1041,7 +1041,7 @@ void MagicView::OnLButtonDblClk(UINT nFlags, CPoint point) selector->Clear(); } -void MagicView::OnRButtonDown(UINT nFlags, CPoint point) +void MagicView::OnRButtonDown(UINT nFlags, CPoint point) { CView::OnRButtonDown(nFlags, point); SetCapture(); @@ -1055,7 +1055,7 @@ void MagicView::OnRButtonDown(UINT nFlags, CPoint point) drag_right = true; } -void MagicView::OnRButtonUp(UINT nFlags, CPoint point) +void MagicView::OnRButtonUp(UINT nFlags, CPoint point) { CView::OnRButtonUp(nFlags, point); ReleaseCapture(); @@ -1063,7 +1063,7 @@ void MagicView::OnRButtonUp(UINT nFlags, CPoint point) drag_right = false; } -void MagicView::OnRButtonDblClk(UINT nFlags, CPoint point) +void MagicView::OnRButtonDblClk(UINT nFlags, CPoint point) { CView::OnRButtonDblClk(nFlags, point); ReleaseCapture(); @@ -1085,14 +1085,14 @@ void MagicView::OnRButtonDblClk(UINT nFlags, CPoint point) SetFocusModelView(view_focus); } -void MagicView::OnMouseMove(UINT nFlags, CPoint point) +void MagicView::OnMouseMove(UINT nFlags, CPoint point) { if (drag_right) { CPoint offset = point - drag_start; if (view_focus == VIEW_PERSPECTIVE) { ModelView* view = GetModelViewByIndex(view_focus); - view->SpinBy(offset.x * 0.5 * DEGREES, + view->SpinBy(offset.x * 0.5 * DEGREES, offset.y * 0.5 * DEGREES); } @@ -1148,7 +1148,7 @@ void MagicView::OnMouseMove(UINT nFlags, CPoint point) CView::OnMouseMove(nFlags, point); } -BOOL MagicView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) +BOOL MagicView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) { if (view_focus == VIEW_PERSPECTIVE) { ModelView* view = GetModelViewByIndex(view_focus); @@ -1192,7 +1192,7 @@ BOOL MagicView::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt) // +--------------------------------------------------------------------+ -void MagicView::OnViewZoomNormal() +void MagicView::OnViewZoomNormal() { for (int i = 0; i < 4; i++) { ModelView* view = GetModelViewByIndex(i); @@ -1203,7 +1203,7 @@ void MagicView::OnViewZoomNormal() } } -void MagicView::OnViewZoomIn() +void MagicView::OnViewZoomIn() { for (int i = 0; i < 4; i++) { ModelView* view = GetModelViewByIndex(i); @@ -1215,7 +1215,7 @@ void MagicView::OnViewZoomIn() } } -void MagicView::OnViewZoomOut() +void MagicView::OnViewZoomOut() { for (int i = 0; i < 4; i++) { ModelView* view = GetModelViewByIndex(i); @@ -1229,7 +1229,7 @@ void MagicView::OnViewZoomOut() // +--------------------------------------------------------------------+ -void MagicView::OnViewModeWireframe() +void MagicView::OnViewModeWireframe() { ModelView* view = GetModelViewByIndex(view_focus); @@ -1238,7 +1238,7 @@ void MagicView::OnViewModeWireframe() } } -void MagicView::OnViewModeSolid() +void MagicView::OnViewModeSolid() { ModelView* view = GetModelViewByIndex(view_focus); @@ -1247,7 +1247,7 @@ void MagicView::OnViewModeSolid() } } -void MagicView::OnViewModeTextured() +void MagicView::OnViewModeTextured() { ModelView* view = GetModelViewByIndex(view_focus); @@ -1256,7 +1256,7 @@ void MagicView::OnViewModeTextured() } } -void MagicView::OnViewBackColor() +void MagicView::OnViewBackColor() { ModelView* view = GetModelViewByIndex(view_focus); @@ -1275,7 +1275,7 @@ void MagicView::OnViewBackColor() // +--------------------------------------------------------------------+ -void MagicView::OnSelectAll() +void MagicView::OnSelectAll() { Solid* solid = GetDocument()->GetSolid(); Selector* selector = GetDocument()->GetSelector(); @@ -1290,7 +1290,7 @@ void MagicView::OnSelectAll() } } -void MagicView::OnSelectNone() +void MagicView::OnSelectNone() { Solid* solid = GetDocument()->GetSolid(); Selector* selector = GetDocument()->GetSelector(); @@ -1305,7 +1305,7 @@ void MagicView::OnSelectNone() } } -void MagicView::OnSelectInverse() +void MagicView::OnSelectInverse() { Solid* solid = GetDocument()->GetSolid(); Selector* selector = GetDocument()->GetSelector(); @@ -1320,7 +1320,7 @@ void MagicView::OnSelectInverse() } } -void MagicView::OnViewShadows() +void MagicView::OnViewShadows() { view_shadows = !view_shadows; @@ -1328,22 +1328,22 @@ void MagicView::OnViewShadows() video->SetShadowEnabled(view_shadows); } -void MagicView::OnUpdateViewShadows(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewShadows(CCmdUI* pCmdUI) { pCmdUI->SetCheck(view_shadows); } -void MagicView::OnViewAnimatelight() +void MagicView::OnViewAnimatelight() { animate_light = !animate_light; } -void MagicView::OnUpdateViewAnimatelight(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewAnimatelight(CCmdUI* pCmdUI) { pCmdUI->SetCheck(animate_light); } -void MagicView::OnViewBumpmaps() +void MagicView::OnViewBumpmaps() { view_bumpmaps = !view_bumpmaps; @@ -1351,12 +1351,12 @@ void MagicView::OnViewBumpmaps() video->SetBumpMapEnabled(view_bumpmaps); } -void MagicView::OnUpdateViewBumpmaps(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewBumpmaps(CCmdUI* pCmdUI) { pCmdUI->SetCheck(view_bumpmaps); } -void MagicView::OnViewVertexshader() +void MagicView::OnViewVertexshader() { if (video) { VideoSettings* vs = (VideoSettings*) video->GetVideoSettings(); @@ -1364,13 +1364,13 @@ void MagicView::OnViewVertexshader() } } -void MagicView::OnUpdateViewVertexshader(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewVertexshader(CCmdUI* pCmdUI) { if (video) pCmdUI->SetCheck(video->GetVideoSettings()->enable_vs); } -void MagicView::OnViewPixelshader() +void MagicView::OnViewPixelshader() { if (video) { VideoSettings* vs = (VideoSettings*) video->GetVideoSettings(); @@ -1378,23 +1378,23 @@ void MagicView::OnViewPixelshader() } } -void MagicView::OnUpdateViewPixelshader(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewPixelshader(CCmdUI* pCmdUI) { if (video) pCmdUI->SetCheck(video->GetVideoSettings()->enable_ps); } -void MagicView::OnViewVisibleshadows() +void MagicView::OnViewVisibleshadows() { Shadow::SetVisibleShadowVolumes(!Shadow::GetVisibleShadowVolumes()); } -void MagicView::OnUpdateViewVisibleshadows(CCmdUI* pCmdUI) +void MagicView::OnUpdateViewVisibleshadows(CCmdUI* pCmdUI) { pCmdUI->SetCheck(Shadow::GetVisibleShadowVolumes()); } -void MagicView::OnEditUndo() +void MagicView::OnEditUndo() { MagicDoc* pDoc = GetDocument(); ASSERT_VALID(pDoc); @@ -1413,7 +1413,7 @@ void MagicView::OnEditUndo() pDoc->UpdateAllViews(this); } -void MagicView::OnUpdateEditUndo(CCmdUI* pCmdUI) +void MagicView::OnUpdateEditUndo(CCmdUI* pCmdUI) { MagicDoc* pDoc = GetDocument(); @@ -1427,7 +1427,7 @@ void MagicView::OnUpdateEditUndo(CCmdUI* pCmdUI) } } -void MagicView::OnEditRedo() +void MagicView::OnEditRedo() { MagicDoc* pDoc = GetDocument(); ASSERT_VALID(pDoc); @@ -1446,7 +1446,7 @@ void MagicView::OnEditRedo() pDoc->UpdateAllViews(this); } -void MagicView::OnUpdateEditRedo(CCmdUI* pCmdUI) +void MagicView::OnUpdateEditRedo(CCmdUI* pCmdUI) { MagicDoc* pDoc = GetDocument(); |