Added instance vector

Added instance header to main
This commit is contained in:
andreja6
2018-04-10 18:41:38 -07:00
parent d899c4fa4e
commit 0908d93f29
2 changed files with 11 additions and 0 deletions

View File

@@ -4,6 +4,7 @@
Version="8.00" Version="8.00"
Name="G3DTest" Name="G3DTest"
ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" ProjectGUID="{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}"
RootNamespace="G3DTest"
> >
<Platforms> <Platforms>
<Platform <Platform
@@ -208,6 +209,10 @@
Name="Source Files" Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
> >
<File
RelativePath=".\Instance.cpp"
>
</File>
<File <File
RelativePath="main.cpp" RelativePath="main.cpp"
> >
@@ -233,6 +238,10 @@
Name="Header Files" Name="Header Files"
Filter="h;hpp;hxx;hm;inl" Filter="h;hpp;hxx;hm;inl"
> >
<File
RelativePath=".\Instance.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Resource Files" Name="Resource Files"

View File

@@ -11,12 +11,14 @@
@author Morgan McGuire, matrix@graphics3d.com @author Morgan McGuire, matrix@graphics3d.com
*/ */
#include <G3DAll.h> #include <G3DAll.h>
#include "Instance.h"
#if G3D_VER < 61000 #if G3D_VER < 61000
#error Requires G3D 6.10 #error Requires G3D 6.10
#endif #endif
static const float VNUM = 0.01F; static const float VNUM = 0.01F;
static const std::string VERSION = "PRE-ALPHA "; static const std::string VERSION = "PRE-ALPHA ";
static std::vector<Instance> Instances;
static GFontRef fntdominant = NULL; static GFontRef fntdominant = NULL;
static GFontRef fntlighttrek = NULL; static GFontRef fntlighttrek = NULL;
static bool democ = true; static bool democ = true;