Callback: remove fixed-arity wrappers

[xonotic/netradiant.git] / contrib / bobtoolz / DBobView.h

diff --git a/contrib/bobtoolz/DBobView.h b/contrib/bobtoolz/DBobView.h
index 949026076812019a0169827900233d6ee31799f1..b20ef141417d3c6e4dbcca32f9f5f4c8d3279974 100644 (file)
--- a/contrib/bobtoolz/DBobView.h
+++ b/contrib/bobtoolz/DBobView.h
@@ -1,72 +1,101 @@
 /*
-BobToolz plugin for GtkRadiant
-Copyright (C) 2001 Gordon Biggans
+   BobToolz plugin for GtkRadiant
+   Copyright (C) 2001 Gordon Biggans
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-This library 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
-Lesser General Public License for more details.
+   This library 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
+   Lesser General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 // DBobView.h: interface for the DBobView class.
 //
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_)
+#if !defined( AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_ )
 #define AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_
 
+#include "ientity.h"
+#include "irender.h"
+#include "renderable.h"
+#include "mathlib.h"
+
 class DListener;
+class Shader;
 
-#define BOUNDS_ALL     0
-#define BOUNDS_APEX    1
+const int BOUNDS_ALL  = 0;
+const int BOUNDS_APEX = 1;
 
 #if _MSC_VER > 1000
 #pragma once
 #endif // _MSC_VER > 1000
 
-class DBobView : 
-       public IGL2DWindow, 
-       public IGL3DWindow  
+class DBobView : public Renderable, public OpenGLRenderable, public Entity::Observer
 {
+Shader* m_shader_line;
+Shader* m_shader_box;
 public:
-       DBobView();
-       virtual ~DBobView();
+DBobView();
+virtual ~DBobView();
 
 protected:
-       vec3_t* path;
-       int refCount;
+vec3_t* path;
 public:
-       bool m_bShowExtra;
-       int boundingShow;
-       DListener* eyes;
-       float fVarGravity;
-
-       bool UpdatePath();
-       char entTarget[256];
-       char entTrigger[256];
-       void Begin(const char*, const char*, float, int, float, bool, bool);
-       bool CalculateTrajectory(vec3_t, vec3_t, float, int, float);
-
-       void SetPath(vec3_t* pPath);
-       void UnRegister();
-       void Register();
-       void Draw3D();
-       void Draw2D(VIEWTYPE vt);
-       void IncRef() { refCount++; }
-       void DecRef() { refCount--; if (refCount <= 0) delete this; }
-
-       float fMultiplier;
-       bool m_bHooked;
-       int nPathCount;
+bool m_bShowExtra;
+int boundingShow;
+DListener* eyes;
+float fVarGravity;
+float fMultiplier;
+int nPathCount;
+
+Entity* trigger;
+Entity* target;
+
+bool UpdatePath();
+char entTarget[256];
+char entTrigger[256];
+void Begin( const char*, const char*, float, int, float, bool, bool );
+bool CalculateTrajectory( vec3_t, vec3_t, float, int, float );
+
+void SetPath( vec3_t* pPath );
+
+void render( RenderStateFlags state ) const;
+void renderSolid( Renderer& renderer, const VolumeTest& volume ) const;
+void renderWireframe( Renderer& renderer, const VolumeTest& volume ) const;
+
+void constructShaders();
+void destroyShaders();
+
+void valueChanged( const char* value ){
+       UpdatePath();
+}
+typedef MemberCaller<DBobView, void(const char*), &DBobView::valueChanged> ValueChangedCaller;
+void insert( const char* key, EntityKeyValue& value ){
+       value.attach( ValueChangedCaller( *this ) );
+}
+void erase( const char* key, EntityKeyValue& value ){
+       value.detach( ValueChangedCaller( *this ) );
+}
+void clear(){
+       if ( trigger != 0 ) {
+               trigger->detach( *this );
+               target->detach( *this );
+               trigger = 0;
+               target = 0;
+       }
+}
 };
 
+class Entity;
+void DBobView_setEntity( Entity& entity, float multiplier, int points, float varGravity, bool bNoUpdate, bool bShowExtra );
+
 #endif // !defined(AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_)