gcblue-commits

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13413/include/graphics

Modified Files:
	tcMapView.h tcOOBView.h 
Added Files:
	tcLauncherPopup.h 
Log Message:
Sonar work, passive sonar, torpedoes

Index: tcOOBView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcOOBView.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tcOOBView.h	7 Oct 2004 22:01:12 -0000	1.2
--- tcOOBView.h	7 Dec 2004 03:59:08 -0000	1.3
***************
*** 96,99 ****
--- 96,100 ----
     void OnLButtonDown(wxMouseEvent& event);
     void OnLButtonUp(wxMouseEvent& event);
+    void OnMouseMove(wxMouseEvent& event);
     void SetHookID(long id) {mnSelectedKey = id;}
     tcOOBView(wxWindow *parent, 

--- NEW FILE: tcLauncherPopup.h ---
/**
**  @file tcLauncherPopup.h 
*/
/*  Copyright (C) 2004 Dewitt Colclough (de...@tw...)
**  All rights reserved.

**  This file is part of the Global Conflict Blue (GCB) program.
**  GCB is free software; you can redistribute it and/or modify
**  it under the terms of version 2 of the GNU General Public License as 
**  published by the Free Software Foundation.

**  GCB is distributed in the hope that it will be useful,
**  but WITHOUT ANY WARRANTY; without even the implied warranty of
**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
**  GNU General Public License for more details.

**  You should have received a copy of the GNU General Public License
**  along with GCB; if not, write to the Free Software
**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/


#ifndef _LAUNCHERPOPUP_H_
#define _LAUNCHERPOPUP_H_

#if _MSC_VER > 1000
#pragma once
#endif 

#include "wx/wx.h" 
#include "wx/string.h"

#include <osg/Vec4>

#include "tc3DWindow.h"

class tcLauncher;
class tcSimState;

/**
* Popup control to configure launcher, set torpedo presets
*/
class tcLauncherPopup  : public tc3DWindow 
{
public:
    virtual void Draw();

    static void SetParent(tc3DWindow* par);

    tcLauncherPopup(long id, unsigned idx, const wxPoint& pos); 
    virtual ~tcLauncherPopup();

protected:
    static tc3DWindow* parent;
    
    bool redraw;
    unsigned int birthCount;

    virtual void OnLButtonDown(wxMouseEvent& event);
    virtual void OnMouseOver(wxMouseEvent& event);

private:
    long platformId;
    unsigned launcherIdx;
    tcSimState* simState;
    tcRect launchButton;

    tcLauncher* GetLauncher();


};

#endif


Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapView.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tcMapView.h	5 Dec 2004 02:49:46 -0000	1.7
--- tcMapView.h	7 Dec 2004 03:59:07 -0000	1.8
***************
*** 325,328 ****
--- 325,329 ----
          void SetDateTime(std::string s) {dateTime = s;}
          void SetHookID(long id);
+         void SetTextLeftMargin(float x);
          void ToggleShowTrackTags() {mbShowTrackID = !mbShowTrackID;}
          void UpdateViewBounds() {mpMapData->GetTheaterArea(mrectViewBounds);}
***************
*** 344,348 ****
          bool isLButtonDown; ///< true if left mouse button is down while in window (dragging)
          wxPoint buttonDownPoint; ///< start point for click-drag operations
! 
          void Build2525();
          void BuildNTDS();
--- 345,349 ----
          bool isLButtonDown; ///< true if left mouse button is down while in window (dragging)
          wxPoint buttonDownPoint; ///< start point for click-drag operations
!         float leftMargin; ///< screen position to use for info text and symbols
          void Build2525();
          void BuildNTDS();