diff --git a/Zenderer.vcxproj b/Zenderer.vcxproj index 424ea1f4..098de721 100644 --- a/Zenderer.vcxproj +++ b/Zenderer.vcxproj @@ -92,7 +92,7 @@ Windows - rmdir /S /Q docs & cd $(SolutionDir) & update.py & cd docs/html & del /S *.md5 & xcopy * "$(MSBuildProjectDirectory)/docs" /S /I /C /Y & cd "$(MSBuildProjectDirectory)/data" & xcopy * "$(OutputPath)/Zenderer" /S /I /C /Y & cd ../docs & cd .. + rmdir /S /Q docs & cd $(SolutionDir) & python update.py & cd docs/html & del /S *.md5 & xcopy * "$(MSBuildProjectDirectory)/docs" /S /I /C /Y & cd "$(MSBuildProjectDirectory)/data" & xcopy * "$(OutputPath)/Zenderer" /S /I /C /Y & cd ../docs & cd .. Copying documentation to repo and engine assets to output directory. diff --git a/docs/_allocation-example.html b/docs/_allocation-example.html index b4475b1e..887ad8ae 100644 --- a/docs/_allocation-example.html +++ b/docs/_allocation-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_allocator_8cpp.html b/docs/_allocator_8cpp.html index 5eccc8d5..55ab8af8 100644 --- a/docs/_allocator_8cpp.html +++ b/docs/_allocator_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_allocator_8cpp_source.html b/docs/_allocator_8cpp_source.html index 79e319be..ab655358 100644 --- a/docs/_allocator_8cpp_source.html +++ b/docs/_allocator_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_allocator_8hpp.html b/docs/_allocator_8hpp.html index b9dd9890..030b433e 100644 --- a/docs/_allocator_8hpp.html +++ b/docs/_allocator_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -131,7 +131,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_allocator_8hpp__dep__incl.map b/docs/_allocator_8hpp__dep__incl.map index c25fba84..0e388ca4 100644 --- a/docs/_allocator_8hpp__dep__incl.map +++ b/docs/_allocator_8hpp__dep__incl.map @@ -1,48 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_allocator_8hpp__dep__incl.png b/docs/_allocator_8hpp__dep__incl.png index 57d7cd12..6630fb28 100644 Binary files a/docs/_allocator_8hpp__dep__incl.png and b/docs/_allocator_8hpp__dep__incl.png differ diff --git a/docs/_allocator_8hpp_source.html b/docs/_allocator_8hpp_source.html index e8668b7a..33f3cf8c 100644 --- a/docs/_allocator_8hpp_source.html +++ b/docs/_allocator_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_animation_8cpp.html b/docs/_animation_8cpp.html index f345f646..32a717e3 100644 --- a/docs/_animation_8cpp.html +++ b/docs/_animation_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_animation_8cpp__incl.map b/docs/_animation_8cpp__incl.map index 87678b5b..6167e0c3 100644 --- a/docs/_animation_8cpp__incl.map +++ b/docs/_animation_8cpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_animation_8cpp__incl.png b/docs/_animation_8cpp__incl.png index 30ec1699..33987afe 100644 Binary files a/docs/_animation_8cpp__incl.png and b/docs/_animation_8cpp__incl.png differ diff --git a/docs/_animation_8cpp_source.html b/docs/_animation_8cpp_source.html index d9be797d..6d4efae4 100644 --- a/docs/_animation_8cpp_source.html +++ b/docs/_animation_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -112,7 +112,7 @@ Go to the documentation of this file.
1 #include "Zenderer/Objects/Animation.hpp"
2 
3 using namespace zen;
-
4 using obj::zAnimation;
+
4 using obj::zAnimation;
5 
6 zAnimation::zAnimation(asset::zAssetManager& Assets) :
7  zEntity(Assets), m_texc(0.0),
@@ -127,7 +127,7 @@
16 {
17 }
18 
-
19 bool zAnimation::LoadFromTexture(const string_t& filename)
+
19 bool zAnimation::LoadFromTexture(const string_t& filename)
20 {
21  gfx::zMaterial TmpMaterial(m_Assets);
22  bool ret = TmpMaterial.LoadEffect(gfx::EffectType::SPRITESHEET) &&
@@ -137,7 +137,7 @@
26  {
27  gfx::zQuad* pQ = new gfx::zQuad(m_Assets, m_Size.x, m_Size.y);
28  pQ->AttachMaterial(TmpMaterial);
-
29  pQ->Create();
+
29  pQ->Create();
30  mp_allPrims.push_back(pQ);
31 
32  // Normalize texture coordinates.
@@ -158,7 +158,7 @@
47  return ret;
48 }
49 
-
50 bool zAnimation::Update()
+
50 bool zAnimation::Update()
51 {
52  // If we aren't enabled, or we aren't ready to animate, return.
53  if(m_stop || ++m_now < m_rate) return false;
@@ -177,7 +177,7 @@
66  if(m_maxloops > 0 && m_loops >= m_maxloops)
67  {
68  m_maxloops = 0;
-
69  this->StopAnimation(0);
+
69  this->StopAnimation(0);
70  m_callback();
71  return false;
72  }
@@ -188,53 +188,59 @@
77  return true;
78 }
79 
-
80 void zAnimation::SetKeyframeCount(const uint16_t frames)
+
80 void zAnimation::SetKeyframeCount(const uint16_t frames)
81 {
82  m_framecount = frames;
83 }
84 
-
85 void zAnimation::SetKeyframeSize(const math::vectoru16_t& Size)
+
85 void zAnimation::SetKeyframeSize(const math::vectoru16_t& Size)
86 {
-
87  m_Size = Size;
+
87  this->SetKeyframeSize(Size.x, Size.y);
88 }
89 
-
90 void zAnimation::SetKeyframeRate(const uint16_t rate)
+
90 void zAnimation::SetKeyframeSize(const uint16_t w, const uint16_t h)
91 {
-
92  m_rate = rate;
-
93 }
-
94 
-
95 void zAnimation::PlayAnimation(const uint32_t loops /*= 0*/)
-
96 {
-
97  this->SwitchFrame(0);
-
98  m_maxloops = loops;
-
99  m_loops = 0;
-
100  m_stop = false;
-
101 }
-
102 
-
103 void zAnimation::StopAnimation(const int16_t frame /*= -1*/)
-
104 {
-
105  this->SwitchFrame(frame < 0 ? m_current : frame);
-
106  m_stop = true;
+
92  m_Size.x = w;
+
93  m_Size.y = h;
+
94 }
+
95 
+
96 void zAnimation::SetKeyframeRate(const uint16_t rate)
+
97 {
+
98  m_rate = rate;
+
99 }
+
100 
+
101 void zAnimation::PlayAnimation(const uint32_t loops /*= 0*/)
+
102 {
+
103  this->SwitchFrame(0);
+
104  m_maxloops = loops;
+
105  m_loops = 0;
+
106  m_stop = false;
107 }
108 
-
109 void zAnimation::OnFinish(std::function<void()>&& callback)
+
109 void zAnimation::StopAnimation(const int16_t frame /*= -1*/)
110 {
-
111  m_callback = callback;
-
112 }
-
113 
-
114 void zAnimation::SwitchFrame(const uint16_t frame)
-
115 {
-
116  m_current = frame;
-
117  real_t start[2] = { m_current * m_texc, 0.0 };
-
118 
-
119  gfx::zEffect& e = const_cast<gfx::zMaterial&>(
-
120  mp_allPrims.front()->GetMaterial()
-
121  ).GetEffect();
-
122 
-
123  e.Enable();
-
124  e.SetParameter("tc_start", start, 2);
-
125  e.Disable();
-
126 }
+
111  this->SwitchFrame(frame < 0 ? m_current : frame);
+
112  m_stop = true;
+
113 }
+
114 
+
115 void zAnimation::OnFinish(std::function<void()>&& callback)
+
116 {
+
117  m_callback = callback;
+
118 }
+
119 
+
120 void zAnimation::SwitchFrame(const uint16_t frame)
+
121 {
+
122  m_current = frame;
+
123  real_t start[2] = { m_current * m_texc, 0.0 };
+
124 
+
125  gfx::zEffect& e = const_cast<gfx::zMaterial&>(
+
126  mp_allPrims.front()->GetMaterial()
+
127  ).GetEffect();
+
128 
+
129  e.Enable();
+
130  e.SetParameter("tc_start", start, 2);
+
131  e.Disable();
+
132 }
diff --git a/docs/_animation_8hpp.html b/docs/_animation_8hpp.html index 332fae34..6124b48c 100644 --- a/docs/_animation_8hpp.html +++ b/docs/_animation_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,14 +123,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

@@ -138,6 +138,7 @@

Data Structures

class  zen::obj::zAnimation + An animated in-game object. More...
  @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -110,69 +110,73 @@
Go to the documentation of this file.
1 
-
22 #ifndef ZENDERER__OBJECTS__ANIMATION_HPP
-
23 #define ZENDERER__OBJECTS__ANIMATION_HPP
-
24 
-
25 #include <functional>
-
26 
+
23 #ifndef ZENDERER__OBJECTS__ANIMATION_HPP
+
24 #define ZENDERER__OBJECTS__ANIMATION_HPP
+
25 
+
26 #include <functional>
27 #include "Entity.hpp"
28 
29 namespace zen
30 {
31 namespace obj
32 {
-
33  class ZEN_API zAnimation : public zEntity
-
34  {
-
35  public:
-
36  zAnimation(asset::zAssetManager& Assets);
-
37  ~zAnimation();
-
38 
-
39  bool LoadFromTexture(const string_t& filename);
-
40  bool LoadFromFile(const string_t& filename) { ZEN_ASSERTM(false, "no."); return false; }
-
41  bool AddPrimitive(const gfx::zPolygon& Prim) { ZEN_ASSERTM(false, "no."); return false; }
-
42 
-
43  bool Update();
-
44 
-
45  void SetKeyframeCount(const uint16_t frames);
-
46  void SetKeyframeSize(const math::vectoru16_t& Size);
-
47  void SetKeyframeSize(const uint16_t w, const uint16_t h);
-
48  void SetKeyframeRate(const uint16_t rate);
-
49 
-
50  void PlayAnimation(const uint32_t loops = 0);
-
51  void StopAnimation(const int16_t frame = -1);
-
52 
-
53  void OnFinish(std::function<void()>&& callback);
-
54 
-
55  private:
-
56  void SwitchFrame(const uint16_t frame);
-
57 
-
58  // When animating is done, this is called.
-
59  std::function<void()> m_callback;
-
60 
-
61  // A single frame's dimensions.
-
62  math::vectoru16_t m_Size;
-
63 
-
64  // Texture coordinate scalar (normalize(frames * size))
-
65  real_t m_texc;
-
66 
-
67  // Total number of frames for this animation,
-
68  // and the frame we're currently on.
-
69  uint16_t m_framecount, m_current;
+
34  class ZEN_API zAnimation : public zEntity
+
35  {
+
36  public:
+
37  zAnimation(asset::zAssetManager& Assets);
+
38  ~zAnimation();
+
39 
+
56  bool LoadFromTexture(const string_t& filename);
+
57  bool LoadFromFile(const string_t& filename) { ZEN_ASSERTM(false, "no."); return false; }
+
58  bool AddPrimitive(const gfx::zPolygon& Prim) { ZEN_ASSERTM(false, "no."); return false; }
+
59 
+
69  void PlayAnimation(const uint32_t loops = 0);
70 
-
71  // The current tick, and the number of ticks before switching frames.
-
72  uint16_t m_now, m_rate;
-
73 
-
74  // The number of loops we can execute, and the number we've done.
-
75  uint16_t m_maxloops, m_loops;
-
76 
-
77  // Is animation enabled?
-
78  bool m_stop;
-
79  };
-
80 } // namespace obj
-
81 } // namespace zen
+
81  void StopAnimation(const int16_t frame = -1);
82 
-
83 #endif // ZENDERER__OBJECTS__ANIMATION_HPP
-
84 
+
98  bool Update();
+
99 
+
111  void OnFinish(std::function<void()>&& callback);
+
112 
+
114  void SetKeyframeCount(const uint16_t frames);
+
115 
+
117  void SetKeyframeSize(const uint16_t w, const uint16_t h);
+
118  void SetKeyframeSize(const math::vectoru16_t& Size);
+
119 
+
121  void SetKeyframeRate(const uint16_t rate);
+
122 
+
124  inline bool Playing() const { return !m_stop; }
+
125 
+
126  private:
+
127  void SwitchFrame(const uint16_t frame);
+
128 
+
129  // When animating is done, this is called.
+
130  std::function<void()> m_callback;
+
131 
+
132  // A single frame's dimensions.
+
133  math::vectoru16_t m_Size;
+
134 
+
135  // Texture coordinate scalar (normalize(frames * size))
+
136  real_t m_texc;
+
137 
+
138  // Total number of frames for this animation,
+
139  // and the frame we're currently on.
+
140  uint16_t m_framecount, m_current;
+
141 
+
142  // The current tick, and the number of ticks before switching frames.
+
143  uint16_t m_now, m_rate;
+
144 
+
145  // The number of loops we can execute, and the number we've done.
+
146  uint16_t m_maxloops, m_loops;
+
147 
+
148  // Is animation enabled?
+
149  bool m_stop;
+
150  };
+
151 } // namespace obj
+
152 } // namespace zen
+
153 
+
154 #endif // ZENDERER__OBJECTS__ANIMATION_HPP
+
155 
diff --git a/docs/_assert_8cpp.html b/docs/_assert_8cpp.html index 96ac15e0..4ae63502 100644 --- a/docs/_assert_8cpp.html +++ b/docs/_assert_8cpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_assert_8cpp_source.html b/docs/_assert_8cpp_source.html index 1e0913a4..ebe06193 100644 --- a/docs/_assert_8cpp_source.html +++ b/docs/_assert_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_assert_8hpp.html b/docs/_assert_8hpp.html index fb0da565..40ab674d 100644 --- a/docs/_assert_8hpp.html +++ b/docs/_assert_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -134,7 +134,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_assert_8hpp__dep__incl.map b/docs/_assert_8hpp__dep__incl.map index 40e325aa..7549fe9f 100644 --- a/docs/_assert_8hpp__dep__incl.map +++ b/docs/_assert_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_assert_8hpp__dep__incl.png b/docs/_assert_8hpp__dep__incl.png index ce7c9480..1874eec3 100644 Binary files a/docs/_assert_8hpp__dep__incl.png and b/docs/_assert_8hpp__dep__incl.png differ diff --git a/docs/_assert_8hpp_source.html b/docs/_assert_8hpp_source.html index b2fec53a..0f417660 100644 --- a/docs/_assert_8hpp_source.html +++ b/docs/_assert_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_asset_8cpp.html b/docs/_asset_8cpp.html index 2834eb8c..6a522bd6 100644 --- a/docs/_asset_8cpp.html +++ b/docs/_asset_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_asset_8cpp_source.html b/docs/_asset_8cpp_source.html index 17fde3a4..2729ab82 100644 --- a/docs/_asset_8cpp_source.html +++ b/docs/_asset_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -122,22 +122,23 @@
11 
12 zAsset::zAsset(const void* const owner) :
13  m_Log(zLog::GetEngineLog()),
-
14  mp_owner(owner), m_filename_hash(0), m_loaded(false),
-
15  m_refcount(0), m_id(util::hash(this, sizeof(zAsset), zAsset::s_seed))
-
16 {}
-
17 
-
18 zAsset::~zAsset() {}
-
19 
-
20 bool zAsset::LoadFromExisting(const zAsset* const pCopy)
-
21 {
-
22  m_error_str = pCopy->m_error_str;
-
23  m_filename = pCopy->m_filename;
-
24  m_filename_hash = pCopy->m_filename_hash;
-
25  mp_owner = pCopy->mp_owner;
-
26  m_loaded = pCopy->m_loaded;
-
27 
-
28  return true;
-
29 }
+
14  m_filename_hash(0), m_loaded(false), m_refcount(0),
+
15  m_id(util::hash(this, sizeof(zAsset), zAsset::s_seed)),
+
16  mp_owner(owner)
+
17 {}
+
18 
+
19 zAsset::~zAsset() {}
+
20 
+
21 bool zAsset::LoadFromExisting(const zAsset* const pCopy)
+
22 {
+
23  m_error_str = pCopy->m_error_str;
+
24  m_filename = pCopy->m_filename;
+
25  m_filename_hash = pCopy->m_filename_hash;
+
26  mp_owner = pCopy->mp_owner;
+
27  m_loaded = pCopy->m_loaded;
+
28 
+
29  return true;
+
30 }
diff --git a/docs/_asset_8hpp.html b/docs/_asset_8hpp.html index 5657899b..e6b2980c 100644 --- a/docs/_asset_8hpp.html +++ b/docs/_asset_8hpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -134,7 +134,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_asset_8hpp__dep__incl.map b/docs/_asset_8hpp__dep__incl.map index 69b37716..1c788ccb 100644 --- a/docs/_asset_8hpp__dep__incl.map +++ b/docs/_asset_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_asset_8hpp__dep__incl.png b/docs/_asset_8hpp__dep__incl.png index ea424ac2..9bf884a0 100644 Binary files a/docs/_asset_8hpp__dep__incl.png and b/docs/_asset_8hpp__dep__incl.png differ diff --git a/docs/_asset_8hpp_source.html b/docs/_asset_8hpp_source.html index c804a8d3..09cfb985 100644 --- a/docs/_asset_8hpp_source.html +++ b/docs/_asset_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_asset_8inl.html b/docs/_asset_8inl.html index 952679ab..5c6915ad 100644 --- a/docs/_asset_8inl.html +++ b/docs/_asset_8inl.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_asset_8inl__dep__incl.map b/docs/_asset_8inl__dep__incl.map index 8742ecff..fdea2286 100644 --- a/docs/_asset_8inl__dep__incl.map +++ b/docs/_asset_8inl__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_asset_8inl__dep__incl.png b/docs/_asset_8inl__dep__incl.png index 54dbdcf5..18b057c7 100644 Binary files a/docs/_asset_8inl__dep__incl.png and b/docs/_asset_8inl__dep__incl.png differ diff --git a/docs/_asset_8inl_source.html b/docs/_asset_8inl_source.html index 7ee94249..5321fc7d 100644 --- a/docs/_asset_8inl_source.html +++ b/docs/_asset_8inl_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_asset_manager_8cpp.html b/docs/_asset_manager_8cpp.html index d492dc14..7be1b9b0 100644 --- a/docs/_asset_manager_8cpp.html +++ b/docs/_asset_manager_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_asset_manager_8cpp_source.html b/docs/_asset_manager_8cpp_source.html index 46cd42c4..f055143e 100644 --- a/docs/_asset_manager_8cpp_source.html +++ b/docs/_asset_manager_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -120,8 +120,8 @@
9 std::list<zAsset*> zAssetManager::sp_allAssets;
10 
11 zAssetManager::zAssetManager() :
-
12  m_Log(zLog::GetEngineLog()),
-
13  zSubsystem("AssetMgr")
+
12  zSubsystem("AssetMgr"),
+
13  m_Log(zLog::GetEngineLog())
14 {
15  mp_managerAssets.clear();
16 }
diff --git a/docs/_asset_manager_8hpp.html b/docs/_asset_manager_8hpp.html index e40cd764..a16b44f0 100644 --- a/docs/_asset_manager_8hpp.html +++ b/docs/_asset_manager_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,7 +132,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_asset_manager_8hpp__dep__incl.map b/docs/_asset_manager_8hpp__dep__incl.map index e8e85c19..2be71d4d 100644 --- a/docs/_asset_manager_8hpp__dep__incl.map +++ b/docs/_asset_manager_8hpp__dep__incl.map @@ -1,46 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_asset_manager_8hpp__dep__incl.png b/docs/_asset_manager_8hpp__dep__incl.png index cf2d6f04..1189862e 100644 Binary files a/docs/_asset_manager_8hpp__dep__incl.png and b/docs/_asset_manager_8hpp__dep__incl.png differ diff --git a/docs/_asset_manager_8hpp_source.html b/docs/_asset_manager_8hpp_source.html index b9db8f9b..e3ac4e27 100644 --- a/docs/_asset_manager_8hpp_source.html +++ b/docs/_asset_manager_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_asset_manager_8inl.html b/docs/_asset_manager_8inl.html index 74cdf581..2aba8c79 100644 --- a/docs/_asset_manager_8inl.html +++ b/docs/_asset_manager_8inl.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_asset_manager_8inl__dep__incl.map b/docs/_asset_manager_8inl__dep__incl.map index 949805e2..9231dd9f 100644 --- a/docs/_asset_manager_8inl__dep__incl.map +++ b/docs/_asset_manager_8inl__dep__incl.map @@ -1,47 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_asset_manager_8inl__dep__incl.png b/docs/_asset_manager_8inl__dep__incl.png index 887315f8..6241afe7 100644 Binary files a/docs/_asset_manager_8inl__dep__incl.png and b/docs/_asset_manager_8inl__dep__incl.png differ diff --git a/docs/_asset_manager_8inl_source.html b/docs/_asset_manager_8inl_source.html index 2c1fec4c..d8df9a68 100644 --- a/docs/_asset_manager_8inl_source.html +++ b/docs/_asset_manager_8inl_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -175,7 +175,7 @@
64 {
65  m_Log << m_Log.SetMode(util::LogMode::ZEN_INFO)
66  << m_Log.SetSystem("AssetMgr") << "Copying '"
-
67  << filename << "' ... ";
+
67  << Copier->GetFilename() << "' ... ";
68 
69  // Create a new asset.
70  T* pAsset = new T(owner);
diff --git a/docs/_audio2_d_8cpp.html b/docs/_audio2_d_8cpp.html index de1bdcb5..cea8536a 100644 --- a/docs/_audio2_d_8cpp.html +++ b/docs/_audio2_d_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_audio2_d_8cpp_source.html b/docs/_audio2_d_8cpp_source.html index 64243b7d..7e816408 100644 --- a/docs/_audio2_d_8cpp_source.html +++ b/docs/_audio2_d_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_audio2_d_8hpp.html b/docs/_audio2_d_8hpp.html index 822c7c33..2dc35fa6 100644 --- a/docs/_audio2_d_8hpp.html +++ b/docs/_audio2_d_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,7 +132,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_audio2_d_8hpp__dep__incl.map b/docs/_audio2_d_8hpp__dep__incl.map index f059f512..74b13eda 100644 --- a/docs/_audio2_d_8hpp__dep__incl.map +++ b/docs/_audio2_d_8hpp__dep__incl.map @@ -1,12 +1,13 @@ - - - - - + + + + + - - - + + + + diff --git a/docs/_audio2_d_8hpp__dep__incl.png b/docs/_audio2_d_8hpp__dep__incl.png index 7415a911..32c06428 100644 Binary files a/docs/_audio2_d_8hpp__dep__incl.png and b/docs/_audio2_d_8hpp__dep__incl.png differ diff --git a/docs/_audio2_d_8hpp_source.html b/docs/_audio2_d_8hpp_source.html index 96ef93de..9a022e88 100644 --- a/docs/_audio2_d_8hpp_source.html +++ b/docs/_audio2_d_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_audio_manager_8cpp.html b/docs/_audio_manager_8cpp.html index 68f16d29..94a89f09 100644 --- a/docs/_audio_manager_8cpp.html +++ b/docs/_audio_manager_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_audio_manager_8cpp_source.html b/docs/_audio_manager_8cpp_source.html index b24f375c..9119ec98 100644 --- a/docs/_audio_manager_8cpp_source.html +++ b/docs/_audio_manager_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_audio_manager_8hpp.html b/docs/_audio_manager_8hpp.html index 9967985d..d25903fc 100644 --- a/docs/_audio_manager_8hpp.html +++ b/docs/_audio_manager_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -135,7 +135,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_audio_manager_8hpp__dep__incl.map b/docs/_audio_manager_8hpp__dep__incl.map index 29bea1ac..f186dd4a 100644 --- a/docs/_audio_manager_8hpp__dep__incl.map +++ b/docs/_audio_manager_8hpp__dep__incl.map @@ -1,14 +1,15 @@ - + - - - - - - - - + + + + + + + + + diff --git a/docs/_audio_manager_8hpp__dep__incl.png b/docs/_audio_manager_8hpp__dep__incl.png index b1c08523..f7c69a1e 100644 Binary files a/docs/_audio_manager_8hpp__dep__incl.png and b/docs/_audio_manager_8hpp__dep__incl.png differ diff --git a/docs/_audio_manager_8hpp_source.html b/docs/_audio_manager_8hpp_source.html index f3efcccb..1e343a4a 100644 --- a/docs/_audio_manager_8hpp_source.html +++ b/docs/_audio_manager_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_button_8cpp.html b/docs/_button_8cpp.html index 0ad7a283..00b82c33 100644 --- a/docs/_button_8cpp.html +++ b/docs/_button_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_button_8cpp__incl.map b/docs/_button_8cpp__incl.map index 8026fbca..91e993f8 100644 --- a/docs/_button_8cpp__incl.map +++ b/docs/_button_8cpp__incl.map @@ -1,43 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_button_8cpp__incl.png b/docs/_button_8cpp__incl.png index 3823b32f..250787f6 100644 Binary files a/docs/_button_8cpp__incl.png and b/docs/_button_8cpp__incl.png differ diff --git a/docs/_button_8cpp_source.html b/docs/_button_8cpp_source.html index 62c7ca08..5ed8196c 100644 --- a/docs/_button_8cpp_source.html +++ b/docs/_button_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
3 using namespace zen;
4 using gui::zButton;
5 
-
6 zButton::zButton(gfx::zScene& MenuScene) :
+
6 zButton::zButton(gfx::zScene& MenuScene) :
7  m_Scene(MenuScene), m_Active(m_Scene.AddEntity()),
8  m_Normal(m_Scene.AddEntity()), mp_Current(&m_Normal),
9  mp_Font(nullptr)
@@ -141,7 +141,7 @@
30 
31 bool zButton::Prepare(const string_t& text)
32 {
-
33  if(mp_Font == nullptr && mp_Current == nullptr || text.empty()) return false;
+
33  if(mp_Font == nullptr || mp_Current == nullptr || text.empty()) return false;
34 
35  mp_Font->SetColor(m_ncolor);
36  bool ret = mp_Font->Render(m_Normal, text);
@@ -157,7 +157,7 @@
46 
47 bool zButton::IsOver(const math::rect_t& Box)
48 {
-
49  return (mp_Current && mp_Font && mp_Current->Collides(Box));
+
49  return (mp_Current && mp_Font && mp_Current->Collides(Box));
50 }
51 
52 void zButton::SetActive()
diff --git a/docs/_button_8hpp.html b/docs/_button_8hpp.html index d82fa3d8..e9c12cb4 100644 --- a/docs/_button_8hpp.html +++ b/docs/_button_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,14 +123,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_button_8hpp__dep__incl.map b/docs/_button_8hpp__dep__incl.map index 9eb0b525..16238323 100644 --- a/docs/_button_8hpp__dep__incl.map +++ b/docs/_button_8hpp__dep__incl.map @@ -1,10 +1,11 @@ - - - - + + + + - - + + + diff --git a/docs/_button_8hpp__dep__incl.png b/docs/_button_8hpp__dep__incl.png index ddac51b3..ca2bbfaf 100644 Binary files a/docs/_button_8hpp__dep__incl.png and b/docs/_button_8hpp__dep__incl.png differ diff --git a/docs/_button_8hpp__incl.map b/docs/_button_8hpp__incl.map index 88e3f710..9df6d558 100644 --- a/docs/_button_8hpp__incl.map +++ b/docs/_button_8hpp__incl.map @@ -1,42 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_button_8hpp__incl.png b/docs/_button_8hpp__incl.png index 82454472..187da5ee 100644 Binary files a/docs/_button_8hpp__incl.png and b/docs/_button_8hpp__incl.png differ diff --git a/docs/_button_8hpp_source.html b/docs/_button_8hpp_source.html index dad6c2fb..da700dec 100644 --- a/docs/_button_8hpp_source.html +++ b/docs/_button_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,7 +123,7 @@
33  class ZEN_API zButton
34  {
35  public:
-
36  zButton(gfx::zScene& MenuScene);
+
36  zButton(gfx::zScene& MenuScene);
37 
38  ~zButton();
39 
@@ -144,7 +144,7 @@
54  void SetBackground(const obj::zEntity& Bg);
55 
56  private:
-
57  gfx::zScene& m_Scene;
+
57  gfx::zScene& m_Scene;
58  obj::zEntity& m_Active;
59  obj::zEntity& m_Normal;
60  obj::zEntity* mp_Current;
diff --git a/docs/_collision_test_8cpp.html b/docs/_collision_test_8cpp.html index 45943d60..a8e39828 100644 --- a/docs/_collision_test_8cpp.html +++ b/docs/_collision_test_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -117,23 +117,23 @@
- +

Go to the source code of this file.

diff --git a/docs/_animation_8hpp__dep__incl.map b/docs/_animation_8hpp__dep__incl.map index daaa4c03..dcdff742 100644 --- a/docs/_animation_8hpp__dep__incl.map +++ b/docs/_animation_8hpp__dep__incl.map @@ -1,15 +1,16 @@ - + - - - - - - - - + + + + + + + + + diff --git a/docs/_animation_8hpp__dep__incl.png b/docs/_animation_8hpp__dep__incl.png index adfcbf3f..58ad12b8 100644 Binary files a/docs/_animation_8hpp__dep__incl.png and b/docs/_animation_8hpp__dep__incl.png differ diff --git a/docs/_animation_8hpp__incl.map b/docs/_animation_8hpp__incl.map index a6a4ee20..ea6df430 100644 --- a/docs/_animation_8hpp__incl.map +++ b/docs/_animation_8hpp__incl.map @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_animation_8hpp__incl.png b/docs/_animation_8hpp__incl.png index a1d39571..ef919591 100644 Binary files a/docs/_animation_8hpp__incl.png and b/docs/_animation_8hpp__incl.png differ diff --git a/docs/_animation_8hpp_source.html b/docs/_animation_8hpp_source.html index 54ab3546..83686191 100644 --- a/docs/_animation_8hpp_source.html +++ b/docs/_animation_8hpp_source.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
- - + +

Functions

int main1 ()
 
int main2 ()
 

Function Documentation

- +
- + diff --git a/docs/_collision_test_8cpp.js b/docs/_collision_test_8cpp.js index f516569d..7a36f59a 100644 --- a/docs/_collision_test_8cpp.js +++ b/docs/_collision_test_8cpp.js @@ -1,4 +1,4 @@ var _collision_test_8cpp = [ - [ "main1", "_collision_test_8cpp.html#a8006ac13983b83591702d97d584fc0eb", null ] + [ "main2", "_collision_test_8cpp.html#a0e663f52efbc8593793d628b4259ce9b", null ] ]; \ No newline at end of file diff --git a/docs/_collision_test_8cpp__incl.map b/docs/_collision_test_8cpp__incl.map index deb14e0f..8c772acf 100644 --- a/docs/_collision_test_8cpp__incl.map +++ b/docs/_collision_test_8cpp__incl.map @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_collision_test_8cpp__incl.png b/docs/_collision_test_8cpp__incl.png index e25282a8..9c0d52ac 100644 Binary files a/docs/_collision_test_8cpp__incl.png and b/docs/_collision_test_8cpp__incl.png differ diff --git a/docs/_collision_test_8cpp_source.html b/docs/_collision_test_8cpp_source.html index 6bae026f..14f12764 100644 --- a/docs/_collision_test_8cpp_source.html +++ b/docs/_collision_test_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -113,7 +113,7 @@
2 
3 using namespace zen;
4 
-
5 int main1()
+
5 int main2()
6 {
7  Init();
8 
@@ -126,16 +126,16 @@
15  P1.AddVertex(math::vector_t(100, 0));
16  P1.AddVertex(math::vector_t(0, 100));
17  P1.SetColor(color4f_t(1.0, 0, 0));
-
18  P1.Create();
+
18  P1.Create();
19 
20  gfx::zPolygon P2(P1);
21  P2.SetColor(color4f_t(0, 1, 0));
-
22  P2.Create();
+
22  P2.Create();
23  P2.Move(100, 100);
24 
25  gfx::zQuad Q1(Mgr, 128, 128);
26  Q1.SetColor(color4f_t(0, 0, 1));
-
27  Q1.Create();
+
27  Q1.Create();
28 
29  evt::event_t E;
30  while(Win.IsOpen())
@@ -149,7 +149,7 @@
38  }
39  }
40 
-
41  std::cout << P1.Collides(Q1) << std::endl;
+
41  std::cout << P1.Collides(Q1) << std::endl;
42 
43  Win.Clear();
44  P2.Draw();
diff --git a/docs/_concave_polygon_8cpp.html b/docs/_concave_polygon_8cpp.html index 954a5756..964dfb1a 100644 --- a/docs/_concave_polygon_8cpp.html +++ b/docs/_concave_polygon_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -111,13 +111,13 @@
ConcavePolygon.cpp File Reference
-
#include "Zenderer/Graphics/Polygon.hpp"
+
#include "Zenderer/Graphics/ConcavePolygon.hpp"
Include dependency graph for ConcavePolygon.cpp:
- +

Go to the source code of this file.

@@ -176,7 +176,7 @@

Function Documentation

- +

diff --git a/docs/_concave_polygon_8cpp__incl.map b/docs/_concave_polygon_8cpp__incl.map index f27281c8..ce16d1c0 100644 --- a/docs/_concave_polygon_8cpp__incl.map +++ b/docs/_concave_polygon_8cpp__incl.map @@ -1,35 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_concave_polygon_8cpp__incl.png b/docs/_concave_polygon_8cpp__incl.png index 6b3a01da..f4d07dd9 100644 Binary files a/docs/_concave_polygon_8cpp__incl.png and b/docs/_concave_polygon_8cpp__incl.png differ diff --git a/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.map b/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.map index 605f44a7..6cb28a70 100644 --- a/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.map +++ b/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.map @@ -1,3 +1,5 @@ - + + + diff --git a/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.png b/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.png index ad13aa4d..c0dfe23c 100644 Binary files a/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.png and b/docs/_concave_polygon_8cpp_a2b9c107327c3a130314fb8c9ffa175f8_icgraph.png differ diff --git a/docs/_concave_polygon_8cpp_source.html b/docs/_concave_polygon_8cpp_source.html index aff718c8..2acfc735 100644 --- a/docs/_concave_polygon_8cpp_source.html +++ b/docs/_concave_polygon_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,7 +109,7 @@
ConcavePolygon.cpp
-Go to the documentation of this file.
1 #include "Zenderer/Graphics/Polygon.hpp"
+Go to the documentation of this file.
1 #include "Zenderer/Graphics/ConcavePolygon.hpp"
2 
3 using namespace zen;
4 using gfx::zConcavePolygon;
@@ -122,7 +122,7 @@
11  {
12  if(*i == elem) return index;
13  }
-
14 
+
14 
15  return static_cast<size_t>(-1);
16 }
17 
@@ -132,50 +132,54 @@
21 
22 zConcavePolygon::~zConcavePolygon() {}
23 
-
24 zPolygon& zConcavePolygon::Create()
+
24 gfx::zPolygon& zConcavePolygon::Create()
25 {
26  if(m_Verts.size() <= 2) return (*this);
-
27 
-
28  std::vector<math::vector_t> tris = math::triangulate(m_Verts);
+
27 
+
28  m_Tris = math::triangulate(m_Verts);
29  std::vector<math::vector_t> verts;
30 
31  // We minimize the vertices we offload by only storing those
32  // that are unique. This process is O(n^2) but who cares?
33  uint16_t index = 0;
-
34  uint16_t count = (m_Verts.size() - 2) * 3;
-
35 
-
36  if(m_DrawData.Indices != nullptr || m_DrawData.icount > 0)
+
34  uint16_t count = m_Tris.size();
+
35 
+
36  if(m_DrawData.Indices != nullptr || m_DrawData.icount > 0)
37  delete[] m_DrawData.Indices;
38 
39  gfxcore::index_t* indices = new gfxcore::index_t[count];
40 
-
41  for(auto& i : tris)
+
41  for(auto& i : m_Tris)
42  {
43  int idx = find_index_of(verts.begin(), verts.end(), i);
-
44  if(idx > 0) indices[index++] = idx;
-
45  else
-
46  {
-
47  verts.push_back(i);
-
48  indices[index] = index++;
-
49  }
-
50  }
-
51 
-
52  m_DrawData.Indices = indices;
-
53  m_DrawData.icount = tris;
+
44  if(idx >= 0)
+
45  {
+
46  indices[index++] = idx;
+
47  }
+
48  else
+
49  {
+
50  verts.push_back(i);
+
51  indices[index++] = verts.size() - 1;
+
52  }
+
53  }
54 
-
55  m_DrawData.Vertices = new gfxcore::vertex_t[m_Verts.size()];
-
56  m_DrawData.vcount = verts.size();
+
55  m_BoundingBox.h = this->CalcH();
+
56  m_BoundingBox.w = this->CalcW();
57 
-
58  for(size_t i = 0; i < m_Verts.size(); ++i)
-
59  {
-
60  m_DrawData.Vertices[i].position = std::move(verts[i]);
-
61  m_DrawData.Vertices[i].color = m_Color;
-
62  }
-
63 
-
64  m_Tris = std::move(tris);
-
65  m_Verts.clear();
-
66  return (*this);
-
67 }
+
58  m_DrawData.Indices = indices;
+
59  m_DrawData.icount = m_Tris.size();
+
60  m_DrawData.Vertices = new gfxcore::vertex_t[verts.size()];
+
61  m_DrawData.vcount = verts.size();
+
62 
+
63  for(size_t i = 0; i < verts.size(); ++i)
+
64  {
+
65  m_DrawData.Vertices[i].position = std::move(verts[i]);
+
66  m_DrawData.Vertices[i].color = m_Color;
+
67  }
+
68 
+
69  m_Verts.clear();
+
70  return (*this);
+
71 }
diff --git a/docs/_concave_polygon_8hpp.html b/docs/_concave_polygon_8hpp.html index 08ec1185..2b126ac8 100644 --- a/docs/_concave_polygon_8hpp.html +++ b/docs/_concave_polygon_8hpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -122,7 +122,14 @@
- + +
+
+This graph shows which files directly or indirectly include this file:
+
+
+ +

Go to the source code of this file.

diff --git a/docs/_concave_polygon_8hpp__dep__incl.map b/docs/_concave_polygon_8hpp__dep__incl.map new file mode 100644 index 00000000..c1784397 --- /dev/null +++ b/docs/_concave_polygon_8hpp__dep__incl.map @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/docs/_concave_polygon_8hpp__dep__incl.png b/docs/_concave_polygon_8hpp__dep__incl.png new file mode 100644 index 00000000..86422343 Binary files /dev/null and b/docs/_concave_polygon_8hpp__dep__incl.png differ diff --git a/docs/_concave_polygon_8hpp__incl.map b/docs/_concave_polygon_8hpp__incl.map index 58eb9ef7..b0cba629 100644 --- a/docs/_concave_polygon_8hpp__incl.map +++ b/docs/_concave_polygon_8hpp__incl.map @@ -1,35 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_concave_polygon_8hpp__incl.png b/docs/_concave_polygon_8hpp__incl.png index 71462c5b..071582d3 100644 Binary files a/docs/_concave_polygon_8hpp__incl.png and b/docs/_concave_polygon_8hpp__incl.png differ diff --git a/docs/_concave_polygon_8hpp_source.html b/docs/_concave_polygon_8hpp_source.html index 242eac76..8991e235 100644 --- a/docs/_concave_polygon_8hpp_source.html +++ b/docs/_concave_polygon_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_d_l_l_main_8cpp.html b/docs/_d_l_l_main_8cpp.html index 4bfeab9a..96d50601 100644 --- a/docs/_d_l_l_main_8cpp.html +++ b/docs/_d_l_l_main_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_d_l_l_main_8cpp_source.html b/docs/_d_l_l_main_8cpp_source.html index 39536428..28c0bd76 100644 --- a/docs/_d_l_l_main_8cpp_source.html +++ b/docs/_d_l_l_main_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_drawable_8cpp.html b/docs/_drawable_8cpp.html deleted file mode 100644 index c2d5cde8..00000000 --- a/docs/_drawable_8cpp.html +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/src/CoreGraphics/Drawable.cpp File Reference - - - - - - - - - - - - - -
-
-
int main1 int main2 ( )
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
- - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
Drawable.cpp File Reference
-
-
-
#include "Zenderer/CoreGraphics/Drawable.hpp"
-
-Include dependency graph for Drawable.cpp:
-
-
- - -
-
-

Go to the source code of this file.

-
-
- - - - diff --git a/docs/_drawable_8cpp__incl.map b/docs/_drawable_8cpp__incl.map deleted file mode 100644 index 805393f0..00000000 --- a/docs/_drawable_8cpp__incl.map +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/_drawable_8cpp__incl.png b/docs/_drawable_8cpp__incl.png deleted file mode 100644 index 2e5f2ecf..00000000 Binary files a/docs/_drawable_8cpp__incl.png and /dev/null differ diff --git a/docs/_drawable_8cpp_source.html b/docs/_drawable_8cpp_source.html deleted file mode 100644 index 22fc5aaf..00000000 --- a/docs/_drawable_8cpp_source.html +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/src/CoreGraphics/Drawable.cpp Source File - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
Drawable.cpp
-
-
-Go to the documentation of this file.
1 #include "Zenderer/CoreGraphics/Drawable.hpp"
-
2 
-
3 using namespace zen;
-
4 using gfxcore::zDrawable;
-
5 
-
6 zDrawable::zDrawable(asset::zAssetManager& Assets) :
-
7  m_Assets(Assets), mp_VAO(nullptr), m_Material(Assets),
-
8  mp_MVMatrix(nullptr), m_offset(0), m_internal(false)
-
9 {
-
10  m_DrawData.Vertices = nullptr;
-
11  m_DrawData.Indices = nullptr;
-
12  m_DrawData.icount =
-
13  m_DrawData.vcount = 0;
-
14 
-
15  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
16  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
17 }
-
18 
-
19 zDrawable::zDrawable(const zDrawable& Copy) :
-
20  m_Assets(Copy.m_Assets),
-
21  mp_VAO(nullptr), m_Material(m_Assets),
-
22  mp_MVMatrix(nullptr), m_offset(0),
-
23  m_internal(false)
-
24 {
-
25  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
26  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
27 
-
28  m_DrawData.vcount = Copy.m_DrawData.vcount;
-
29  m_DrawData.icount = Copy.m_DrawData.icount;
-
30  m_DrawData.Vertices = new gfxcore::vertex_t[m_DrawData.vcount];
-
31  m_DrawData.Indices = new gfxcore::index_t[m_DrawData.icount];
-
32 
-
33  ZEN_ASSERT(m_DrawData.vcount > 0 && m_DrawData.icount > 0);
-
34 
-
35  for(size_t i = 0; i < m_DrawData.icount; ++i)
-
36  m_DrawData.Indices[i] = Copy.m_DrawData.Indices[i];
-
37 
-
38  for(size_t v = 0; v < m_DrawData.vcount; ++v)
-
39  m_DrawData.Vertices[v] = Copy.m_DrawData.Vertices[v];
-
40 
-
41  if(Copy.mp_MVMatrix != nullptr)
-
42  mp_MVMatrix = new math::matrix4x4_t(*Copy.mp_MVMatrix);
-
43 }
-
44 
-
45 zDrawable::zDrawable(zDrawable&& Copy) :
-
46  m_Assets(Copy.m_Assets),
-
47  mp_VAO(nullptr), m_Material(m_Assets),
-
48  mp_MVMatrix(Copy.mp_MVMatrix), m_offset(0),
-
49  m_internal(false)
-
50 {
-
51  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
52  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
53 
-
54  m_DrawData.vcount = Copy.m_DrawData.vcount;
-
55  m_DrawData.icount = Copy.m_DrawData.icount;
-
56  m_DrawData.Vertices = Copy.m_DrawData.Vertices;
-
57  m_DrawData.Indices = Copy.m_DrawData.Indices;
-
58 
-
59  Copy.m_DrawData.Vertices = nullptr;
-
60  Copy.m_DrawData.Indices = nullptr;
-
61 
-
62  ZEN_ASSERT(m_DrawData.vcount > 0 && m_DrawData.icount > 0);
-
63 }
-
64 
-
65 zDrawable::~zDrawable()
-
66 {
-
67  if(m_internal) delete mp_VAO;
-
68 }
-
69 
-
70 void zDrawable::Move(const math::vector_t& Position)
-
71 {
-
72  m_Position = Position;
-
73 }
-
74 
-
75 void zDrawable::Move(const real_t x, const real_t y, const real_t z /*= 0.0*/)
-
76 {
-
77  m_Position = math::vector_t(x, y, z);
-
78 }
-
79 
-
80 void zDrawable::AttachMaterial(gfx::zMaterial& Material)
-
81 {
-
82  m_Material.LoadEffect(Material.GetEffect().GetType());
-
83  m_Material.LoadTexture(Material.GetTexture());
-
84 }
-
85 
-
86 void zDrawable::RemoveMaterial()
-
87 {
-
88  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
89  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
90 }
-
91 
-
92 void zDrawable::SetColor(const color4f_t& Color)
-
93 {
-
94  for(size_t i = 0; i < m_DrawData.vcount; ++i)
-
95  {
-
96  m_DrawData.Vertices[i].color = Color;
-
97  }
-
98 }
-
99 
-
100 bool zDrawable::Draw(const bool is_bound /*= false*/)
-
101 {
-
102  if(mp_VAO == nullptr && !is_bound)
-
103  {
-
104  // Create a vertex array and load our data.
-
105  mp_VAO = new zVertexArray(GL_STATIC_DRAW);
-
106  mp_VAO->Init();
-
107  m_offset = mp_VAO->AddData(m_DrawData);
-
108  if(!mp_VAO->Offload()) return false;
-
109 
-
110  // Create our model-view matrix.
-
111  mp_MVMatrix = new math::matrix4x4_t(math::
-
112  matrix4x4_t::GetIdentityMatrix());
-
113 
-
114  // So we can differentiate between a VAO from a `zScene`
-
115  // and the one we made ourselves.
-
116  m_internal = true;
-
117  }
-
118 
-
119  // If something isn't previously bound, we bind the VAO
-
120  // and the material. If no material, use global default.
-
121  if(!is_bound)
-
122  {
-
123  if(!mp_VAO->Bind()) return false;
-
124 
-
125  // Insert our coordinates to transform in the shader.
-
126  // Ignore the Z coordinate because that's only used for depth
-
127  // sorting internally anyway and has no effect on visuals.
-
128  (*mp_MVMatrix)[0][3] = m_Position.x;
-
129  (*mp_MVMatrix)[1][3] = m_Position.y;
-
130  //(*mp_MVMatrix)[2][3] = m_Position.z;
-
131 
-
132  // Bind our material. If we haven't set one, the default will be used.
-
133  // We need a default texture because otherwise the color would
-
134  // always be black due to the way the shader works.
-
135  gfx::zEffect& Effect = m_Material.GetEffect();
-
136  m_Material.Enable();
-
137 
-
138  // All effects have these parameters in the vertex shader.
-
139  if(!Effect.SetParameter("mv", *mp_MVMatrix) ||
-
140  !Effect.SetParameter("proj", zRenderer::GetProjectionMatrix()))
-
141  {
-
142  zRenderer::ResetMaterialState();
-
143  return false;
-
144  }
-
145  }
-
146 
-
147  GL(glDrawElements(GL_TRIANGLES, m_DrawData.icount,
-
148  INDEX_TYPE, (void*)(sizeof(index_t) * m_offset)));
-
149 
-
150  return !is_bound ?
-
151  (zRenderer::ResetMaterialState() && mp_VAO->Unbind()) :
-
152  true;
-
153 }
-
154 
-
155 void zDrawable::LoadIntoVAO(gfxcore::zVertexArray& VAO, const bool keep)
-
156 {
-
157  if(m_DrawData.Vertices == nullptr ||
-
158  m_DrawData.Indices == nullptr) return;
-
159 
-
160  gfxcore::index_t i = VAO.AddData(m_DrawData);
-
161  if(!keep)
-
162  {
-
163  delete[] m_DrawData.Vertices;
-
164  delete[] m_DrawData.Indices;
-
165  m_DrawData.Vertices = nullptr;
-
166  m_DrawData.Indices = nullptr;
-
167  m_offset = i;
-
168  mp_VAO = &VAO;
-
169  }
-
170 }
-
171 
-
172 bool zDrawable::IsModifiable() const
-
173 {
-
174  return (mp_VAO == nullptr || !mp_VAO->Offloaded());
-
175 }
-
-
- - - - diff --git a/docs/_drawable_8hpp.html b/docs/_drawable_8hpp.html deleted file mode 100644 index 3f9cdfbd..00000000 --- a/docs/_drawable_8hpp.html +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/CoreGraphics/Drawable.hpp File Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Data Structures | -Namespaces | -Constant Groups | -Variables
-
-
Drawable.hpp File Reference
-
-
- -

Zenderer/CoreGraphics/Drawable.hpp - An abstract base class for drawing primitives. -More...

-
#include "Zenderer/Core/Types.hpp"
-#include "Zenderer/Math/Math.hpp"
-#include "VertexArray.hpp"
-#include "Renderer.hpp"
-#include "Zenderer/Graphics/Material.hpp"
-#include "OpenGL.hpp"
-
-Include dependency graph for Drawable.hpp:
-
-
- - -
-
-This graph shows which files directly or indirectly include this file:
-
-
- - -
-
-

Go to the source code of this file.

- - - - - -

-Data Structures

class  zen::gfxcore::zDrawable
 An abstract base class for all drawable primitives. More...
 
- - - - - - - - - - -

-Namespaces

 zen
 An all-encompassing namespace for any and all components of Zenderer.
 
 zen::obj
 A group of sprite-like objects that operate at a high level of abstraction.
 
 zen::gfxcore
 Low level graphics layer.
 
- - - - - - - - - - -

-Constant Groups

 zen
 An all-encompassing namespace for any and all components of Zenderer.
 
 zen::obj
 A group of sprite-like objects that operate at a high level of abstraction.
 
 zen::gfxcore
 Low level graphics layer.
 
- - - -

-Variables

class ZEN_API zen::obj::zEntity
 
-

Detailed Description

-
Author
George Kudrayvtsev (halcyon)
-
Version
1.0
-
Copyright
Apache License v2.0 Licensed under the Apache License, Version 2.0 (the "License").
- You may not use this file except in compliance with the License.
- You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -

Definition in file Drawable.hpp.

-
-
- - - - diff --git a/docs/_drawable_8hpp.js b/docs/_drawable_8hpp.js deleted file mode 100644 index 584f5ff5..00000000 --- a/docs/_drawable_8hpp.js +++ /dev/null @@ -1,4 +0,0 @@ -var _drawable_8hpp = -[ - [ "zEntity", "_drawable_8hpp.html#a3112ae30d7f3f81f60f61c3fa56a69f2", null ] -]; \ No newline at end of file diff --git a/docs/_drawable_8hpp__dep__incl.map b/docs/_drawable_8hpp__dep__incl.map deleted file mode 100644 index 8df6d942..00000000 --- a/docs/_drawable_8hpp__dep__incl.map +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/_drawable_8hpp__dep__incl.png b/docs/_drawable_8hpp__dep__incl.png deleted file mode 100644 index 2ea192d6..00000000 Binary files a/docs/_drawable_8hpp__dep__incl.png and /dev/null differ diff --git a/docs/_drawable_8hpp__incl.map b/docs/_drawable_8hpp__incl.map deleted file mode 100644 index 563c71e8..00000000 --- a/docs/_drawable_8hpp__incl.map +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/_drawable_8hpp__incl.png b/docs/_drawable_8hpp__incl.png deleted file mode 100644 index d8696152..00000000 Binary files a/docs/_drawable_8hpp__incl.png and /dev/null differ diff --git a/docs/_drawable_8hpp_source.html b/docs/_drawable_8hpp_source.html deleted file mode 100644 index ae9ee3a7..00000000 --- a/docs/_drawable_8hpp_source.html +++ /dev/null @@ -1,200 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/CoreGraphics/Drawable.hpp Source File - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
Drawable.hpp
-
-
-Go to the documentation of this file.
1 
-
23 #ifndef ZENDERER__CORE_GRAPHICS__DRAWABLE_HPP
-
24 #define ZENDERER__CORE_GRAPHICS__DRAWABLE_HPP
-
25 
-
26 #include "Zenderer/Core/Types.hpp"
-
27 #include "Zenderer/Math/Math.hpp"
-
28 #include "VertexArray.hpp"
-
29 #include "Renderer.hpp"
-
30 #include "Zenderer/Graphics/Material.hpp"
-
31 
-
32 #include "OpenGL.hpp"
-
33 
-
34 namespace zen
-
35 {
-
36 namespace obj { class ZEN_API zEntity; }
-
37 namespace gfxcore
-
38 {
-
40  class ZEN_API zDrawable
-
41  {
-
42  public:
-
43  zDrawable(asset::zAssetManager&);
-
44 
-
60  zDrawable(const zDrawable& Copy);
-
61  zDrawable(zDrawable&& Copy);
-
62 
-
63  // These are disabled due to the asset manager reference
-
64  // not able to being copied (dat wording).
-
65  //zDrawable& operator=(const zDrawable& Copy) = delete;
-
66  //zDrawable& operator=(zDrawable&& Copy) = delete;
-
67 
-
68  virtual ~zDrawable();
-
69 
-
72  virtual zDrawable& Create() = 0;
-
73 
-
82  void Move(const math::vector_t& Position);
-
83 
-
86  void Move(const real_t x, const real_t y, const real_t z = 1.0);
-
87 
-
102  void AttachMaterial(gfx::zMaterial& Material);
-
103 
-
105  void RemoveMaterial();
-
106 
-
108  virtual void SetColor(const color4f_t& Color);
-
109 
-
123  bool Draw(const bool is_bound = false);
-
124 
-
126  bool IsModifiable() const;
-
127 
-
128  inline const math::vector_t& GetPosition() const
-
129  { return m_Position; }
-
130 
-
131  inline real_t GetX() const { return m_Position.x; }
-
132  inline real_t GetY() const { return m_Position.y; }
-
133 
-
144  void LoadIntoVAO(gfxcore::zVertexArray& VAO,
-
145  const bool preserve = true);
-
146 
-
148  friend class ZEN_API obj::zEntity;
-
149 
-
150  private:
-
151  asset::zAssetManager& m_Assets;
-
152  math::matrix4x4_t* mp_MVMatrix;
-
153  zVertexArray* mp_VAO;
-
154  index_t m_offset;
-
155 
-
156  protected:
-
157  gfx::zMaterial m_Material;
-
158  math::vector_t m_Position;
-
159  DrawBatch m_DrawData;
-
160  bool m_internal;
-
161  };
-
162 } // namespace gfxcore
-
163 } // namespace zen
-
164 
-
165 #endif // ZENDERER__CORE_GRAPHICS__DRAWABLE_HPP
-
166 
-
-
- - - - diff --git a/docs/_effect_8cpp.html b/docs/_effect_8cpp.html index 7cac7c88..4be8e56d 100644 --- a/docs/_effect_8cpp.html +++ b/docs/_effect_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_effect_8cpp_source.html b/docs/_effect_8cpp_source.html index 0a882474..e5adc0a6 100644 --- a/docs/_effect_8cpp_source.html +++ b/docs/_effect_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_effect_8hpp.html b/docs/_effect_8hpp.html index 721735ab..594e89b2 100644 --- a/docs/_effect_8hpp.html +++ b/docs/_effect_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -136,7 +136,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_effect_8hpp__dep__incl.map b/docs/_effect_8hpp__dep__incl.map index 64b04a9c..b5704b36 100644 --- a/docs/_effect_8hpp__dep__incl.map +++ b/docs/_effect_8hpp__dep__incl.map @@ -1,42 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_effect_8hpp__dep__incl.png b/docs/_effect_8hpp__dep__incl.png index 05ab3de8..c4226aa3 100644 Binary files a/docs/_effect_8hpp__dep__incl.png and b/docs/_effect_8hpp__dep__incl.png differ diff --git a/docs/_effect_8hpp_source.html b/docs/_effect_8hpp_source.html index 45683556..e22a9f5c 100644 --- a/docs/_effect_8hpp_source.html +++ b/docs/_effect_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_effect_8inl.html b/docs/_effect_8inl.html index f492dedf..7504edd8 100644 --- a/docs/_effect_8inl.html +++ b/docs/_effect_8inl.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_effect_8inl__dep__incl.map b/docs/_effect_8inl__dep__incl.map index 4bd7e0cb..fab2abca 100644 --- a/docs/_effect_8inl__dep__incl.map +++ b/docs/_effect_8inl__dep__incl.map @@ -1,43 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_effect_8inl__dep__incl.png b/docs/_effect_8inl__dep__incl.png index 11f7b92b..e20a310e 100644 Binary files a/docs/_effect_8inl__dep__incl.png and b/docs/_effect_8inl__dep__incl.png differ diff --git a/docs/_effect_8inl_source.html b/docs/_effect_8inl_source.html index 0ae10a15..366a8dac 100644 --- a/docs/_effect_8inl_source.html +++ b/docs/_effect_8inl_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_engine_test_8cpp.html b/docs/_engine_test_8cpp.html index 0954ed77..06c02835 100644 --- a/docs/_engine_test_8cpp.html +++ b/docs/_engine_test_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -117,7 +117,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_engine_test_8cpp__incl.map b/docs/_engine_test_8cpp__incl.map index 6e1e9c6d..3ff23794 100644 --- a/docs/_engine_test_8cpp__incl.map +++ b/docs/_engine_test_8cpp__incl.map @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_engine_test_8cpp__incl.png b/docs/_engine_test_8cpp__incl.png index 8c8aaa21..c52a18af 100644 Binary files a/docs/_engine_test_8cpp__incl.png and b/docs/_engine_test_8cpp__incl.png differ diff --git a/docs/_engine_test_8cpp_source.html b/docs/_engine_test_8cpp_source.html index e08466bd..52091bf1 100644 --- a/docs/_engine_test_8cpp_source.html +++ b/docs/_engine_test_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -118,7 +118,7 @@
7  #pragma comment(lib, "Zenderer.lib")
8 #endif // ZEN_API
9 
-
10 int main2(int argc, char* argv[])
+
10 int main2(int argc, char* argv[])
11 {
12  Init();
13  asset::zAssetManager Manager; Manager.Init();
@@ -148,7 +148,7 @@
37  Sample.GetTexture().GetHeight());
38 
39  // Regular quad
-
40  Default.Create();
+
40  Default.Create();
41  Default.SetColor(color4f_t(1, 1, 1, 1));
42  Default.LoadIntoVAO(Vao);
43 
@@ -202,9 +202,9 @@
91  gfx::zQuad EntPrim(Manager, 111, 64);
92  EntPrim.AttachMaterial(Sample);
93  EntPrim.SetInverted(true);
-
94  EntPrim.Create();
+
94  EntPrim.Create();
95 
-
96  gfx::zScene Scene(800, 600, Manager);
+
96  gfx::zScene Scene(800, 600, Manager);
97  Scene.Init(); Scene.SetSeeThrough(true); //Scene.EnableLighting();
98 
99  obj::zEntity& Ent = Scene.AddEntity();
@@ -291,8 +291,8 @@
180  P2.SetColor(color4f_t(0, 0, 0, 1));
181  //P3.SetColor(color4f_t(0, 0, 0, 1));
182 
-
183  P.Create();
-
184  P2.Create();
+
183  P.Create();
+
184  P2.Create();
185  //P3.Create();
186 
187  gui::zMenu MainMenu(Window, Manager);
@@ -320,11 +320,11 @@
209  GB.Disable();
210  */
211 
-
212  obj::zAnimation& Anim = Scene.AddAnimation();
-
213  Anim.SetKeyframeCount(4);
-
214  Anim.SetKeyframeRate(7);
-
215  Anim.SetKeyframeSize(math::vectoru16_t(24, 52));
-
216  Anim.LoadFromTexture("hero_walk.png");
+
212  obj::zAnimation& Anim = Scene.AddAnimation();
+
213  Anim.SetKeyframeCount(4);
+
214  Anim.SetKeyframeRate(7);
+
215  Anim.SetKeyframeSize(math::vectoru16_t(24, 52));
+
216  Anim.LoadFromTexture("hero_walk.png");
217 
218  while(Window.IsOpen())
219  {
diff --git a/docs/_entity_8cpp.html b/docs/_entity_8cpp.html index bdd800e3..a8eb6663 100644 --- a/docs/_entity_8cpp.html +++ b/docs/_entity_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_entity_8cpp__incl.map b/docs/_entity_8cpp__incl.map index 2f380ad8..5a43e7c2 100644 --- a/docs/_entity_8cpp__incl.map +++ b/docs/_entity_8cpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_entity_8cpp__incl.png b/docs/_entity_8cpp__incl.png index 54af0be0..0246348b 100644 Binary files a/docs/_entity_8cpp__incl.png and b/docs/_entity_8cpp__incl.png differ diff --git a/docs/_entity_8cpp_source.html b/docs/_entity_8cpp_source.html index e0aa3df1..bd0d4ff9 100644 --- a/docs/_entity_8cpp_source.html +++ b/docs/_entity_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -120,7 +120,7 @@
9 zEntity::zEntity(asset::zAssetManager& Assets) :
10  m_Assets(Assets), m_Log(util::zLog::GetEngineLog()),
11  m_MV(math::matrix4x4_t::GetIdentityMatrix()),
-
12  m_sort(0), m_depth(1), m_inv(false), m_enabled(true)
+
12  m_depth(1), m_sort(0), m_inv(false), m_enabled(true)
13 {
14 }
15 
@@ -246,220 +246,234 @@
135  pPrimitive->AttachMaterial(Mat);
136  pPrimitive->SetInverted(m_inv);
137  pPrimitive->SetColor(color4f_t(1, 1, 1, 1));
-
138  pPrimitive->Create();
+
138  pPrimitive->Create();
139 
140  mp_allPrims.push_back(pPrimitive);
-
141  m_Box = math::aabb_t(math::rect_t(this->GetX(), this->GetY(),
-
142  pPrimitive->GetW(),
-
143  pPrimitive->GetH()));
-
144  return true;
-
145 }
-
146 
-
147 bool zEntity::AddPrimitive(const gfx::zPolygon& Polygon)
-
148 {
-
149  if(Polygon.m_DrawData.icount == 0 &&
-
150  Polygon.m_DrawData.vcount == 0 &&
-
151  Polygon.m_Verts.empty()) return false;
-
152 
-
153  gfx::zPolygon* pPoly = new gfx::zPolygon(Polygon);
-
154  pPoly->AttachMaterial(const_cast<gfx::zMaterial&>(Polygon.GetMaterial()));
-
155  //pPoly->SetInverted(m_inv);
-
156  pPoly->SetColor(Polygon.m_Color);
-
157  pPoly->Create();
-
158  mp_allPrims.push_back(pPoly);
-
159 
-
160  m_PolyBB = math::rect_t(pPoly->GetLeftPoint(), pPoly->GetLowPoint(),
-
161  pPoly->GetW(), pPoly->GetH());
-
162 
-
163  m_Box = math::aabb_t(math::rect_t(this->GetX() + m_PolyBB.x,
-
164  this->GetY() + m_PolyBB.y,
-
165  math::max<uint32_t>(this->GetW(), m_PolyBB.w),
-
166  math::max<uint32_t>(this->GetH(), m_PolyBB.h)));
+
141 
+
142  m_Box = math::aabb_t(math::rect_t(this->GetX(), this->GetY(),
+
143  pPrimitive->GetW(),
+
144  pPrimitive->GetH()));
+
145  return true;
+
146 }
+
147 
+
148 bool zEntity::AddPrimitive(const gfx::zPolygon& Polygon)
+
149 {
+
150  if(Polygon.m_DrawData.icount == 0 &&
+
151  Polygon.m_DrawData.vcount == 0 &&
+
152  Polygon.m_Verts.empty()) return false;
+
153 
+
154  gfx::zPolygon* pPoly = new gfx::zPolygon(Polygon);
+
155  pPoly->AttachMaterial(const_cast<gfx::zMaterial&>(Polygon.GetMaterial()));
+
156  //pPoly->SetInverted(m_inv);
+
157  pPoly->SetColor(Polygon.m_Color);
+
158  pPoly->Create();
+
159  mp_allPrims.emplace_back(pPoly);
+
160 
+
161  m_PolyBB = math::rect_t(
+
162  math::min<int16_t> (pPoly->CalcX(), m_PolyBB.x),
+
163  math::min<int16_t> (pPoly->CalcY(), m_PolyBB.y),
+
164  math::max<uint16_t>(pPoly->GetW(), m_PolyBB.w),
+
165  math::max<uint16_t>(pPoly->GetH(), m_PolyBB.h)
+
166  );
167 
-
168  // Reset then set the material flag.
-
169  //m_sort &= 0xFFFFFFFF ^ gfxcore::zSorter::MATERIAL_FLAG;
-
170  //m_sort |= (pQuad->GetMaterial().GetID() << gfxcore::zSorter::MATERIAL_OFFSET);
-
171  return true;
-
172 }
-
173 
-
174 bool zEntity::Optimize()
-
175 {
-
176  ZEN_ASSERTM(false, "not implemented");
-
177  return false;
-
178 }
-
179 
-
180 bool zEntity::Draw(bool is_bound /*= false*/)
-
181 {
-
182  if(!m_enabled) return false;
+
168  m_Box = math::aabb_t(math::rect_t(this->GetX() - m_PolyBB.x,
+
169  this->GetY() - m_PolyBB.y,
+
170  m_PolyBB.w, m_PolyBB.h));
+
171 
+
172  // Reset then set the material flag.
+
173  //m_sort &= 0xFFFFFFFF ^ gfxcore::zSorter::MATERIAL_FLAG;
+
174  //m_sort |= (pQuad->GetMaterial().GetID() << gfxcore::zSorter::MATERIAL_OFFSET);
+
175  return true;
+
176 }
+
177 
+
178 bool zEntity::Optimize()
+
179 {
+
180  ZEN_ASSERTM(false, "not implemented");
+
181  return false;
+
182 }
183 
-
184  for(auto& i : mp_allPrims)
-
185  i->Draw(is_bound);
-
186 
-
187  return true;
-
188 }
-
189 
-
190 void zEntity::Move(const math::vector_t& Pos)
-
191 {
-
192  this->Move(Pos.x, Pos.y, Pos.z);
-
193 }
-
194 
-
195 void zEntity::Move(const real_t x, const real_t y, const real_t z /*= 1.0*/)
-
196 {
-
197  m_depth = z;
-
198  math::vector_t d = math::vector_t(x, y, z) - this->GetPosition();
-
199 
-
200  for(auto& i : mp_allPrims) i->Move(x, y);
-
201 
-
202  m_MV.Translate(math::vector_t(x, y, z));
-
203  m_Box = math::aabb_t(math::rect_t(x + m_PolyBB.x, y + m_PolyBB.y,
-
204  this->GetW(), this->GetH()));
-
205 }
-
206 
-
207 void zEntity::Adjust(const real_t dx, const real_t dy, const real_t dz /*= 0.0*/)
-
208 {
-
209  this->Move(this->GetPosition() + math::vector_t(dx, dy, dz));
-
210 }
-
211 
-
212 void zEntity::Adjust(const math::vector_t& delta)
-
213 {
-
214  this->Move(this->GetPosition() + delta);
-
215 }
-
216 
-
217 void zEntity::Offload(gfxcore::zVertexArray& VAO, const bool keep /*= true*/)
-
218 {
-
219  for(auto& i : mp_allPrims)
-
220  i->LoadIntoVAO(VAO, keep);
-
221 }
-
222 
-
223 bool zEntity::Offloaded() const
-
224 {
-
225  for(auto& i : mp_allPrims)
-
226  {
-
227  if(!(i->m_DrawData.Vertices && i->m_DrawData.Indices))
-
228  return false;
-
229  }
-
230 
-
231  return true;
-
232 }
-
233 
-
234 bool zEntity::Collides(const zEntity& Other, math::vector_t* poi)
-
235 {
-
236  if(!m_Box.collides(Other.m_Box)) return false;
-
237  for(auto& i : mp_allPrims)
-
238  {
-
239  for(auto& j : mp_allPrims)
-
240  if(i->Collides(*j, poi)) return true;
-
241  }
-
242 
-
243  return false;
-
244 }
-
245 
-
246 bool zEntity::Collides(const math::rect_t& other)
-
247 {
-
248  return this->Collides(math::aabb_t(other));
-
249 }
-
250 
-
251 bool zEntity::Collides(const math::aabb_t& other)
-
252 {
-
253  if(!m_Box.collides(other)) return false;
-
254  for(auto& i : mp_allPrims)
-
255  {
-
256  if(i->Collides(other)) return true;
-
257  }
-
258 
-
259  return false;
-
260 }
-
261 
-
262 bool zEntity::Collides(const math::vector_t& pos)
-
263 {
-
264  return this->Collides(math::rect_t(pos.x, pos.y, 1, 1));
-
265 }
-
266 
-
267 void zEntity::SetDepth(uint8_t depth)
-
268 {
-
269  // Limit depth to 8-bit values (256).
-
270  clamp<uint8_t>(depth, 0U, 1U << 8);
-
271  m_depth = depth;
-
272  //m_sort &= (0xFFFFFFFF ^ gfxcore::zSorter::DEPTH_FLAG);
-
273  //m_sort |= (depth << gfxcore::zSorter::DEPTH_OFFSET);
+
184 bool zEntity::Draw(bool is_bound /*= false*/)
+
185 {
+
186  if(!m_enabled) return false;
+
187 
+
188  for(auto& i : mp_allPrims)
+
189  i->Draw(is_bound);
+
190 
+
191  return true;
+
192 }
+
193 
+
194 void zEntity::Move(const math::vector_t& Pos)
+
195 {
+
196  this->Move(Pos.x, Pos.y, Pos.z);
+
197 }
+
198 
+
199 void zEntity::Move(const real_t x, const real_t y, const real_t z /*= 1.0*/)
+
200 {
+
201  m_depth = z;
+
202  for(auto& i : mp_allPrims) i->Move(x, y);
+
203 
+
204  m_MV.Translate(math::vector_t(x, y, z));
+
205  m_Box = math::aabb_t(math::rect_t(x + m_PolyBB.x, y + m_PolyBB.y,
+
206  this->GetW(), this->GetH()));
+
207 }
+
208 
+
209 void zEntity::Adjust(const real_t dx, const real_t dy, const real_t dz /*= 0.0*/)
+
210 {
+
211  this->Move(this->GetPosition() + math::vector_t(dx, dy, dz));
+
212 }
+
213 
+
214 void zEntity::Adjust(const math::vector_t& delta)
+
215 {
+
216  this->Move(this->GetPosition() + delta);
+
217 }
+
218 
+
219 void zEntity::Offload(gfxcore::zVertexArray& VAO, const bool keep /*= true*/)
+
220 {
+
221  for(auto& i : mp_allPrims)
+
222  i->LoadIntoVAO(VAO, keep);
+
223 }
+
224 
+
225 bool zEntity::Offloaded() const
+
226 {
+
227  for(auto& i : mp_allPrims)
+
228  {
+
229  if(!(i->m_DrawData.Vertices && i->m_DrawData.Indices))
+
230  return false;
+
231  }
+
232 
+
233  return true;
+
234 }
+
235 
+
236 bool zEntity::Collides(const zEntity& Other, math::cquery_t* q) const
+
237 {
+
238  if(!m_Box.collides(Other.m_Box)) return false;
+
239  for(auto& i : mp_allPrims)
+
240  {
+
241  for(auto& j : Other.mp_allPrims)
+
242  {
+
243  if(i->Collides(*j, q))
+
244  {
+
245  if(q != nullptr)
+
246  {
+
247  q->box1 = m_Box;
+
248  q->box2 = Other.m_Box;
+
249  q->collision = true;
+
250  }
+
251 
+
252  return true;
+
253  }
+
254  }
+
255  }
+
256 
+
257  return false;
+
258 }
+
259 
+
260 bool zEntity::Collides(const math::rect_t& other) const
+
261 {
+
262  return this->Collides(math::aabb_t(other));
+
263 }
+
264 
+
265 bool zEntity::Collides(const math::aabb_t& other) const
+
266 {
+
267  if(!m_Box.collides(other)) return false;
+
268  for(auto& i : mp_allPrims)
+
269  {
+
270  if(i->Collides(other)) return true;
+
271  }
+
272 
+
273  return false;
274 }
275 
-
276 const math::matrix4x4_t& zEntity::GetTransformation() const
+
276 bool zEntity::Collides(const math::vector_t& pos) const
277 {
-
278  return m_MV;
+
278  return this->Collides(math::rect_t(pos.x, pos.y, 1, 1));
279 }
280 
-
281 math::vector_t zEntity::GetPosition() const
-
282 {
-
283  return math::vector_t(m_MV[0][3], m_MV[1][3], m_MV[2][3]);
-
284 }
-
285 
-
286 const math::aabb_t& zEntity::GetBox() const
-
287 {
-
288  return m_Box;
-
289 }
-
290 
-
291 uint32_t zEntity::GetSortFlag() const
-
292 {
-
293  return m_sort;
-
294 }
-
295 
-
296 std::vector<gfx::zPolygon*>::const_iterator zEntity::begin() const
-
297 {
-
298  return mp_allPrims.cbegin();
-
299 }
-
300 
-
301 std::vector<gfx::zPolygon*>::const_iterator zEntity::end() const
-
302 {
-
303  return mp_allPrims.cend();
-
304 }
-
305 
-
306 void zEntity::Destroy()
-
307 {
-
308  for(auto& i : mp_allPrims)
-
309  {
-
310  delete i;
-
311  i = nullptr;
-
312  }
-
313 
-
314  mp_allPrims.clear();
-
315  mp_allPrims.shrink_to_fit();
-
316 }
-
317 
-
318 bool zEntity::FileError(const string_t& filename,
-
319  const string_t& line, const uint32_t line_no,
-
320  const ErrorType& Err)
+
281 void zEntity::SetDepth(uint8_t depth)
+
282 {
+
283  // Limit depth to 8-bit values (256).
+
284  clamp<uint8_t>(depth, 0U, 1U << 8);
+
285  m_depth = depth;
+
286  //m_sort &= (0xFFFFFFFF ^ gfxcore::zSorter::DEPTH_FLAG);
+
287  //m_sort |= (depth << gfxcore::zSorter::DEPTH_OFFSET);
+
288 }
+
289 
+
290 const math::matrix4x4_t& zEntity::GetTransformation() const
+
291 {
+
292  return m_MV;
+
293 }
+
294 
+
295 math::vector_t zEntity::GetPosition() const
+
296 {
+
297  return math::vector_t(m_MV[0][3], m_MV[1][3], m_MV[2][3]);
+
298 }
+
299 
+
300 const math::aabb_t& zEntity::GetBox() const
+
301 {
+
302  return m_Box;
+
303 }
+
304 
+
305 uint32_t zEntity::GetSortFlag() const
+
306 {
+
307  return m_sort;
+
308 }
+
309 
+
310 std::vector<gfx::zPolygon*>::const_iterator zEntity::begin() const
+
311 {
+
312  return mp_allPrims.cbegin();
+
313 }
+
314 
+
315 std::vector<gfx::zPolygon*>::const_iterator zEntity::end() const
+
316 {
+
317  return mp_allPrims.cend();
+
318 }
+
319 
+
320 void zEntity::Destroy()
321 {
-
322  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR) << m_Log.SetSystem("Entity")
-
323  << "Error while parsing '" << filename << "' on line " << line_no
-
324  << ": " << line << "(";
-
325 
-
326  switch(Err)
-
327  {
-
328  case ErrorType::BAD_PAIR:
-
329  m_Log << "bad key=value pair";
-
330  break;
+
322  for(auto& i : mp_allPrims)
+
323  {
+
324  delete i;
+
325  i = nullptr;
+
326  }
+
327 
+
328  mp_allPrims.clear();
+
329  mp_allPrims.shrink_to_fit();
+
330 }
331 
-
332  case ErrorType::BAD_POSITION:
-
333  m_Log << "position must at least contain x,y coordinates";
-
334  break;
-
335 
-
336  case ErrorType::BAD_MATERIAL:
-
337  m_Log << "failed to load material file";
-
338  break;
+
332 bool zEntity::FileError(const string_t& filename,
+
333  const string_t& line, const uint32_t line_no,
+
334  const ErrorType& Err)
+
335 {
+
336  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR) << m_Log.SetSystem("Entity")
+
337  << "Error while parsing '" << filename << "' on line " << line_no
+
338  << ": " << line << "(";
339 
-
340  case ErrorType::NO_TEXTURE:
-
341  m_Log << "no texture specified for primitive";
-
342  break;
-
343 
-
344  default:
-
345  m_Log << "unknown parsing error";
-
346  break;
-
347  }
-
348 
-
349  m_Log << ")." << zLog::endl;
-
350  return false;
-
351 }
+
340  switch(Err)
+
341  {
+
342  case ErrorType::BAD_PAIR:
+
343  m_Log << "bad key=value pair";
+
344  break;
+
345 
+
346  case ErrorType::BAD_POSITION:
+
347  m_Log << "position must at least contain x,y coordinates";
+
348  break;
+
349 
+
350  case ErrorType::BAD_MATERIAL:
+
351  m_Log << "failed to load material file";
+
352  break;
+
353 
+
354  case ErrorType::NO_TEXTURE:
+
355  m_Log << "no texture specified for primitive";
+
356  break;
+
357 
+
358  default:
+
359  m_Log << "unknown parsing error";
+
360  break;
+
361  }
+
362 
+
363  m_Log << ")." << zLog::endl;
+
364  return false;
+
365 }
diff --git a/docs/_entity_8hpp.html b/docs/_entity_8hpp.html index 67522b46..5fbc1a3c 100644 --- a/docs/_entity_8hpp.html +++ b/docs/_entity_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -130,14 +130,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_entity_8hpp__dep__incl.map b/docs/_entity_8hpp__dep__incl.map index 74445eca..50b3c7e9 100644 --- a/docs/_entity_8hpp__dep__incl.map +++ b/docs/_entity_8hpp__dep__incl.map @@ -1,23 +1,24 @@ - - - - + + + + - - + + - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/_entity_8hpp__dep__incl.png b/docs/_entity_8hpp__dep__incl.png index a1df9d93..e08f201a 100644 Binary files a/docs/_entity_8hpp__dep__incl.png and b/docs/_entity_8hpp__dep__incl.png differ diff --git a/docs/_entity_8hpp__incl.map b/docs/_entity_8hpp__incl.map index 7cd57996..cc2f42f3 100644 --- a/docs/_entity_8hpp__incl.map +++ b/docs/_entity_8hpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_entity_8hpp__incl.png b/docs/_entity_8hpp__incl.png index 06e0524e..be28301f 100644 Binary files a/docs/_entity_8hpp__incl.png and b/docs/_entity_8hpp__incl.png differ diff --git a/docs/_entity_8hpp_source.html b/docs/_entity_8hpp_source.html index 761205b7..9eb3b9cc 100644 --- a/docs/_entity_8hpp_source.html +++ b/docs/_entity_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -183,12 +183,12 @@
230 
232  bool Offloaded() const;
233 
-
235  bool Collides(const zEntity& Other, math::vector_t* poi = nullptr);
-
236  bool Collides(const math::rect_t& other);
-
237  bool Collides(const math::aabb_t& other);
-
238  bool Collides(const math::vector_t& Pos);
+
235  bool Collides(const zEntity& Other, math::cquery_t* q = nullptr) const;
+
236  bool Collides(const math::rect_t& other) const;
+
237  bool Collides(const math::aabb_t& other) const;
+
238  bool Collides(const math::vector_t& Pos) const;
239 
-
241  void SetDepth(uint8_t depth);
+
241  void SetDepth(const uint8_t depth);
242 
244  const math::matrix4x4_t& GetTransformation() const;
245  const math::aabb_t& GetBox() const;
@@ -209,7 +209,7 @@
262  inline void Disable() { m_enabled = false; }
263 
264  friend class ZEN_API gui::zFont;
-
265  friend class ZEN_API gfx::zScene;
+
265  friend class ZEN_API gfx::zScene;
266 
267  protected:
268  //zEntity(const zEntity&) // not implemented to
diff --git a/docs/_error_handler_8hpp.html b/docs/_error_handler_8hpp.html index e833d496..5653acda 100644 --- a/docs/_error_handler_8hpp.html +++ b/docs/_error_handler_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -122,7 +122,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_error_handler_8hpp__incl.map b/docs/_error_handler_8hpp__incl.map index 609da3e7..1a913456 100644 --- a/docs/_error_handler_8hpp__incl.map +++ b/docs/_error_handler_8hpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_error_handler_8hpp__incl.png b/docs/_error_handler_8hpp__incl.png index ded3f344..0f6e31e9 100644 Binary files a/docs/_error_handler_8hpp__incl.png and b/docs/_error_handler_8hpp__incl.png differ diff --git a/docs/_error_handler_8hpp_source.html b/docs/_error_handler_8hpp_source.html index c14c25eb..ec6cba45 100644 --- a/docs/_error_handler_8hpp_source.html +++ b/docs/_error_handler_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_error_handling_8cpp.html b/docs/_error_handling_8cpp.html index a07ecc9b..b754fa5d 100644 --- a/docs/_error_handling_8cpp.html +++ b/docs/_error_handling_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_error_handling_8cpp_source.html b/docs/_error_handling_8cpp_source.html index bde8e986..81b123fa 100644 --- a/docs/_error_handling_8cpp_source.html +++ b/docs/_error_handling_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_error_handling_8hpp.html b/docs/_error_handling_8hpp.html index 13b179c1..1649cc04 100644 --- a/docs/_error_handling_8hpp.html +++ b/docs/_error_handling_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -130,7 +130,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_error_handling_8hpp__dep__incl.map b/docs/_error_handling_8hpp__dep__incl.map index 7d58f4fb..a7495bcc 100644 --- a/docs/_error_handling_8hpp__dep__incl.map +++ b/docs/_error_handling_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_error_handling_8hpp__dep__incl.png b/docs/_error_handling_8hpp__dep__incl.png index ea68d0b6..851273e6 100644 Binary files a/docs/_error_handling_8hpp__dep__incl.png and b/docs/_error_handling_8hpp__dep__incl.png differ diff --git a/docs/_error_handling_8hpp_source.html b/docs/_error_handling_8hpp_source.html index 3dcd515f..73ab188a 100644 --- a/docs/_error_handling_8hpp_source.html +++ b/docs/_error_handling_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_event_8hpp.html b/docs/_event_8hpp.html index fab27c04..823bd672 100644 --- a/docs/_event_8hpp.html +++ b/docs/_event_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,7 +132,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_event_8hpp__dep__incl.map b/docs/_event_8hpp__dep__incl.map index b64b7577..e46d4887 100644 --- a/docs/_event_8hpp__dep__incl.map +++ b/docs/_event_8hpp__dep__incl.map @@ -1,29 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_event_8hpp__dep__incl.png b/docs/_event_8hpp__dep__incl.png index 9f2eeb80..d11ec285 100644 Binary files a/docs/_event_8hpp__dep__incl.png and b/docs/_event_8hpp__dep__incl.png differ diff --git a/docs/_event_8hpp_source.html b/docs/_event_8hpp_source.html index 31b28010..d31102b4 100644 --- a/docs/_event_8hpp_source.html +++ b/docs/_event_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_event_handler_8cpp.html b/docs/_event_handler_8cpp.html index b95d4766..8c5252ea 100644 --- a/docs/_event_handler_8cpp.html +++ b/docs/_event_handler_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_event_handler_8cpp_source.html b/docs/_event_handler_8cpp_source.html index e235766a..cdb05125 100644 --- a/docs/_event_handler_8cpp_source.html +++ b/docs/_event_handler_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_event_handler_8hpp.html b/docs/_event_handler_8hpp.html index 41a16110..50ec106c 100644 --- a/docs/_event_handler_8hpp.html +++ b/docs/_event_handler_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -133,7 +133,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_event_handler_8hpp__dep__incl.map b/docs/_event_handler_8hpp__dep__incl.map index a30bd25f..3561dbf0 100644 --- a/docs/_event_handler_8hpp__dep__incl.map +++ b/docs/_event_handler_8hpp__dep__incl.map @@ -1,28 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_event_handler_8hpp__dep__incl.png b/docs/_event_handler_8hpp__dep__incl.png index 3c1c840d..df8cc00c 100644 Binary files a/docs/_event_handler_8hpp__dep__incl.png and b/docs/_event_handler_8hpp__dep__incl.png differ diff --git a/docs/_event_handler_8hpp_source.html b/docs/_event_handler_8hpp_source.html index 19b92ff6..378731c3 100644 --- a/docs/_event_handler_8hpp_source.html +++ b/docs/_event_handler_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_events-example.html b/docs/_events-example.html index 4b533502..4dfa0254 100644 --- a/docs/_events-example.html +++ b/docs/_events-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_external_2lua_2lua_8hpp.html b/docs/_external_2lua_2lua_8hpp.html index db7c97c9..8e410294 100644 --- a/docs/_external_2lua_2lua_8hpp.html +++ b/docs/_external_2lua_2lua_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_external_2lua_2lua_8hpp_source.html b/docs/_external_2lua_2lua_8hpp_source.html index 6f60f5df..949a2153 100644 --- a/docs/_external_2lua_2lua_8hpp_source.html +++ b/docs/_external_2lua_2lua_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_file_parser_8cpp.html b/docs/_file_parser_8cpp.html index a18ff120..6f2ddb44 100644 --- a/docs/_file_parser_8cpp.html +++ b/docs/_file_parser_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_file_parser_8cpp_source.html b/docs/_file_parser_8cpp_source.html index 32cbee31..64ee5247 100644 --- a/docs/_file_parser_8cpp_source.html +++ b/docs/_file_parser_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -124,119 +124,117 @@
13  ZEN_ASSERT(!filename.empty());
14 
15  std::ifstream infile(filename);
-
16  return this->LoadFromStream(infile, 0, -1, filename.c_str());
+
16  return this->LoadFromStream(infile, 0, -1, filename.c_str());
17 }
18 
-
19 bool zFileParser::LoadFromStream(std::ifstream& infile,
+
19 bool zFileParser::LoadFromStream(std::ifstream& infile,
20  const std::streampos start,
21  const std::streampos end,
-
22  const char* const fname)
-
23 {
-
24  m_results.clear();
-
25  infile.seekg(start, std::ios::beg);
-
26  std::string line;
+
22  const char* const fname,
+
23  const bool skip)
+
24 {
+
25  m_results.clear();
+
26  if(!infile || (end != std::streampos(-1) && start >= end)) return false;
27 
-
28  if(!infile || (end != std::streampos(-1) && start >= end)) return false;
-
29 
-
30  while((end == std::streampos(-1) || infile.tellg() < end) &&
-
31  std::getline(infile, line))
-
32  {
-
33  util::strip(line);
-
34 
-
35  // Skip empty lines, comments.
-
36  if(line.empty() ||
-
37  (line.size() > 2 && line.substr(0, 2) == "//"))
-
38  continue;
-
39 
-
40  std::size_t index = line.find('=');
-
41  if(index != std::string::npos)
-
42  {
-
43  m_results.emplace_back(pair_t(
-
44  line.substr(0, index),
-
45  line.substr(index + 1)
-
46  ));
-
47  }
-
48  }
-
49 
-
50  infile.seekg(start, std::ios::beg);
-
51  return true;
-
52 }
-
53 
-
54 bool zFileParser::LoadFromStreamUntil(std::ifstream& infile,
-
55  const string_t& end,
-
56  const std::streampos start,
-
57  const char* const filename)
+
28  string_t line;
+
29  while((end == std::streampos(-1) || infile.tellg() < end) &&
+
30  std::getline(infile, line))
+
31  {
+
32  util::strip(line);
+
33 
+
34  // Skip empty lines, comments.
+
35  if(line.empty() ||
+
36  (line.size() > 2 && line.substr(0, 2) == "//"))
+
37  continue;
+
38 
+
39  std::size_t index = line.find('=');
+
40  if(index != std::string::npos)
+
41  {
+
42  m_results.emplace_back(
+
43  line.substr(0, index),
+
44  line.substr(index + 1)
+
45  );
+
46  }
+
47  }
+
48 
+
49  if(!skip) infile.seekg(start, std::ios::beg);
+
50  return true;
+
51 }
+
52 
+
53 bool zFileParser::LoadFromStreamUntil(std::ifstream& infile,
+
54  const string_t& end,
+
55  const std::streampos start,
+
56  const char* const filename,
+
57  const bool skip)
58 {
59  m_results.clear();
-
60  infile.seekg(start, std::ios::beg);
-
61  std::string line;
-
62 
-
63  if(!infile) return false;
-
64 
-
65  while(std::getline(infile, line) &&
-
66  line.find(end) == std::string::npos)
-
67  {
-
68  util::strip(line);
-
69 
-
70  // Skip empty lines, comments.
-
71  if(line.empty() ||
-
72  (line.size() > 2 && line.substr(0, 2) == "//"))
-
73  continue;
-
74 
-
75  std::size_t index = line.find('=');
-
76  if(index != std::string::npos)
-
77  {
-
78  m_results.emplace_back(pair_t(
-
79  line.substr(0, index),
-
80  line.substr(index)
-
81  ));
-
82  }
-
83  }
-
84 
-
85  infile.seekg(start, std::ios::beg);
-
86  return true;
-
87 }
-
88 
-
89 string_t zFileParser::PopResult(const string_t& index, string_t def)
-
90 {
-
91  for(auto i = m_results.begin(),
-
92  j = m_results.end();
-
93  i != j; ++i)
-
94  {
-
95  auto it = *i;
-
96  if(it.first == index)
-
97  {
-
98  def = it.second;
-
99  m_results.erase(i);
-
100  break;
-
101  }
-
102  }
-
103 
-
104  return def;
-
105 }
-
106 
-
107 string_t zFileParser::GetFirstResult(const string_t& index,
-
108  const string_t& def) const
-
109 {
-
110  auto it = std::find_if(m_results.begin(), m_results.end(),
-
111  [&index](decltype(*m_results.cbegin())& result) -> bool
-
112  {
-
113  return result.first == index;
-
114  }
-
115  );
-
116 
-
117  return it == m_results.end() ? def : it->second;
-
118 }
-
119 
-
120 std::vector<string_t> zFileParser::GetResults(const string_t& index) const
-
121 {
-
122  std::vector<string_t> results;
-
123  for(auto& i : m_results)
-
124  if(index == i.first)
-
125  results.push_back(i.second);
-
126 
-
127  return results;
-
128 }
+
60  if(!infile) return false;
+
61 
+
62  string_t line;
+
63  while(std::getline(infile, line) &&
+
64  line.find(end) == std::string::npos)
+
65  {
+
66  util::strip(line);
+
67 
+
68  // Skip empty lines, comments.
+
69  if(line.empty() ||
+
70  (line.size() > 2 && line.substr(0, 2) == "//"))
+
71  continue;
+
72 
+
73  std::size_t index = line.find('=');
+
74  if(index != std::string::npos)
+
75  {
+
76  m_results.emplace_back(pair_t(
+
77  line.substr(0, index),
+
78  line.substr(index + 1)
+
79  ));
+
80  }
+
81  }
+
82 
+
83  if(!skip) infile.seekg(start, std::ios::beg);
+
84  return true;
+
85 }
+
86 
+
87 string_t zFileParser::PopResult(const string_t& index, string_t def)
+
88 {
+
89  for(auto i = m_results.begin(),
+
90  j = m_results.end();
+
91  i != j; ++i)
+
92  {
+
93  auto it = *i;
+
94  if(it.first == index)
+
95  {
+
96  def = std::move(it.second);
+
97  m_results.erase(i);
+
98  break;
+
99  }
+
100  }
+
101 
+
102  return def;
+
103 }
+
104 
+
105 string_t zFileParser::GetFirstResult(const string_t& index,
+
106  const string_t& def) const
+
107 {
+
108  auto it = std::find_if(m_results.begin(), m_results.end(),
+
109  [&index](decltype(*m_results.cbegin())& result) -> bool
+
110  {
+
111  return result.first == index;
+
112  }
+
113  );
+
114 
+
115  return it == m_results.end() ? def : it->second;
+
116 }
+
117 
+
118 std::vector<string_t> zFileParser::GetResults(const string_t& index) const
+
119 {
+
120  std::vector<string_t> results;
+
121  for(auto& i : m_results)
+
122  if(index == i.first)
+
123  results.push_back(i.second);
+
124 
+
125  return results;
+
126 }
diff --git a/docs/_file_parser_8hpp.html b/docs/_file_parser_8hpp.html index 6a3b733b..d74a9df1 100644 --- a/docs/_file_parser_8hpp.html +++ b/docs/_file_parser_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -135,7 +135,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_file_parser_8hpp__dep__incl.map b/docs/_file_parser_8hpp__dep__incl.map index 1f99d36f..ac4063bc 100644 --- a/docs/_file_parser_8hpp__dep__incl.map +++ b/docs/_file_parser_8hpp__dep__incl.map @@ -1,16 +1,17 @@ - - - - + + + + - - - - - - - - + + + + + + + + + diff --git a/docs/_file_parser_8hpp__dep__incl.png b/docs/_file_parser_8hpp__dep__incl.png index f1f92199..3da2abee 100644 Binary files a/docs/_file_parser_8hpp__dep__incl.png and b/docs/_file_parser_8hpp__dep__incl.png differ diff --git a/docs/_file_parser_8hpp_source.html b/docs/_file_parser_8hpp_source.html index 45001139..552b22c0 100644 --- a/docs/_file_parser_8hpp_source.html +++ b/docs/_file_parser_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -136,44 +136,46 @@
47 
58  virtual bool LoadFromFile(const string_t& filename);
59 
-
82  virtual bool LoadFromStream(std::ifstream& infile,
-
83  const std::streampos start = 0,
-
84  const std::streampos end = -1,
-
85  const char* const fname = nullptr);
-
86 
-
111  virtual bool LoadFromStreamUntil(std::ifstream& infile,
-
112  const string_t& end,
-
113  const std::streampos start = 0,
-
114  const char* const filename = nullptr);
-
115 
-
125  string_t PopResult(const string_t& index, string_t def = "");
-
126 
-
128  inline bool Exists(const string_t& index) const
-
129  {
-
130  return !GetFirstResult(index).empty();
-
131  }
-
132 
-
143  string_t GetFirstResult(const string_t& index,
-
144  const string_t& def = "") const;
-
145 
-
156  std::vector<string_t> GetResults(const string_t& index) const;
-
157 
-
159  inline size_t GetResultCount() const { return m_results.size(); }
-
160 
-
161  static bool ResultToBool(string_t result)
-
162  {
-
163  util::toupper(result);
-
164  return (result == "1" || result == "TRUE");
-
165  }
-
166 
-
167  private:
-
168  std::vector<pair_t> m_results;
-
169  };
-
170 }
-
171 }
-
172 
-
173 #endif // ZENDERER__UTILITIES__FILE_PARSER_HPP
-
174 
+
83  virtual bool LoadFromStream(std::ifstream& infile,
+
84  const std::streampos start = 0,
+
85  const std::streampos end = -1,
+
86  const char* const fname = nullptr,
+
87  const bool skip = false);
+
88 
+
114  virtual bool LoadFromStreamUntil(std::ifstream& infile,
+
115  const string_t& end,
+
116  const std::streampos start = 0,
+
117  const char* const filename = nullptr,
+
118  const bool skip = false);
+
119 
+
129  string_t PopResult(const string_t& index, string_t def = "");
+
130 
+
132  inline bool Exists(const string_t& index) const
+
133  {
+
134  return !GetFirstResult(index).empty();
+
135  }
+
136 
+
147  string_t GetFirstResult(const string_t& index,
+
148  const string_t& def = "") const;
+
149 
+
160  std::vector<string_t> GetResults(const string_t& index) const;
+
161 
+
163  inline size_t GetResultCount() const { return m_results.size(); }
+
164 
+
165  static bool ResultToBool(string_t result)
+
166  {
+
167  util::toupper(result);
+
168  return (result == "1" || result == "TRUE");
+
169  }
+
170 
+
171  private:
+
172  std::vector<pair_t> m_results;
+
173  };
+
174 }
+
175 }
+
176 
+
177 #endif // ZENDERER__UTILITIES__FILE_PARSER_HPP
+
178 
diff --git a/docs/_font_8cpp.html b/docs/_font_8cpp.html index b4092a53..3f952258 100644 --- a/docs/_font_8cpp.html +++ b/docs/_font_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_font_8cpp__incl.map b/docs/_font_8cpp__incl.map index 0da5b614..c8a12f23 100644 --- a/docs/_font_8cpp__incl.map +++ b/docs/_font_8cpp__incl.map @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_font_8cpp__incl.png b/docs/_font_8cpp__incl.png index 5df51cbb..fa99824e 100644 Binary files a/docs/_font_8cpp__incl.png and b/docs/_font_8cpp__incl.png differ diff --git a/docs/_font_8cpp_source.html b/docs/_font_8cpp_source.html index 2b9cc474..5e2f4a39 100644 --- a/docs/_font_8cpp_source.html +++ b/docs/_font_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -288,294 +288,297 @@
177  Pos.x = 0; Pos.y -= m_height;
178  totals.x = math::max(tmp_tx, totals.x);
179  tmp_tx = 0;
-
180  int16_t tmph = 0;
-
181 
-
182  continue;
-
183  }
-
184 
-
185  // Use space (' ') as a placeholder for non-renderable chars.
-
186  char letter = (c > '~' || c < ' ') ? ' ' : c;
-
187 
-
188  // Shortcut to glyph data.
-
189  const auto it = m_glyphData.find(letter);
-
190 
-
191  // If the character doesn't exist, we just skip it.
-
192  if(it == m_glyphData.end() || it->first == ' ')
-
193  {
-
194  // Increment position for the next glyph.
-
195  tmp_tx += m_glyphData.find(' ')->second.advance;
-
196  Pos.x += m_glyphData.find(' ')->second.advance;
-
197  continue;
-
198  }
+
180  continue;
+
181  }
+
182 
+
183  // Use space (' ') as a placeholder for non-renderable chars.
+
184  char letter = (c > '~' || c < ' ') ? ' ' : c;
+
185 
+
186  // Shortcut to glyph data.
+
187  const auto it = m_glyphData.find(letter);
+
188 
+
189  // If the character doesn't exist, we just skip it.
+
190  if(it == m_glyphData.end() || it->first == ' ')
+
191  {
+
192  // Increment position for the next glyph.
+
193  tmp_tx += m_glyphData.find(' ')->second.advance;
+
194  Pos.x += m_glyphData.find(' ')->second.advance;
+
195  continue;
+
196  }
+
197 
+
198  const glyph_t& gl = it->second;
199 
-
200  const glyph_t& gl = it->second;
-
201 
-
202  /*
-
203  * [i] : top left
-
204  * [i + 1] : top right
-
205  * [i + 2] : bottom right
-
206  * [i + 3] : bottom left
-
207  */
-
208  uint16_t start_y = std::abs(gl.position.y + Pos.y);
-
209  verts[i].position = math::vector_t(Pos.x, start_y);
-
210  verts[i+1].position = math::vector_t(Pos.x+gl.size.x, start_y);
-
211  verts[i+2].position = math::vector_t(Pos.x+gl.size.x, start_y+gl.size.y);
-
212  verts[i+3].position = math::vector_t(Pos.x, start_y+gl.size.y);
-
213 
-
214  // The glyph textures are stored upside-down, so we set the texture
-
215  // coordinates to flip them back appropriately.
-
216  verts[i].tc = math::vector_t(0, 0);
-
217  verts[i+1].tc = math::vector_t(1, 0);
-
218  verts[i+2].tc = math::vector_t(1, 1);
-
219  verts[i+3].tc = math::vector_t(0, 1);
-
220 
-
221  // Uniform font color.
-
222  for(size_t j = i; j < i + 4; ++j) verts[j].color = m_Color;
-
223 
-
224  // Calculate index starting point. Since 6 indices per vertex,
-
225  // we do i / 4 (since 4 iterations per vertex) to get the
-
226  // vertex number, and * 6 to get to the first index for it.
-
227  int x = (i >> 2) * 6;
-
228 
-
229  // Standard quad indices.
-
230  inds[x] = i;
-
231  inds[x+1] = i + 1;
-
232  inds[x+2] = i + 3;
-
233  inds[x+3] = i + 3;
-
234  inds[x+4] = i + 2;
-
235  inds[x+5] = i + 1;
-
236 
-
237  // Track total dimensions.
-
238  tmp_tx += math::max(gl.size.x, gl.advance);
-
239  totals.y = math::max<uint16_t>(totals.y, start_y + gl.size.y);
-
240 
-
241  // Increment position for the next glyph.
-
242  Pos.x += gl.advance;
-
243  }
+
200  /*
+
201  * [i] : top left
+
202  * [i + 1] : top right
+
203  * [i + 2] : bottom right
+
204  * [i + 3] : bottom left
+
205  */
+
206  uint16_t start_y = std::abs(gl.position.y + Pos.y);
+
207  verts[i].position = math::vector_t(Pos.x, start_y);
+
208  verts[i+1].position = math::vector_t(Pos.x+gl.size.x, start_y);
+
209  verts[i+2].position = math::vector_t(Pos.x+gl.size.x, start_y+gl.size.y);
+
210  verts[i+3].position = math::vector_t(Pos.x, start_y+gl.size.y);
+
211 
+
212  // The glyph textures are stored upside-down, so we set the texture
+
213  // coordinates to flip them back appropriately.
+
214  verts[i].tc = math::vector_t(0, 0);
+
215  verts[i+1].tc = math::vector_t(1, 0);
+
216  verts[i+2].tc = math::vector_t(1, 1);
+
217  verts[i+3].tc = math::vector_t(0, 1);
+
218 
+
219  // Uniform font color.
+
220  for(size_t j = i; j < i + 4; ++j) verts[j].color = m_Color;
+
221 
+
222  // Calculate index starting point. Since 6 indices per vertex,
+
223  // we do i / 4 (since 4 iterations per vertex) to get the
+
224  // vertex number, and * 6 to get to the first index for it.
+
225  int x = (i >> 2) * 6;
+
226 
+
227  // Standard quad indices.
+
228  inds[x] = i;
+
229  inds[x+1] = i + 1;
+
230  inds[x+2] = i + 3;
+
231  inds[x+3] = i + 3;
+
232  inds[x+4] = i + 2;
+
233  inds[x+5] = i + 1;
+
234 
+
235  // Track total dimensions.
+
236  tmp_tx += math::max(gl.size.x, gl.advance);
+
237  totals.y = math::max<uint16_t>(totals.y, start_y + gl.size.y);
+
238 
+
239  // Increment position for the next glyph.
+
240  Pos.x += gl.advance;
+
241  }
+
242 
+
243  totals.x = math::max(tmp_tx, totals.x);
244 
-
245  totals.x = math::max(tmp_tx, totals.x);
-
246 
-
247  // Render all of the loaded data onto a texture,
-
248  // then assign that texture to the entity.
-
249  gfxcore::DrawBatch D;
-
250  gfxcore::zVertexArray VAO(GL_STATIC_DRAW);
-
251  gfx::zRenderTarget FBO(totals.x, totals.y);
-
252 
-
253  D.Vertices = verts;
-
254  D.vcount = vlen;
-
255  D.Indices = inds;
-
256  D.icount = ilen;
-
257 
-
258  if(!(VAO.Init() && FBO.Init()))
-
259  {
-
260  delete[] verts;
-
261  delete[] inds;
-
262  return false;
-
263  }
-
264 
-
265  VAO.AddData(D);
-
266  VAO.Offload();
-
267 
-
268  VAO.Bind();
-
269  FBO.Bind();
-
270 
-
271  s_FontFx->Enable();
-
272  s_FontFx->SetParameter("proj", gfxcore::zRenderer::GetProjectionMatrix());
-
273 
-
274  bool blend = gfxcore::zRenderer::BlendOperation(
-
275  gfxcore::BlendFunc::IS_ENABLED);
+
245  // Render all of the loaded data onto a texture,
+
246  // then assign that texture to the entity.
+
247  gfxcore::DrawBatch D;
+
248  gfxcore::zVertexArray VAO(GL_STATIC_DRAW);
+
249  gfx::zRenderTarget FBO(totals.x, totals.y);
+
250 
+
251  D.Vertices = verts;
+
252  D.vcount = vlen;
+
253  D.Indices = inds;
+
254  D.icount = ilen;
+
255 
+
256  if(!(VAO.Init() && FBO.Init()))
+
257  {
+
258  delete[] verts;
+
259  delete[] inds;
+
260  return false;
+
261  }
+
262 
+
263  VAO.AddData(D);
+
264  VAO.Offload();
+
265 
+
266  VAO.Bind();
+
267  FBO.Bind();
+
268 
+
269  s_FontFx->Enable();
+
270  s_FontFx->SetParameter("proj", gfxcore::zRenderer::GetProjectionMatrix());
+
271 
+
272  bool blend = gfxcore::zRenderer::BlendOperation(
+
273  gfxcore::BlendFunc::IS_ENABLED);
+
274 
+
275  gfxcore::zRenderer::BlendOperation(gfxcore::BlendFunc::STANDARD_BLEND);
276 
-
277  gfxcore::zRenderer::BlendOperation(gfxcore::BlendFunc::STANDARD_BLEND);
-
278 
-
279  for(size_t i = 0, j = text.length(); i < j; ++i)
-
280  {
-
281  // Render each character (skip if unrenderable or no effect).
-
282  if(text[i] > '~' || text[i] <= ' ') continue;
-
283 
-
284  const glyph_t& g = m_glyphData.find(text[i]) == m_glyphData.end() ?
-
285  m_glyphData.find('?')->second :
-
286  m_glyphData.find(text[i])->second;
-
287 
-
288  g.texture->Bind();
-
289  GL(glDrawElements(GL_TRIANGLES, 6, gfxcore::INDEX_TYPE,
-
290  (void*)(sizeof(gfxcore::index_t) * i * 6)));
-
291  }
-
292 
-
293  FBO.Unbind();
-
294  gfxcore::zRenderer::ResetMaterialState();
-
295 
-
296  // Only disable blending if it wasn't enabled prior to calling
-
297  // this method (checked above).
-
298  if(!blend) gfxcore::zRenderer::BlendOperation(
-
299  gfxcore::BlendFunc::DISABLE_BLEND);
-
300 
-
301  // Now the string has been rendered to the FBO texture, so all we need to
-
302  // do is create a material and attach it to the quad.
-
303 
-
304  // Create a texture wrapper from the texture handle in the FBO.
-
305  Texture.CopyFromExisting(FBO.GetTexture());
-
306 
-
307  delete[] verts;
-
308  delete[] inds;
-
309 
-
310  return FBO.Destroy() && VAO.Destroy();
-
311 }
-
312 
-
313 void zFont::ClearString()
-
314 {
-
315  m_str.str(std::string());
-
316 }
-
317 
-
318 bool zFont::Destroy()
-
319 {
-
320  m_size = 18;
-
321  for(auto i : m_glyphData)
-
322  mp_Assets->Delete(i.second.texture);
-
323  m_glyphData.clear();
-
324  this->ClearString();
-
325  return true;
-
326 }
-
327 
-
328 bool zFont::LoadGlyph(const char c, const uint16_t index)
-
329 {
-
330  ZEN_ASSERTM(mp_Assets != nullptr, "an asset manager must be attached");
-
331  FT_Glyph g;
-
332 
-
333  // Render as a monochrome bitmap into glyph struct.
-
334  FT_Load_Glyph(m_FontFace, index, FT_LOAD_RENDER);
-
335  FT_Render_Glyph(m_FontFace->glyph, FT_RENDER_MODE_NORMAL);
-
336  FT_Get_Glyph(m_FontFace->glyph, &g);
-
337 
-
338  // Minor shortcuts.
-
339  FT_GlyphSlot slot = m_FontFace->glyph;
-
340  FT_Bitmap& bitmap = slot->bitmap;
-
341 
-
342  // Shortcut to dimensions.
-
343  uint32_t w = bitmap.width;
-
344  uint32_t h = bitmap.rows;
-
345 
-
346  if(w == 0 || h == 0)
-
347  {
-
348  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
-
349  << "No character bitmap for '" << c << '\'' << zLog::endl;
-
350  }
-
351 
-
352  // Create the OpenGL texture and store the FreeType bitmap
-
353  // in it as a monochrome texture.
-
354 
-
355  // Store for restoring later.
-
356  GLint pack;
-
357  GL(glGetIntegerv(GL_UNPACK_ALIGNMENT, &pack));
-
358  GL(glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
-
359 
-
360  gfxcore::zTexture* pTexture = mp_Assets->Create<gfxcore::zTexture>(this->GetOwner());
-
361  pTexture->LoadFromRaw(GL_R8, GL_RED, w, h, bitmap.buffer);
-
362  std::stringstream ss;
-
363  ss << 's' << m_size << " bitmap for '" << c
-
364  << "'; " << util::string_hash(m_filename);
-
365  pTexture->SetFilename(ss.str());
+
277  for(size_t i = 0, j = text.length(); i < j; ++i)
+
278  {
+
279  // Render each character (skip if unrenderable or no effect).
+
280  if(text[i] > '~' || text[i] <= ' ') continue;
+
281 
+
282  const glyph_t& g = m_glyphData.find(text[i]) == m_glyphData.end() ?
+
283  m_glyphData.find('?')->second :
+
284  m_glyphData.find(text[i])->second;
+
285 
+
286  g.texture->Bind();
+
287  GL(glDrawElements(GL_TRIANGLES, 6, gfxcore::INDEX_TYPE,
+
288  (void*)(sizeof(gfxcore::index_t) * i * 6)));
+
289  }
+
290 
+
291  FBO.Unbind();
+
292  gfxcore::zRenderer::ResetMaterialState();
+
293 
+
294  // Only disable blending if it wasn't enabled prior to calling
+
295  // this method (checked above).
+
296  if(!blend) gfxcore::zRenderer::BlendOperation(
+
297  gfxcore::BlendFunc::DISABLE_BLEND);
+
298 
+
299  // Now the string has been rendered to the FBO texture, so all we need to
+
300  // do is create a material and attach it to the quad.
+
301 
+
302  // Create a texture wrapper from the texture handle in the FBO.
+
303  Texture.CopyFromExisting(FBO.GetTexture());
+
304 
+
305  delete[] verts;
+
306  delete[] inds;
+
307 
+
308  return FBO.Destroy() && VAO.Destroy();
+
309 }
+
310 
+
311 void zFont::ClearString()
+
312 {
+
313  m_str.str(std::string());
+
314 }
+
315 
+
316 bool zFont::Destroy()
+
317 {
+
318  m_size = 18;
+
319  for(auto i : m_glyphData)
+
320  mp_Assets->Delete(i.second.texture);
+
321  m_glyphData.clear();
+
322  this->ClearString();
+
323  return true;
+
324 }
+
325 
+
326 bool zFont::LoadGlyph(const char c, const uint16_t index)
+
327 {
+
328  ZEN_ASSERTM(mp_Assets != nullptr, "an asset manager must be attached");
+
329  FT_Glyph g;
+
330 
+
331  // Render as a monochrome bitmap into glyph struct.
+
332  FT_Load_Glyph(m_FontFace, index, FT_LOAD_RENDER);
+
333  FT_Render_Glyph(m_FontFace->glyph, FT_RENDER_MODE_NORMAL);
+
334  FT_Get_Glyph(m_FontFace->glyph, &g);
+
335 
+
336  // Minor shortcuts.
+
337  FT_GlyphSlot slot = m_FontFace->glyph;
+
338  FT_Bitmap& bitmap = slot->bitmap;
+
339 
+
340  // Shortcut to dimensions.
+
341  uint32_t w = bitmap.width;
+
342  uint32_t h = bitmap.rows;
+
343 
+
344  if(w == 0 || h == 0)
+
345  {
+
346  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
+
347  << "No character bitmap for '" << c << '\'' << zLog::endl;
+
348  }
+
349 
+
350  // Create the OpenGL texture and store the FreeType bitmap
+
351  // in it as a monochrome texture.
+
352 
+
353  // Store for restoring later.
+
354  GLint pack;
+
355  GL(glGetIntegerv(GL_UNPACK_ALIGNMENT, &pack));
+
356  GL(glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
+
357 
+
358  gfxcore::zTexture* pTexture = mp_Assets->Create<gfxcore::zTexture>(this->GetOwner());
+
359  pTexture->LoadFromRaw(GL_R8, GL_RED, w, h, bitmap.buffer);
+
360  std::stringstream ss;
+
361  ss << 's' << m_size << " bitmap for '" << c
+
362  << "'; " << util::string_hash(m_filename);
+
363  pTexture->SetFilename(ss.str());
+
364 
+
365  GL(glPixelStorei(GL_UNPACK_ALIGNMENT, pack));
366 
-
367  GL(glPixelStorei(GL_UNPACK_ALIGNMENT, pack));
-
368 
-
369  // Store the glyph internally.
-
370  glyph_t glyph;
-
371  glyph.texture = pTexture;
-
372  glyph.size = math::zVector<uint32_t>(w, h);
-
373  glyph.position = math::zVector<int32_t>(slot->metrics.horiBearingX >> 6,
-
374  slot->metrics.horiBearingY >> 6);
-
375  glyph.advance = slot->advance.x >> 6;
-
376  m_glyphData[c] = glyph;
-
377 
-
378  // Clean up TTF data.
-
379  FT_Done_Glyph(g);
-
380 
-
381  return true;
-
382 }
-
383 
-
384 bool zFont::AttachManager(asset::zAssetManager& Assets)
-
385 {
-
386  mp_Assets = &Assets;
-
387  if(s_FontFx == nullptr)
-
388  {
-
389  s_FontFx = new gfx::zEffect(gfx::EffectType::ZFONT, Assets);
-
390  if(!s_FontFx->Init())
-
391  {
-
392  delete s_FontFx;
-
393  s_FontFx = nullptr;
-
394  return false;
-
395  }
-
396 
-
397  s_FontFx->Enable();
-
398  s_FontFx->SetParameter("proj", gfxcore::zRenderer::GetProjectionMatrix());
-
399  s_FontFx->SetParameter("mv", math::matrix4x4_t::GetIdentityMatrix());
-
400  s_FontFx->Disable();
-
401  }
-
402 
-
403  return true;
-
404 }
-
405 
-
406 void zFont::SetColor(const color4f_t& Color)
-
407 {
-
408  m_Color = Color;
-
409 }
-
410 
-
411 void zFont::SetStacking(const bool flag)
-
412 {
-
413  m_stack = flag;
+
367  // Store the glyph internally.
+
368  glyph_t glyph;
+
369  glyph.texture = pTexture;
+
370  glyph.size = math::zVector<uint32_t>(w, h);
+
371  glyph.position = math::zVector<int32_t>(slot->metrics.horiBearingX >> 6,
+
372  slot->metrics.horiBearingY >> 6);
+
373  glyph.advance = slot->advance.x >> 6;
+
374  m_glyphData[c] = glyph;
+
375 
+
376  // Clean up TTF data.
+
377  FT_Done_Glyph(g);
+
378 
+
379  return true;
+
380 }
+
381 
+
382 bool zFont::AttachManager(asset::zAssetManager& Assets)
+
383 {
+
384  mp_Assets = &Assets;
+
385  if(s_FontFx == nullptr)
+
386  {
+
387  s_FontFx = new gfx::zEffect(gfx::EffectType::ZFONT, Assets);
+
388  if(!s_FontFx->Init())
+
389  {
+
390  delete s_FontFx;
+
391  s_FontFx = nullptr;
+
392  return false;
+
393  }
+
394 
+
395  s_FontFx->Enable();
+
396  s_FontFx->SetParameter("proj", gfxcore::zRenderer::GetProjectionMatrix());
+
397  s_FontFx->SetParameter("mv", math::matrix4x4_t::GetIdentityMatrix());
+
398  s_FontFx->Disable();
+
399  }
+
400 
+
401  return true;
+
402 }
+
403 
+
404 void zFont::SetColor(const color4f_t& Color)
+
405 {
+
406  m_Color = Color;
+
407 }
+
408 
+
409 void zFont::SetColor(const real_t r, const real_t g, const real_t b)
+
410 {
+
411  m_Color.r = r;
+
412  m_Color.g = g;
+
413  m_Color.b = b;
414 }
415 
-
416 uint16_t zFont::GetTextWidth(const string_t& text) const
-
417 {
-
418  if(text.empty()) return 0;
-
419 
-
420  uint16_t w = 0, tmp_w = 0;
-
421  uint16_t l = text.length();
-
422 
-
423  for(size_t i = 0; i < l; ++i)
-
424  {
-
425  if(text[i] == '\n')
-
426  {
-
427  w = math::max<uint16_t>(w, tmp_w);
-
428  tmp_w = 0;
-
429  }
-
430  else
+
416 void zFont::SetStacking(const bool flag)
+
417 {
+
418  m_stack = flag;
+
419 }
+
420 
+
421 uint16_t zFont::GetTextWidth(const string_t& text) const
+
422 {
+
423  if(text.empty()) return 0;
+
424 
+
425  uint16_t w = 0, tmp_w = 0;
+
426  uint16_t l = text.length();
+
427 
+
428  for(size_t i = 0; i < l; ++i)
+
429  {
+
430  if(text[i] == '\n')
431  {
-
432  const auto it = m_glyphData.find(text[i]);
-
433  if(it != m_glyphData.end())
-
434  {
-
435  tmp_w += math::max<uint16_t>(it->second.size.x,
-
436  it->second.advance);
-
437  }
-
438  }
-
439  }
-
440 
-
441  return math::max<uint16_t>(w, tmp_w);
-
442 }
-
443 
-
444 uint16_t zFont::GetTextHeight(const string_t& text) const
-
445 {
-
446  if(text.empty()) return 0;
-
447 
-
448  uint16_t lines = 1;
-
449  uint16_t h = 0, tmp_h = 0;
-
450 
-
451  for(auto& i : text)
-
452  {
-
453  if(i == '\n')
-
454  {
-
455  h = math::max(h, tmp_h);
-
456  tmp_h = 0;
-
457  }
-
458  else
-
459  {
-
460  const auto g = m_glyphData.find(i);
-
461  tmp_h = math::max<uint16_t>(
-
462  g->second.size.y + g->second.position.y, tmp_h);
-
463  }
-
464  }
-
465 
-
466  return math::max(h, tmp_h);
-
467 }
+
432  w = math::max<uint16_t>(w, tmp_w);
+
433  tmp_w = 0;
+
434  }
+
435  else
+
436  {
+
437  const auto it = m_glyphData.find(text[i]);
+
438  if(it != m_glyphData.end())
+
439  {
+
440  tmp_w += math::max<uint16_t>(it->second.size.x,
+
441  it->second.advance);
+
442  }
+
443  }
+
444  }
+
445 
+
446  return math::max<uint16_t>(w, tmp_w);
+
447 }
+
448 
+
449 uint16_t zFont::GetTextHeight(const string_t& text) const
+
450 {
+
451  if(text.empty()) return 0;
+
452 
+
453  uint16_t h = 0, tmp_h = 0;
+
454  for(auto& i : text)
+
455  {
+
456  if(i == '\n')
+
457  {
+
458  h = math::max(h, tmp_h);
+
459  tmp_h = 0;
+
460  }
+
461  else
+
462  {
+
463  const auto g = m_glyphData.find(i);
+
464  tmp_h = math::max<uint16_t>(
+
465  g->second.size.y + g->second.position.y, tmp_h);
+
466  }
+
467  }
+
468 
+
469  return math::max(h, tmp_h);
+
470 }
diff --git a/docs/_font_8hpp.html b/docs/_font_8hpp.html index 663f401a..9f1dcae1 100644 --- a/docs/_font_8hpp.html +++ b/docs/_font_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,14 +129,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_font_8hpp__dep__incl.map b/docs/_font_8hpp__dep__incl.map index e2a4ba52..2639aa09 100644 --- a/docs/_font_8hpp__dep__incl.map +++ b/docs/_font_8hpp__dep__incl.map @@ -1,12 +1,13 @@ - - - - - - + + + + + + - - + + + diff --git a/docs/_font_8hpp__dep__incl.png b/docs/_font_8hpp__dep__incl.png index dd4a3abc..ef606097 100644 Binary files a/docs/_font_8hpp__dep__incl.png and b/docs/_font_8hpp__dep__incl.png differ diff --git a/docs/_font_8hpp__incl.map b/docs/_font_8hpp__incl.map index 3b4ba8b7..c2fdcb13 100644 --- a/docs/_font_8hpp__incl.map +++ b/docs/_font_8hpp__incl.map @@ -1,31 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_font_8hpp__incl.png b/docs/_font_8hpp__incl.png index 53f0c6f4..0ecdc37c 100644 Binary files a/docs/_font_8hpp__incl.png and b/docs/_font_8hpp__incl.png differ diff --git a/docs/_font_8hpp_source.html b/docs/_font_8hpp_source.html index 3e3b623e..2c95bba7 100644 --- a/docs/_font_8hpp_source.html +++ b/docs/_font_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -161,46 +161,47 @@
153  bool AttachManager(asset::zAssetManager& Assets);
154 
156  void SetColor(const color4f_t& Color);
-
157 
-
159  void SetSize(const uint16_t size) { m_size = size; }
-
160 
-
162  void SetStacking(const bool flag);
-
163 
-
164  uint16_t GetTextWidth(const string_t& text) const;
-
165  uint16_t GetTextHeight(const string_t& text) const;
-
166  uint16_t GetLineHeight() const { return m_height; }
-
167 
-
168  friend class ZEN_API asset::zAssetManager;
-
169 
-
170  private:
-
171  zFont(const void* const owner = nullptr);
-
172  zFont& operator=(const zFont& F);
-
173 
-
174  bool Destroy();
-
175  bool LoadGlyph(const char c, const uint16_t index);
-
176 
-
178  void RenderLine(const string_t& line,
-
179  const math::vectoru16_t& start,
-
180  gfxcore::vertex_t* verts,
-
181  gfxcore::index_t* inds);
-
182 
-
183  asset::zAssetManager* mp_Assets;
-
184  static gfx::zEffect* s_FontFx;
-
185  color4f_t m_Color;
-
186  FT_Face m_FontFace;
-
187 
-
188  std::map<char, glyph_t> m_glyphData;
-
189  std::stringstream m_str;
-
190 
-
191  uint16_t m_size;
-
192  uint16_t m_height;
-
193  bool m_stack;
-
194  };
-
195 } // namespace gfx
-
196 } // namespace zen
-
197 
-
198 #endif // ZENDERER__CORE_GRAPHICS__FONT_HPP
-
199 
+
157  void SetColor(const real_t r, const real_t g, const real_t b);
+
158 
+
160  void SetSize(const uint16_t size) { m_size = size; }
+
161 
+
163  void SetStacking(const bool flag);
+
164 
+
165  uint16_t GetTextWidth(const string_t& text) const;
+
166  uint16_t GetTextHeight(const string_t& text) const;
+
167  uint16_t GetLineHeight() const { return m_height; }
+
168 
+
169  friend class ZEN_API asset::zAssetManager;
+
170 
+
171  private:
+
172  zFont(const void* const owner = nullptr);
+
173  zFont& operator=(const zFont& F);
+
174 
+
175  bool Destroy();
+
176  bool LoadGlyph(const char c, const uint16_t index);
+
177 
+
179  void RenderLine(const string_t& line,
+
180  const math::vectoru16_t& start,
+
181  gfxcore::vertex_t* verts,
+
182  gfxcore::index_t* inds);
+
183 
+
184  asset::zAssetManager* mp_Assets;
+
185  static gfx::zEffect* s_FontFx;
+
186  color4f_t m_Color;
+
187  FT_Face m_FontFace;
+
188 
+
189  std::map<char, glyph_t> m_glyphData;
+
190  std::stringstream m_str;
+
191 
+
192  uint16_t m_size;
+
193  uint16_t m_height;
+
194  bool m_stack;
+
195  };
+
196 } // namespace gfx
+
197 } // namespace zen
+
198 
+
199 #endif // ZENDERER__CORE_GRAPHICS__FONT_HPP
+
200 
diff --git a/docs/_font_atlas_8hpp.html b/docs/_font_atlas_8hpp.html index 646ef842..404c4b11 100644 --- a/docs/_font_atlas_8hpp.html +++ b/docs/_font_atlas_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -126,7 +126,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_font_atlas_8hpp__incl.map b/docs/_font_atlas_8hpp__incl.map index 172b8f8a..970d4fb5 100644 --- a/docs/_font_atlas_8hpp__incl.map +++ b/docs/_font_atlas_8hpp__incl.map @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_font_atlas_8hpp__incl.png b/docs/_font_atlas_8hpp__incl.png index bb082695..8beac488 100644 Binary files a/docs/_font_atlas_8hpp__incl.png and b/docs/_font_atlas_8hpp__incl.png differ diff --git a/docs/_font_atlas_8hpp_source.html b/docs/_font_atlas_8hpp_source.html index 2ccfc5f0..f7008721 100644 --- a/docs/_font_atlas_8hpp_source.html +++ b/docs/_font_atlas_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_font_core_8hpp.html b/docs/_font_core_8hpp.html index ed8667cf..005fc74e 100644 --- a/docs/_font_core_8hpp.html +++ b/docs/_font_core_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -127,14 +127,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_font_core_8hpp__dep__incl.map b/docs/_font_core_8hpp__dep__incl.map index 3b7a045b..ee4e93ea 100644 --- a/docs/_font_core_8hpp__dep__incl.map +++ b/docs/_font_core_8hpp__dep__incl.map @@ -1,14 +1,15 @@ - - - - - - - - + + + + + + + + - - + + + diff --git a/docs/_font_core_8hpp__dep__incl.png b/docs/_font_core_8hpp__dep__incl.png index e9e55508..d93356ea 100644 Binary files a/docs/_font_core_8hpp__dep__incl.png and b/docs/_font_core_8hpp__dep__incl.png differ diff --git a/docs/_font_core_8hpp__incl.map b/docs/_font_core_8hpp__incl.map index 68c49409..84c81ff7 100644 --- a/docs/_font_core_8hpp__incl.map +++ b/docs/_font_core_8hpp__incl.map @@ -1,18 +1,20 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/_font_core_8hpp__incl.png b/docs/_font_core_8hpp__incl.png index d2f73a5a..cea1eeed 100644 Binary files a/docs/_font_core_8hpp__incl.png and b/docs/_font_core_8hpp__incl.png differ diff --git a/docs/_font_core_8hpp_source.html b/docs/_font_core_8hpp_source.html index db029d3d..99aed229 100644 --- a/docs/_font_core_8hpp_source.html +++ b/docs/_font_core_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_fonts-example.html b/docs/_fonts-example.html index 1baa401e..b1f78a49 100644 --- a/docs/_fonts-example.html +++ b/docs/_fonts-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_helpers_8cpp.html b/docs/_helpers_8cpp.html index 4bb89001..d23fa86c 100644 --- a/docs/_helpers_8cpp.html +++ b/docs/_helpers_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_helpers_8cpp.js b/docs/_helpers_8cpp.js deleted file mode 100644 index a1dbaa00..00000000 --- a/docs/_helpers_8cpp.js +++ /dev/null @@ -1,5 +0,0 @@ -var _helpers_8cpp = -[ - [ "strip", "_helpers_8cpp.html#a5cf1868cee4ac9e791c21dafb8cd99dc", null ], - [ "strip", "_helpers_8cpp.html#a9f3bbb6e37795c9c5392ef3f36a458e7", null ] -]; \ No newline at end of file diff --git a/docs/_helpers_8cpp_source.html b/docs/_helpers_8cpp_source.html index f65a352e..7df9d2e8 100644 --- a/docs/_helpers_8cpp_source.html +++ b/docs/_helpers_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -140,13 +140,13 @@
29 {
30  if(!text.empty())
31  text = text.substr(text.find_first_not_of(" \t"),
-
32  text.find_last_not_of (" \t"));
+
32  text.find_last_not_of (" \t")+1);
33 }
34 
35 string_t util::strip(const string_t& text)
36 {
37  return !text.empty() ? text.substr(text.find_first_not_of(" \t"),
-
38  text.find_last_not_of (" \t"))
+
38  text.find_last_not_of (" \t")+1)
39  : text;
40 }
41 
diff --git a/docs/_helpers_8hpp.html b/docs/_helpers_8hpp.html index 3236cc3f..051836c1 100644 --- a/docs/_helpers_8hpp.html +++ b/docs/_helpers_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -131,7 +131,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_helpers_8hpp__dep__incl.map b/docs/_helpers_8hpp__dep__incl.map index 68aa7f00..50d97e04 100644 --- a/docs/_helpers_8hpp__dep__incl.map +++ b/docs/_helpers_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_helpers_8hpp__dep__incl.png b/docs/_helpers_8hpp__dep__incl.png index 25840336..4381abe3 100644 Binary files a/docs/_helpers_8hpp__dep__incl.png and b/docs/_helpers_8hpp__dep__incl.png differ diff --git a/docs/_helpers_8hpp_source.html b/docs/_helpers_8hpp_source.html index 3822b53f..7cd856f1 100644 --- a/docs/_helpers_8hpp_source.html +++ b/docs/_helpers_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_i_n_i_parser_8cpp.html b/docs/_i_n_i_parser_8cpp.html index 2b42dab7..c2e1c971 100644 --- a/docs/_i_n_i_parser_8cpp.html +++ b/docs/_i_n_i_parser_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_i_n_i_parser_8cpp_source.html b/docs/_i_n_i_parser_8cpp_source.html index c2863b5f..b76699d4 100644 --- a/docs/_i_n_i_parser_8cpp_source.html +++ b/docs/_i_n_i_parser_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_i_n_i_parser_8hpp.html b/docs/_i_n_i_parser_8hpp.html index 40b68ba8..0fb2eb62 100644 --- a/docs/_i_n_i_parser_8hpp.html +++ b/docs/_i_n_i_parser_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -136,7 +136,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_i_n_i_parser_8hpp__dep__incl.map b/docs/_i_n_i_parser_8hpp__dep__incl.map index adb71ada..4dd1c756 100644 --- a/docs/_i_n_i_parser_8hpp__dep__incl.map +++ b/docs/_i_n_i_parser_8hpp__dep__incl.map @@ -1,45 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_i_n_i_parser_8hpp__dep__incl.png b/docs/_i_n_i_parser_8hpp__dep__incl.png index 08fd9b8e..f10d6ac8 100644 Binary files a/docs/_i_n_i_parser_8hpp__dep__incl.png and b/docs/_i_n_i_parser_8hpp__dep__incl.png differ diff --git a/docs/_i_n_i_parser_8hpp_source.html b/docs/_i_n_i_parser_8hpp_source.html index 790a6e6d..c650beea 100644 --- a/docs/_i_n_i_parser_8hpp_source.html +++ b/docs/_i_n_i_parser_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_i_n_i_parser_8inl.html b/docs/_i_n_i_parser_8inl.html index 7c72e044..90881d85 100644 --- a/docs/_i_n_i_parser_8inl.html +++ b/docs/_i_n_i_parser_8inl.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_i_n_i_parser_8inl__dep__incl.map b/docs/_i_n_i_parser_8inl__dep__incl.map index d9e3380c..5b54869e 100644 --- a/docs/_i_n_i_parser_8inl__dep__incl.map +++ b/docs/_i_n_i_parser_8inl__dep__incl.map @@ -1,46 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_i_n_i_parser_8inl__dep__incl.png b/docs/_i_n_i_parser_8inl__dep__incl.png index a2be3eb8..5d69247f 100644 Binary files a/docs/_i_n_i_parser_8inl__dep__incl.png and b/docs/_i_n_i_parser_8inl__dep__incl.png differ diff --git a/docs/_i_n_i_parser_8inl_source.html b/docs/_i_n_i_parser_8inl_source.html index 7e3750e7..e36c858d 100644 --- a/docs/_i_n_i_parser_8inl_source.html +++ b/docs/_i_n_i_parser_8inl_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_keyboard_8hpp.html b/docs/_keyboard_8hpp.html index 2411b16d..f234fa9c 100644 --- a/docs/_keyboard_8hpp.html +++ b/docs/_keyboard_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -122,7 +122,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_keyboard_8hpp__dep__incl.map b/docs/_keyboard_8hpp__dep__incl.map index 0a44df33..8c9d4c66 100644 --- a/docs/_keyboard_8hpp__dep__incl.map +++ b/docs/_keyboard_8hpp__dep__incl.map @@ -1,30 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_keyboard_8hpp__dep__incl.png b/docs/_keyboard_8hpp__dep__incl.png index 3de1579e..b58f3fea 100644 Binary files a/docs/_keyboard_8hpp__dep__incl.png and b/docs/_keyboard_8hpp__dep__incl.png differ diff --git a/docs/_keyboard_8hpp_source.html b/docs/_keyboard_8hpp_source.html index c6d322c0..ebb980d6 100644 --- a/docs/_keyboard_8hpp_source.html +++ b/docs/_keyboard_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -122,7 +122,7 @@
32  #undef DELETE
33 #endif // DELETE
34 
-
36  enum class ZEN_API Key
+
36  enum class ZEN_API Key : int16_t
37  {
38  // Punctuation
39  UNKNOWN = -1,
diff --git a/docs/_level_8hpp.html b/docs/_level_8hpp.html index 9c080a95..f77cc317 100644 --- a/docs/_level_8hpp.html +++ b/docs/_level_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,8 @@
Data Structures | Namespaces | -Constant Groups
+Constant Groups | +Enumerations
Level.hpp File Reference
@@ -125,14 +126,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

@@ -161,6 +162,14 @@    zen::lvl   + + + +

+Enumerations

enum  zen::lvl::SpawnType { zen::lvl::SpawnType::PLAYER_SPAWN, +zen::lvl::SpawnType::ENEMY_SPAWN, +zen::lvl::SpawnType::ITEM_SPAWN + }
 

Detailed Description

Author
George Kudrayvtsev (halcyon)
@@ -186,10 +195,16 @@
-

Definition at line 40 of file Level.hpp.

+

Definition at line 47 of file Level.hpp.

+ + + @@ -221,7 +236,7 @@
Data Fields
+SpawnType +type +
vector_t position
-

Definition at line 47 of file Level.hpp.

+

Definition at line 55 of file Level.hpp.

Data Fields
@@ -250,7 +265,7 @@
-

Definition at line 53 of file Level.hpp.

+

Definition at line 61 of file Level.hpp.

+ + + diff --git a/docs/_level_8hpp.js b/docs/_level_8hpp.js new file mode 100644 index 00000000..1ba2047f --- /dev/null +++ b/docs/_level_8hpp.js @@ -0,0 +1,26 @@ +var _level_8hpp = +[ + [ "spawn_t", "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1spawn__t", [ + [ "type", "namespacezen_1_1lvl.html#ab23ca0d4cd1931da4928a4411d8c921b", null ], + [ "position", "namespacezen_1_1lvl.html#a485dcd48c31a1cbedf472dd04d2148ab", null ], + [ "whitelist", "namespacezen_1_1lvl.html#a5072412ea19f98b884c3c4e09bb481bd", null ], + [ "blacklist", "namespacezen_1_1lvl.html#a4465479c53f0a8cd38ce315f20f5c024", null ] + ] ], + [ "metalevel_t", "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1metalevel__t", [ + [ "author", "namespacezen_1_1lvl.html#a13d0fd7c54ce90543b9ef634500fceaf", null ], + [ "description", "namespacezen_1_1lvl.html#a3705ac2a95924b36fcc162b183b6b350", null ] + ] ], + [ "level_t", "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1level__t", [ + [ "metadata", "namespacezen_1_1lvl.html#ab468f1c84927f9cff5a72f8b8f9fba2a", null ], + [ "spawnpoints", "namespacezen_1_1lvl.html#a20532f985031396ba3bb0fbdd8b6deac", null ], + [ "entities", "namespacezen_1_1lvl.html#a75e632ff82a8efeea13536f34416bde4", null ], + [ "physical", "namespacezen_1_1lvl.html#ad7d3e124aedb66291a07f84ca038391d", null ], + [ "lights", "namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39", null ], + [ "valid", "namespacezen_1_1lvl.html#ab19c575a197ebaa8853515c925605461", null ] + ] ], + [ "SpawnType", "_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8a", [ + [ "PLAYER_SPAWN", "_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8aaefeaff06f16214cf788e86a06c8d8c5b", null ], + [ "ENEMY_SPAWN", "_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8aa085bbb81788460fa0339067cc87c5c75", null ], + [ "ITEM_SPAWN", "_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8aa88073cc0d7023b0889799817211b0859", null ] + ] ] +]; \ No newline at end of file diff --git a/docs/_level_8hpp__dep__incl.map b/docs/_level_8hpp__dep__incl.map index 7e9670ef..d0a5816b 100644 --- a/docs/_level_8hpp__dep__incl.map +++ b/docs/_level_8hpp__dep__incl.map @@ -1,8 +1,9 @@ - - + + - - + + + diff --git a/docs/_level_8hpp__dep__incl.png b/docs/_level_8hpp__dep__incl.png index dce5d5cc..5e79e77e 100644 Binary files a/docs/_level_8hpp__dep__incl.png and b/docs/_level_8hpp__dep__incl.png differ diff --git a/docs/_level_8hpp__incl.map b/docs/_level_8hpp__incl.map index 28092b56..c14eacaa 100644 --- a/docs/_level_8hpp__incl.map +++ b/docs/_level_8hpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_level_8hpp__incl.png b/docs/_level_8hpp__incl.png index 2fe134c7..b7692990 100644 Binary files a/docs/_level_8hpp__incl.png and b/docs/_level_8hpp__incl.png differ diff --git a/docs/_level_8hpp_source.html b/docs/_level_8hpp_source.html index 0b24cb1d..d28be83d 100644 --- a/docs/_level_8hpp_source.html +++ b/docs/_level_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,32 +123,41 @@
37 {
38 namespace lvl
39 {
-
40  struct spawn_t
+
40  enum class SpawnType
41  {
-
42  math::vector_t position;
-
43  std::vector<string_t> whitelist;
-
44  std::vector<string_t> blacklist;
+
42  PLAYER_SPAWN,
+
43  ENEMY_SPAWN,
+
44  ITEM_SPAWN
45  };
46 
-
47  struct metalevel_t
+
47  struct spawn_t
48  {
-
49  string_t author;
-
50  string_t description;
-
51  };
-
52 
-
53  struct level_t
-
54  {
-
55  metalevel_t metadata;
-
56  std::vector<spawn_t> spawnpoints;
-
57  std::vector<obj::zEntity*> entities;
-
58  std::vector<gfx::zLight*> lights;
-
59  bool valid;
-
60  };
-
61 }
-
62 }
-
63 
-
64 #endif // ZENDERER__LEVELS__LEVEL_HPP
-
65 
+
49  SpawnType type;
+
50  math::vector_t position;
+
51  std::vector<string_t> whitelist;
+
52  std::vector<string_t> blacklist;
+
53  };
+
54 
+
55  struct metalevel_t
+
56  {
+
57  string_t author;
+
58  string_t description;
+
59  };
+
60 
+
61  struct level_t
+
62  {
+
63  metalevel_t metadata;
+
64  std::vector<spawn_t> spawnpoints;
+
65  std::vector<obj::zEntity*> entities;
+
66  std::vector<obj::zEntity*> physical;
+
67  std::vector<gfx::zLight*> lights;
+
68  bool valid;
+
69  };
+
70 }
+
71 }
+
72 
+
73 #endif // ZENDERER__LEVELS__LEVEL_HPP
+
74 
diff --git a/docs/_level_loader_8hpp.html b/docs/_level_loader_8hpp.html index 4e48ab36..36a0c566 100644 --- a/docs/_level_loader_8hpp.html +++ b/docs/_level_loader_8hpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -116,8 +116,9 @@

Zenderer/Levels/LevelLoader.hpp - A loader for Zenderer level files. More...

-
#include "Zenderer/Assets/AssetManager.hpp"
-#include "Zenderer/Graphics/Polygon.hpp"
+
#include <regex>
+#include "Zenderer/Assets/AssetManager.hpp"
+#include "Zenderer/Graphics/ConcavePolygon.hpp"
#include "Zenderer/Graphics/Scene.hpp"
#include "Zenderer/Utilities/Utilities.hpp"
#include "Zenderer/Utilities/FileParser.hpp"
@@ -127,14 +128,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_level_loader_8hpp__dep__incl.map b/docs/_level_loader_8hpp__dep__incl.map index 9071f883..bfaa5f80 100644 --- a/docs/_level_loader_8hpp__dep__incl.map +++ b/docs/_level_loader_8hpp__dep__incl.map @@ -1,7 +1,8 @@ - + - - + + + diff --git a/docs/_level_loader_8hpp__dep__incl.png b/docs/_level_loader_8hpp__dep__incl.png index d30c7051..ea6ee148 100644 Binary files a/docs/_level_loader_8hpp__dep__incl.png and b/docs/_level_loader_8hpp__dep__incl.png differ diff --git a/docs/_level_loader_8hpp__incl.map b/docs/_level_loader_8hpp__incl.map index 99ff64ce..f6343afe 100644 --- a/docs/_level_loader_8hpp__incl.map +++ b/docs/_level_loader_8hpp__incl.map @@ -1,41 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_level_loader_8hpp__incl.png b/docs/_level_loader_8hpp__incl.png index 883a2424..483708d9 100644 Binary files a/docs/_level_loader_8hpp__incl.png and b/docs/_level_loader_8hpp__incl.png differ diff --git a/docs/_level_loader_8hpp_source.html b/docs/_level_loader_8hpp_source.html index 327549ca..d801370a 100644 --- a/docs/_level_loader_8hpp_source.html +++ b/docs/_level_loader_8hpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -113,207 +113,275 @@
22 #ifndef ZENDERER__LEVELS__LEVEL_LOADER_HPP
23 #define ZENDERER__LEVELS__LEVEL_LOADER_HPP
24 
-
25 #include "Zenderer/Assets/AssetManager.hpp"
-
26 #include "Zenderer/Graphics/Polygon.hpp"
-
27 #include "Zenderer/Graphics/Scene.hpp"
-
28 #include "Zenderer/Utilities/Utilities.hpp"
-
29 #include "Zenderer/Utilities/FileParser.hpp"
-
30 #include "Level.hpp"
-
31 
-
32 namespace zen
-
33 {
-
34 namespace lvl
+
25 #include <regex>
+
26 
+
27 #include "Zenderer/Assets/AssetManager.hpp"
+
28 #include "Zenderer/Graphics/ConcavePolygon.hpp"
+
29 #include "Zenderer/Graphics/Scene.hpp"
+
30 #include "Zenderer/Utilities/Utilities.hpp"
+
31 #include "Zenderer/Utilities/FileParser.hpp"
+
32 #include "Level.hpp"
+
33 
+
34 namespace zen
35 {
-
37  class ZEN_API zLevelLoader
-
38  {
-
39  public:
-
40  zLevelLoader(gfx::zScene& Scene, asset::zAssetManager& Assets) :
-
41  m_Scene(Scene), m_Assets(Assets), m_Log(util::zLog::GetEngineLog())
+
36 namespace lvl
+
37 {
+
39  class ZEN_API zLevelLoader
+
40  {
+
41  enum class AttributeType : uint8_t
42  {
-
43  m_levels.clear();
-
44  }
-
45 
-
46  ~zLevelLoader()
-
47  {
-
48  for(auto& i : m_levels)
-
49  {
-
50  for(auto& j : i.lights)
-
51  ;//m_Scene.RemoveLight(j);
-
52 
-
53  for(auto& j : i.entities)
-
54  m_Scene.RemoveEntity(*j);
-
55 
-
56  i.valid = false;
-
57  }
-
58 
-
59  m_levels.clear();
-
60  }
-
61 
-
63  virtual bool LoadFromFile(const string_t& filename)
-
64  {
-
65  std::ifstream file(filename);
-
66  util::zFileParser Parser;
-
67  level_t level;
-
68  string_t line;
+
43  NONE = 0x00,
+
44  PHYSICAL = 0x01,
+
45  INVISIBLE= 0x02,
+
46  ANIMATION= 0x04
+
47  };
+
48 
+
49  public:
+
50  zLevelLoader(gfx::zScene& Scene, asset::zAssetManager& Assets) :
+
51  m_Log(util::zLog::GetEngineLog()),
+
52  m_Scene(Scene), m_Assets(Assets)
+
53  {
+
54  m_levels.clear();
+
55  }
+
56 
+
57  ~zLevelLoader()
+
58  {
+
59  for(auto& i : m_levels)
+
60  {
+
61  for(auto& j : i.lights)
+
62  m_Scene.RemoveLight(*j);
+
63 
+
64  for(auto& j : i.entities)
+
65  m_Scene.RemoveEntity(*j);
+
66 
+
67  i.valid = false;
+
68  }
69 
-
70  level.valid = false;
-
71 
-
72  // The spec. states that the first object tag within a level must
-
73  // be an entity, so we can safely parse everything prior to finding
-
74  // one and consider that to be the metadata.
-
75  Parser.LoadFromStreamUntil(file, "<entity>", 0, filename.c_str());
-
76  level.metadata.author = Parser.GetFirstResult("author");
-
77  level.metadata.description = Parser.GetFirstResult("description");
+
70  m_levels.clear();
+
71  }
+
72 
+
74  virtual bool LoadFromFile(const string_t& filename)
+
75  {
+
76  using std::stoi;
+
77  using std::stod;
78 
-
79  // Back up so we see "<entity>" again for parsing in the loop.
-
80  file.seekg(-10, std::ios::cur);
-
81 
-
82  // Find each block of data and parse it.
-
83  std::vector<string_t> parts;
-
84  while(std::getline(file, line))
-
85  {
-
86  util::strip(line);
-
87  if(line.empty() || (line.size() >= 2 &&
-
88  line[0] == '/' &&
-
89  line[1] == '/'))
-
90  continue;
-
91 
-
92  else if(line.find("<entity>") == 0)
-
93  {
-
94  gfx::zPolygon Poly(m_Assets);
-
95  obj::zEntity& Latest = m_Scene.AddEntity();
-
96  Parser.LoadFromStreamUntil(file, "</entity>", file.tellg(),
-
97  filename.c_str());
-
98 
-
99  parts = util::split(Parser.PopResult("position", "0,0"), ',');
-
100 
-
101  Latest.SetDepth(std::stoi(Parser.PopResult("depth", "1")));
-
102  Latest.Move(std::stod(parts[0]), std::stod(parts[1]));
-
103 
-
104  string_t result;
-
105  do
-
106  {
-
107  result = Parser.PopResult("vertex");
-
108  parts = util::split(result, ',');
-
109  Poly.AddVertex(math::vector_t(std::stod(parts[0]), std::stod(parts[1])));
-
110  } while(!result.empty());
-
111 
-
112  parts = util::split(Parser.PopResult("indices"), ',');
-
113  if(!parts.empty())
-
114  {
-
115  std::vector<gfxcore::index_t> indices(parts.size());
-
116  Poly.SetIndices(indices);
-
117  }
-
118 
-
119  result = Parser.PopResult("stretch");
-
120  if(util::zFileParser::ResultToBool(result))
-
121  {
-
123  }
+
79  std::ifstream file(filename);
+
80  if(!file)
+
81  {
+
82  util::zLog& Log = util::zLog::GetEngineLog();
+
83  Log << Log.SetMode(util::LogMode::ZEN_ERROR)
+
84  << Log.SetSystem("Level")
+
85  << "Failed to open level: '" << filename << "'."
+
86  << util::zLog::endl;
+
87  }
+
88 
+
89  util::zFileParser Parser;
+
90  level_t level;
+
91  string_t line;
+
92 
+
93  level.valid = false;
+
94 
+
95  // The spec. states that the first object tag within a level must
+
96  // be an entity, so we can safely parse everything prior to finding
+
97  // one and consider that to be the metadata.
+
98  Parser.LoadFromStreamUntil(file, "<entity>", 0, filename.c_str());
+
99  level.metadata.author = Parser.GetFirstResult("author");
+
100  level.metadata.description = Parser.GetFirstResult("description");
+
101 
+
102  // Back up so we see "<entity>" again for parsing in the loop.
+
103  //file.seekg(-10, std::ios::cur);
+
104 
+
105  // Find each block of data and parse it.
+
106  std::vector<string_t> parts;
+
107  while(std::getline(file, line))
+
108  {
+
109  util::stripl(line);
+
110  if(line.empty() || (line.size() >= 2 && line.substr(0, 2) == "//"))
+
111  continue;
+
112 
+
113  else if(line.find("<entity") == 0)
+
114  {
+
115  gfx::zConcavePolygon Poly(m_Assets);
+
116  obj::zEntity& Latest = m_Scene.AddEntity();
+
117  Parser.LoadFromStreamUntil(file, "</entity>", file.tellg(),
+
118  filename.c_str(), true);
+
119 
+
120  parts = util::split(Parser.PopResult("position", "0,0"), ',');
+
121 
+
122  Latest.Move(stod(parts[0]), stod(parts[1]),
+
123  stoi(Parser.PopResult("depth", "1")));
124 
-
125  gfx::zMaterial M(m_Assets);
-
126  result = Parser.PopResult("texture");
-
127  M.LoadTextureFromFile(result);
-
128  Poly.AttachMaterial(M);
-
129 
-
130  result = Parser.PopResult("attributes", "0x00");
-
131  uint8_t attr = this->ParseAttribute(result);
-
133 
-
134  level.entities.push_back(&Latest);
-
135  }
-
136 
-
138  else if(line.find("<spawn") == 0)
-
139  {
-
140  spawn_t point;
-
141  Parser.LoadFromStreamUntil(file, "</spawn>",
-
142  file.tellg(), filename.c_str());
-
143  parts = util::split(Parser.PopResult("position"), ',');
-
144  point.position = math::vector_t(std::stod(parts[0]), std::stod(parts[1]));
-
145 
-
146  point.whitelist = util::split(Parser.PopResult("whitelist"), ',');
-
147  point.blacklist = util::split(Parser.PopResult("blacklist"), ',');
-
148  }
-
149 
-
150  else if(line.find("<light type=\"") == 0)
-
151  {
-
152  using std::stod;
-
153 
-
154  gfx::zLight& Light = m_Scene.AddLight(gfx::LightType::ZEN_AMBIENT);
-
155 
-
156  size_t start = strlen("<light type=\"");
-
157  size_t end = line.length() - start - strlen(">");
-
158  string_t type = line.substr(start, end);
-
159  if(type == "POINT")
-
160  {
-
161  Light.SetType(gfx::LightType::ZEN_POINT);
-
162  }
-
163  else if(type == "SPOT")
-
164  {
-
165  Light.SetType(gfx::LightType::ZEN_SPOTLIGHT);
-
166  }
-
167 
-
168  Parser.LoadFromStreamUntil(file, "</light>", file.tellg(),
-
169  filename.c_str());
-
170 
-
171  parts = util::split(Parser.PopResult("color"), ',');
-
172  Light.SetColor(stod(parts[0]), stod(parts[1]), stod(parts[2]));
-
173 
-
174  Light.SetBrightness(stod(
-
175  Parser.PopResult("brightness", "0.01")));
-
176 
-
177  if(Light.GetType() != gfx::LightType::ZEN_AMBIENT)
-
178  {
-
179  parts = util::split(Parser.PopResult("position"), ',');
-
180  Light.SetPosition(stod(parts[0]), stod(parts[1]));
-
181 
-
182  parts = util::split(Parser.PopResult("attenuation"), ',');
-
183  Light.SetAttenuation(stod(parts[0]),
-
184  stod(parts[1]),
-
185  stod(parts[2]));
-
186 
-
187  if(Light.GetType() == gfx::LightType::ZEN_SPOTLIGHT)
-
188  {
-
189  Light.SetMaximumAngle(stod(Parser.PopResult("maxangle")));
-
190  Light.SetMinimumAngle(stod(Parser.PopResult("minangle")));
-
191  }
-
192  }
-
193  }
-
194 
-
195  else
-
196  {
-
197  m_Log << m_Log.SetMode(util::LogMode::ZEN_DEBUG)
-
198  << m_Log.SetSystem("Level") << "Unrecognized line: "
-
199  << line << util::zLog::endl;
-
200  }
-
201  }
+
125  string_t result = Parser.PopResult("vertex");
+
126  while(!result.empty())
+
127  {
+
128  parts = util::split(result, ',');
+
129  Poly.AddVertex(math::vector_t(stod(parts[0]), stod(parts[1]), 1.0));
+
130  result = Parser.PopResult("vertex");
+
131  }
+
132 
+
133  if(Parser.Exists("color"))
+
134  {
+
135  std::vector<string_t> parts = util::split(Parser.PopResult("color"), ',');
+
136  Poly.SetColor(stod(parts[0]), stod(parts[1]), stod(parts[2]));
+
137  }
+
138 
+
139  result = Parser.PopResult("stretch");
+
140  if(util::zFileParser::ResultToBool(result))
+
141  {
+
143  }
+
144 
+
146  if(Parser.Exists("texture"))
+
147  {
+
148  Latest.LoadFromTexture(Parser.PopResult("texture"));
+
149  }
+
150  else
+
151  {
+
152  Latest.AddPrimitive(std::move(Poly.Create()));
+
153  }
+
154 
+
155  result = Parser.PopResult("attributes", "0x00");
+
156  uint8_t attr = this->ParseAttribute(result);
+
158 
+
159  level.entities.emplace_back(&Latest);
+
160 
+
161  if(attr & static_cast<uint8_t>(AttributeType::PHYSICAL))
+
162  {
+
163  level.physical.emplace_back(&Latest);
+
164  }
+
165 
+
166  if(attr & static_cast<uint8_t>(AttributeType::INVISIBLE))
+
167  {
+
168  Latest.Disable();
+
169  }
+
170  }
+
171 
+
172  else if(line.find("<spawn") == 0)
+
173  {
+
174  // G++ doesn't have regex support for C++11 yet.
+
175 #ifdef __GNUC__
+
176  size_t start = line.find('"');
+
177  size_t end = line.find('"', start+1);
+
178  const string_t t= line.substr(start+1, end - start - 1);
+
179 #else
+
180  std::smatch type;
+
181  if(!std::regex_match(line, type,
+
182  std::regex("<spawn type=\"([A-Z]+)\">",
+
183  std::regex_constants::icase)))
+
184  {
+
186  return false;
+
187  }
+
188  const string_t& t = type[1];
+
189 #endif // __GNUC__
+
190 
+
191  spawn_t point;
+
192  point.type = SpawnType::ENEMY_SPAWN;
+
193 
+
194  if (t == "PLAYER") point.type = SpawnType::PLAYER_SPAWN;
+
195  else if (t == "ITEM") point.type = SpawnType::ITEM_SPAWN;
+
196 
+
197  Parser.LoadFromStreamUntil(file, "</spawn>", file.tellg(),
+
198  filename.c_str(), true);
+
199 
+
200  parts = util::split(Parser.PopResult("position"), ',');
+
201  point.position = math::vector_t(stod(parts[0]), stod(parts[1]));
202 
-
203  if(level.valid) m_levels.emplace_back(std::move(level));
-
204  return level.valid;
-
205  }
-
206 
-
207  bool PopLevel(level_t& lvl)
-
208  {
-
209  if(m_levels.empty()) return false;
-
210  lvl = m_levels.front();
-
211  m_levels.erase(m_levels.begin());
-
212  return true;
-
213  }
-
214 
-
215  private:
-
216  uint8_t ParseAttribute(const string_t& hex)
-
217  {
-
218  return static_cast<uint8_t>(std::stoul(hex, nullptr, 16));
-
219  }
-
220 
-
221  util::zLog& m_Log;
-
222  gfx::zScene& m_Scene;
-
223  asset::zAssetManager& m_Assets;
-
224  std::vector<level_t> m_levels;
-
225  };
-
226 }
-
227 }
-
228 
-
229 #endif // ZENDERER__LEVELS__LEVEL_LOADER_HPP
-
230 
+
203  point.whitelist = util::split(Parser.PopResult("whitelist"), ',');
+
204  point.blacklist = util::split(Parser.PopResult("blacklist"), ',');
+
205  level.spawnpoints.emplace_back(std::move(point));
+
206  }
+
207 
+
208  else if(line.find("<light type=\"") == 0)
+
209  {
+
210 #ifdef __GNUC__
+
211  size_t start = line.find('"');
+
212  size_t end = line.find('"', start+1);
+
213  string_t t = line.substr(start+1, end - start - 1);
+
214 #else
+
215  std::smatch type;
+
216  if(!std::regex_match(line, type,
+
217  std::regex("<light type=\"([A-Z]+)\">",
+
218  std::regex_constants::icase)))
+
219  {
+
221  return false;
+
222  }
+
223  const string_t& t = type[1];
+
224 #endif // __GNUC__
+
225 
+
226  gfx::LightType lType = gfx::LightType::ZEN_AMBIENT;
+
227  if (t == "POINT") lType = gfx::LightType::ZEN_POINT;
+
228  else if (t == "SPOT") lType = gfx::LightType::ZEN_SPOTLIGHT;
+
229 
+
230  gfx::zLight& Light = m_Scene.AddLight(lType);
+
231  Light.Enable();
+
232 
+
233  Parser.LoadFromStreamUntil(file, "</light>", file.tellg(),
+
234  filename.c_str(), true);
+
235 
+
236  parts = util::split(Parser.PopResult("color", "1,1,1"), ',');
+
237  Light.SetColor(stod(parts[0]), stod(parts[1]), stod(parts[2]));
+
238  Light.SetBrightness(stod(Parser.PopResult("brightness")));
+
239 
+
240  if(Light.GetType() != gfx::LightType::ZEN_AMBIENT)
+
241  {
+
242  parts = util::split(Parser.PopResult("position"), ',');
+
243  Light.SetPosition(stod(parts[0]), stod(parts[1]));
+
244 
+
245  parts = util::split(Parser.PopResult("attenuation"), ',');
+
246  Light.SetAttenuation(stod(parts[0]),
+
247  stod(parts[1]),
+
248  stod(parts[2]));
+
249 
+
250  if(Light.GetType() == gfx::LightType::ZEN_SPOTLIGHT)
+
251  {
+
252  Light.SetMaximumAngle(stod(Parser.PopResult("maxangle")));
+
253  Light.SetMinimumAngle(stod(Parser.PopResult("minangle")));
+
254  }
+
255  }
+
256 
+
257  Light.Disable();
+
258  }
+
259 
+
260  else
+
261  {
+
262  m_Log << m_Log.SetMode(util::LogMode::ZEN_DEBUG)
+
263  << m_Log.SetSystem("Level") << "Unrecognized line: "
+
264  << line << util::zLog::endl;
+
265  }
+
266  }
+
267 
+
268  level.valid = (!level.entities.empty() || !level.lights.empty());
+
269  if(level.valid) m_levels.emplace_back(std::move(level));
+
270  return level.valid;
+
271  }
+
272 
+
273  bool PopLevel(level_t& lvl)
+
274  {
+
275  if(m_levels.empty()) return false;
+
276  lvl = m_levels.front();
+
277  m_levels.erase(m_levels.begin());
+
278  return true;
+
279  }
+
280 
+
281  private:
+
282  uint8_t ParseAttribute(const string_t& hex)
+
283  {
+
284 #ifndef __GNUC__
+
285  return static_cast<uint8_t>(std::stoul(hex, nullptr, 16));
+
286 #else
+
287  return static_cast<uint8_t>(std::strtoul(hex.c_str(), nullptr, 16));
+
288 #endif // __GNUC__
+
289  }
+
290 
+
291  util::zLog& m_Log;
+
292  gfx::zScene& m_Scene;
+
293  asset::zAssetManager& m_Assets;
+
294  std::vector<level_t> m_levels;
+
295  };
+
296 }
+
297 }
+
298 
+
299 #endif // ZENDERER__LEVELS__LEVEL_LOADER_HPP
+
300 
diff --git a/docs/_level_test_8cpp.html b/docs/_level_test_8cpp.html new file mode 100644 index 00000000..699282db --- /dev/null +++ b/docs/_level_test_8cpp.html @@ -0,0 +1,291 @@ + + + + + + +Zenderer Engine: Zenderer/src/LevelTest.cpp File Reference + + + + + + + + + + + + + +
+
+
Data Fields
@@ -272,6 +287,12 @@
+vector< zEntity * > +physical +
vector< zLight * > lights
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
+ + + + + +
+
Zenderer Engine +  5.0.0-alpha +
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
+
+
+ + + + + + +
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+Data Structures | +Macros | +Functions
+
+
LevelTest.cpp File Reference
+
+
+
#include <ctime>
+#include <cmath>
+#include "Zenderer/Zenderer.hpp"
+
+Include dependency graph for LevelTest.cpp:
+
+
+ + +
+
+

Go to the source code of this file.

+ + + + + + +

+Data Structures

class  gBullet
 
class  gWorld
 
+ + + + + + + + + +

+Macros

#define LEVEL_PATH   "assets/"
 
#define TEXTURE_PATH   "assets/textures/"
 
#define FONT_PATH   "assets/ttf/"
 
#define CHECK(f)   { if (!f) return 1; }
 
+ + + + + +

+Functions

real_t rgb2f (const real_t rgb)
 
int main (int argc, char *argv[])
 
+

Macro Definition Documentation

+ +
+
+ + + + +
#define LEVEL_PATH   "assets/"
+
+ +

Definition at line 7 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + +
#define TEXTURE_PATH   "assets/textures/"
+
+ +

Definition at line 8 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + +
#define FONT_PATH   "assets/ttf/"
+
+ +

Definition at line 9 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + + + + + +
#define CHECK( f)   { if (!f) return 1; }
+
+ +

Definition at line 403 of file LevelTest.cpp.

+ +
+
+

Function Documentation

+ +
+
+ + + + + +
+ + + + + + + + +
real_t rgb2f (const real_t rgb)
+ 		+inline
+
+ +

Definition at line 13 of file LevelTest.cpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
int main (int argc,
char * argv[] 
)
+
+ +

Definition at line 405 of file LevelTest.cpp.

+ +
+
+
+
+ + + + diff --git a/docs/_level_test_8cpp.js b/docs/_level_test_8cpp.js new file mode 100644 index 00000000..1b49b917 --- /dev/null +++ b/docs/_level_test_8cpp.js @@ -0,0 +1,11 @@ +var _level_test_8cpp = +[ + [ "gBullet", "classg_bullet.html", "classg_bullet" ], + [ "gWorld", "classg_world.html", "classg_world" ], + [ "LEVEL_PATH", "_level_test_8cpp.html#a833ae233ed0529bd108096453975af7b", null ], + [ "TEXTURE_PATH", "_level_test_8cpp.html#a0777b1d05127a4abf7671f3d9b4b4622", null ], + [ "FONT_PATH", "_level_test_8cpp.html#af326d9b4cced6fd44a9f9567dc666014", null ], + [ "CHECK", "_level_test_8cpp.html#aa59a70e2ff40af3af6c08aafdca8c713", null ], + [ "rgb2f", "_level_test_8cpp.html#a70a9344ab32a2cccf328642eeab901ae", null ], + [ "main", "_level_test_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97", null ] +]; \ No newline at end of file diff --git a/docs/_level_test_8cpp__incl.map b/docs/_level_test_8cpp__incl.map new file mode 100644 index 00000000..f0f24893 --- /dev/null +++ b/docs/_level_test_8cpp__incl.map @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_level_test_8cpp__incl.png b/docs/_level_test_8cpp__incl.png new file mode 100644 index 00000000..d4a849d7 Binary files /dev/null and b/docs/_level_test_8cpp__incl.png differ diff --git a/docs/_level_test_8cpp_a70a9344ab32a2cccf328642eeab901ae_icgraph.map b/docs/_level_test_8cpp_a70a9344ab32a2cccf328642eeab901ae_icgraph.map new file mode 100644 index 00000000..dc133dcc --- /dev/null +++ b/docs/_level_test_8cpp_a70a9344ab32a2cccf328642eeab901ae_icgraph.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/_level_test_8cpp_a70a9344ab32a2cccf328642eeab901ae_icgraph.png b/docs/_level_test_8cpp_a70a9344ab32a2cccf328642eeab901ae_icgraph.png new file mode 100644 index 00000000..c3a39ffe Binary files /dev/null and b/docs/_level_test_8cpp_a70a9344ab32a2cccf328642eeab901ae_icgraph.png differ diff --git a/docs/_level_test_8cpp_source.html b/docs/_level_test_8cpp_source.html new file mode 100644 index 00000000..34a8b90a --- /dev/null +++ b/docs/_level_test_8cpp_source.html @@ -0,0 +1,580 @@ + + + + + + +Zenderer Engine: Zenderer/src/LevelTest.cpp Source File + + + + + + + + + + + + + +
+
+ + + + + + +
+
Zenderer Engine +  5.0.0-alpha +
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+
LevelTest.cpp
+
+
+Go to the documentation of this file.
1 // A C++ version of Praecursor.py
+
2 
+
3 #include <ctime>
+
4 #include <cmath>
+
5 
+
6 #include "Zenderer/Zenderer.hpp"
+
7 #define LEVEL_PATH "assets/"
+
8 #define TEXTURE_PATH "assets/textures/"
+
9 #define FONT_PATH "assets/ttf/"
+
10 
+
11 using namespace zen;
+
12 
+
13 inline real_t rgb2f(const real_t rgb) { return rgb / 255.0; }
+
14 
+
15 class gBullet
+
16 {
+
17 public:
+
18  gBullet(gfx::zScene& Scene, asset::zAssetManager& Assets,
+
19  const real_t startx, const real_t starty,
+
20  const real_t endx, const real_t endy) :
+
21  m_Scene(Scene), m_Entity(Scene.AddEntity())
+
22  {
+
23  m_Entity.AddPrimitive(gfx::zQuad(Assets, 4, 4).Create());
+
24  m_Entity.Move(startx, starty);
+
25  real_t angle = std::atan2(endy - starty, endx - startx);
+
26  m_Rate = math::vector_t(std::cos(angle) * 5,
+
27  std::sin(angle) * 5,
+
28  0.0);
+
29  }
+
30 
+
31  ~gBullet()
+
32  {
+
33  m_Scene.RemoveEntity(m_Entity);
+
34  }
+
35 
+
36  void Update()
+
37  {
+
38  m_Entity.Adjust(m_Rate);
+
39  }
+
40 
+
41  void SetRate(const real_t dx, const real_t dy)
+
42  {
+
43  m_Rate.x = dx;
+
44  m_Rate.y = dy;
+
45  }
+
46 
+
47  inline const math::vector_t& GetRate() const
+
48  {
+
49  return m_Rate;
+
50  }
+
51 
+
52  inline real_t GetX() const { return m_Entity.GetX(); }
+
53  inline real_t GetY() const { return m_Entity.GetY(); }
+
54 
+
55  template<typename T> inline
+
56  bool Collides(const T& t, math::cquery_t* poi = nullptr) const
+
57  { return m_Entity.Collides(t, poi); }
+
58 
+
59 private:
+
60  gfx::zScene& m_Scene;
+
61  obj::zEntity& m_Entity;
+
62  math::vector_t m_Rate;
+
63 };
+
64 
+
65 class gWorld
+
66 {
+
67  static real_t s_GRAVITY;
+
68  struct trail_t
+
69  {
+
70  trail_t(const evt::event_t& event, real_t delay = 0.5) :
+
71  m_start(time(nullptr) + delay),
+
72  m_evt(event) {}
+
73 
+
74  inline bool Ready() const
+
75  { return m_start <= time(nullptr); }
+
76 
+
77  real_t m_start;
+
78  evt::event_t m_evt;
+
79  };
+
80 
+
81 public:
+
82  gWorld(const gfx::zWindow& W, asset::zAssetManager& Assets,
+
83  gfx::zScene& Scene) :
+
84 
+
85  m_Window(W), m_Assets(Assets), m_Scene(Scene),
+
86 
+
87  m_Trail(Scene.AddEntity()),
+
88  m_Player(Scene.AddAnimation()),
+
89 
+
90  m_TDelta(0, 0, 0), m_PDelta(0, 0, 0),
+
91  m_plat(-1.0, 0.0), m_tdelay(0.5), m_tshift(0.0)
+
92  {
+
93  m_Player.SetKeyframeSize(24, 52);
+
94  m_Player.SetKeyframeCount(4);
+
95  m_Player.SetKeyframeRate(10);
+
96  m_Player.LoadFromTexture(TEXTURE_PATH"hero_walk.png");
+
97  m_Player.StopAnimation(0);
+
98 
+
99  gfx::zQuad Q(Assets, 32, 32);
+
100  Q.SetColor(0, 0, rgb2f(100));
+
101  Q.Create();
+
102  m_Trail.AddPrimitive(Q);
+
103 
+
104  mp_Font = m_Assets.Create<gui::zFont>();
+
105  mp_Font->AttachManager(m_Assets);
+
106  mp_Font->SetSize(16);
+
107  mp_Font->SetColor(1.0, 1.0, 1.0);
+
108 
+
109  if (!mp_Font->LoadFromFile(FONT_PATH"game.ttf"))
+
110  {
+
111  m_Assets.Delete(mp_Font);
+
112  util::zLog& Log = util::zLog::GetEngineLog();
+
113  Log << Log.SetMode(util::LogMode::ZEN_FATAL)
+
114  << Log.SetSystem("World") << "Failed to load '"
+
115  << FONT_PATH"game.ttf" << "'." << util::zLog::endl;
+
116  }
+
117  }
+
118 
+
119  ~gWorld() {}
+
120 
+
121  bool LoadLevel(lvl::level_t level)
+
122  {
+
123  if (!level.valid) return false;
+
124 
+
125  m_Level = std::move(level);
+
126  m_Player.Move(std::find_if(m_Level.spawnpoints.begin(),
+
127  m_Level.spawnpoints.end(),
+
128  [](const lvl::spawn_t& point) {
+
129  return point.type == lvl::SpawnType::PLAYER_SPAWN;
+
130  }
+
131  )->position);
+
132 
+
133  m_Scene.ShiftEntity(m_Trail, m_Level.entities.size());
+
134  m_Scene.ShiftEntity(m_Player, m_Scene.GetEntityIndex(m_Trail)+1);
+
135 
+
136  m_Trail.Move(m_Player.GetPosition());
+
137  return m_Level.valid;
+
138  }
+
139 
+
140  void Update()
+
141  {
+
142  if (!math::compf(m_PDelta.x, 0.0) && !m_Player.Playing())
+
143  {
+
144  m_Player.PlayAnimation(0);
+
145  }
+
146  else if (math::compf(m_PDelta.x, 0.0) && m_Player.Playing())
+
147  {
+
148  m_Player.StopAnimation(0);
+
149  }
+
150 
+
151  if (!m_allTrails.empty() && m_allTrails.front().Ready())
+
152  {
+
153  const trail_t latest = m_allTrails.front();
+
154  this->HandleEvent_Default(latest.m_evt, m_Trail, m_TDelta);
+
155  m_allTrails.erase(m_allTrails.begin());
+
156  }
+
157 
+
158  this->HandleGravity(m_Player, m_PDelta);
+
159  this->HandleGravity(m_Trail, m_TDelta);
+
160 
+
161  if (!math::compf(m_PDelta.x, 0.0))
+
162  {
+
163  for (auto& i : m_Level.physical)
+
164  {
+
165  math::cquery_t poi;
+
166  i->Adjust(-m_PDelta.x, 5);
+
167  i->Collides(m_Player, &poi);
+
168  i->Adjust(m_PDelta.x, -5);
+
169 
+
170  std::cout << poi.collision << " ... ";
+
171  if (poi.collision)
+
172  {
+
173  real_t m = (poi.line1[0].y - poi.line1[1].y) /
+
174  (poi.line1[0].x - poi.line1[1].x);
+
175 
+
176  std::cout << m << ',' << poi.tri1[0] << std::endl;
+
177 
+
178  if (m < -1 && m_PDelta.x > 0 ||
+
179  m > 1 && m_PDelta.x < 0)
+
180  m_PDelta.x = 0;
+
181 
+
182  else
+
183  {
+
184  // Not going down a hill?
+
185  /*if(m_PDelta.x < 0 == m < 0)
+
186  {
+
187  // Hamper speed.
+
188  m_PDelta.x *= m;
+
189  }*/
+
190 
+
191  m_PDelta.y = m_PDelta.x * m;
+
192  m_Player.Adjust(0, -1);
+
193  }
+
194 
+
195  std::cout << m_PDelta << std::endl;
+
196  return;
+
197  }
+
198  }
+
199  }
+
200 
+
201  m_Player.Adjust(m_PDelta);
+
202  m_Trail .Adjust(m_TDelta);
+
203 
+
204  if (math::compf(m_PDelta.x, 0.0) && math::compf(m_PDelta.y, 0.0))
+
205  {
+
206  m_tdelay = 1.0;//math::min<real_t>(5.0, 100.0 / m_Light.GetPosition().distance(m_Player.GetPosition()));
+
207  }
+
208 
+
209  if (math::compf(m_TDelta.x, 0.0) && m_allTrails.empty() &&
+
210  !math::compf(m_Trail.GetX(), m_Player.GetX()))
+
211  {
+
212  bool match = m_Player.GetX() > m_Trail.GetX() && m_tshift < 0;
+
213 
+
214  if (match)
+
215  {
+
216  m_Trail.Move(m_Player.GetPosition());
+
217  m_tshift = 0.0;
+
218  }
+
219 
+
220  else
+
221  {
+
222  m_tshift += (m_Player.GetX() > m_Trail.GetX()) ? 0.02 : -0.02;
+
223  }
+
224  }
+
225 
+
226  else
+
227  {
+
228  m_tshift = 0.0;
+
229  }
+
230 
+
231  /*
+
232  if (m_Trail.Collides(m_LineOfSight))
+
233  {
+
234  gBullet* pBullet = new gBullet(m_Scene, m_Target.GetX(), m_Target.GetY(),
+
235  m_Trail.GetX(), m_Trail.GetY());
+
236  mp_allBullets.emplace_back(pBullet);
+
237  }
+
238  */
+
239  m_Trail.Adjust(m_tshift, 0.0);
+
240  }
+
241 
+
242  void Render()
+
243  {
+
244  math::cquery_t q;
+
245  for (auto& i : mp_allBullets)
+
246  {
+
247  for (auto& j : m_Level.physical)
+
248  {
+
249  if (i->Collides(*j, &q))
+
250  {
+
251  math::vector_t rate = i->GetRate();
+
252  math::vector_t surf = q.line2[1] - q.line2[0];
+
253  real_t dot = rate * surf;
+
254  real_t theta = std::acos(dot / (rate.Magnitude() * surf.Magnitude()));
+
255  rate.Rotate(-2 * theta);
+
256  i->SetRate(rate.x, rate.y);
+
257  }
+
258  }
+
259 
+
260  if (i->GetX() > m_Scene.GetWidth() || i->GetX() < 0.0 ||
+
261  i->GetY() > m_Scene.GetHeight() || i->GetY() < 0.0)
+
262  {
+
263  // I'm not sure if this is even valid lol.
+
264  mp_allBullets.erase(std::find(mp_allBullets.begin(),
+
265  mp_allBullets.end(), i));
+
266  break;
+
267  }
+
268 
+
269  i->Update();
+
270  }
+
271 
+
272  m_Scene.Render();
+
273  /*
+
274  uint16_t y = m_Scene.GetHeight() - 200;//m_Ground.GetH();
+
275  obj::zEntity Line(m_Assets);
+
276  gui::zFont& Font = *mp_Font;
+
277 
+
278  for (auto& i : m_allTrails)
+
279  {
+
280  Font << static_cast<int>(i.m_evt.type) << " ["
+
281  << static_cast<int>(i.m_evt.key.key) << "] -- "
+
282  << (i.m_start - time(nullptr));
+
283  Font.Render(Line);
+
284  Font.ClearString();
+
285 
+
286  Line.Move(0, y);
+
287  Line.Draw();
+
288 
+
289  y += Line.GetH();
+
290  }
+
291  */
+
292  }
+
293 
+
294  void HandleEvent(const evt::event_t& Evt)
+
295  {
+
296  this->HandleEvent_Default(Evt, m_Player, m_PDelta);
+
297  if (Evt.type == evt::EventType::KEY_DOWN ||
+
298  Evt.type == evt::EventType::KEY_UP ||
+
299  Evt.type == evt::EventType::MOUSE_DOWN)
+
300  {
+
301  //m_allTrails.emplace_back(Evt, m_tdelay);
+
302  }
+
303 
+
304  if (Evt.type == evt::EventType::KEY_DOWN &&
+
305  Evt.key.key == evt::Key::U)
+
306  {
+
307  m_TDelta = math::vector_t();
+
308  m_Trail.Move(m_Player.GetPosition());
+
309  m_allTrails.clear();
+
310  }
+
311  }
+
312 
+
313 private:
+
314  void HandleEvent_Default(const evt::event_t& Evt, const obj::zEntity& Object, math::vector_t& Rate)
+
315  {
+
316  switch (Evt.type)
+
317  {
+
318  case evt::EventType::KEY_DOWN:
+
319  switch (Evt.key.key)
+
320  {
+
321  case evt::Key::W:
+
322  case evt::Key::SPACE:
+
323  Rate.y = (!math::compf(Rate.y, 0.0)) ? Rate.y : -15.0;
+
324  break;
+
325 
+
326  case evt::Key::D:
+
327  case evt::Key::RIGHT:
+
328  Rate.x = 5;
+
329  break;
+
330 
+
331  case evt::Key::A:
+
332  case evt::Key::LEFT:
+
333  Rate.x = -5;
+
334  break;
+
335  }
+
336 
+
337  break;
+
338 
+
339  case evt::EventType::KEY_UP:
+
340  switch (Evt.key.key)
+
341  {
+
342  case evt::Key::D:
+
343  case evt::Key::LEFT:
+
344  case evt::Key::A:
+
345  case evt::Key::RIGHT:
+
346  Rate.x = 0;
+
347  break;
+
348  }
+
349 
+
350  break;
+
351 
+
352  case evt::EventType::MOUSE_DOWN:
+
353  {
+
354  gBullet* pBullet = new gBullet(m_Scene, m_Assets,
+
355  Object.GetX(), Object.GetY(),
+
356  Evt.mouse.position.x,
+
357  Evt.mouse.position.y);
+
358  mp_allBullets.emplace_back(pBullet);
+
359  break;
+
360  }
+
361  }
+
362  }
+
363 
+
364  void HandleGravity(const obj::zEntity& Object, math::vector_t& Rate)
+
365  {
+
366  bool ok = false;
+
367  int tmp = static_cast<int>(Rate.y);
+
368 
+
369  for (auto& i : m_Level.physical)
+
370  {
+
371  i->Adjust(0, -tmp);
+
372  ok = Object.Collides(*i);
+
373  i->Adjust(0, tmp);
+
374  if (ok) break;
+
375  }
+
376 
+
377  if (ok) Rate.y = 0.0;
+
378  else Rate.y += gWorld::s_GRAVITY;
+
379  }
+
380 
+
381  asset::zAssetManager& m_Assets;
+
382  const gfx::zWindow& m_Window;
+
383  gfx::zScene& m_Scene;
+
384 
+
385  obj::zAnimation& m_Player;
+
386  obj::zEntity& m_Trail;
+
387 
+
388  lvl::level_t m_Level;
+
389 
+
390  gui::zFont* mp_Font;
+
391 
+
392  std::vector<trail_t> m_allTrails;
+
393  std::list<gBullet*> mp_allBullets;
+
394 
+
395  math::vector_t m_PDelta, m_TDelta;
+
396  math::vector_t m_plat;
+
397  real_t m_tdelay,
+
398  m_tshift;
+
399 };
+
400 
+
401 real_t gWorld::s_GRAVITY = 0.5;
+
402 
+
403 #define CHECK(f) { if (!f) return 1; }
+
404 
+
405 int main(int argc, char* argv[])
+
406 {
+
407  if (!Init()) return 1;
+
408 
+
409  asset::zAssetManager Assets;
+
410  CHECK(Assets.Init());
+
411 
+
412  gfx::zWindow Window(800, 600, "Praecursor", Assets);
+
413  CHECK(Window.Init());
+
414 
+
415  gfx::zScene GameWorld(800, 600, Assets);
+
416  CHECK(GameWorld.Init());
+
417  GameWorld.EnableLighting();
+
418 
+
419  string_t level_name(LEVEL_PATH"level2.zlv");
+
420  if (argc > 1) level_name = string_t(argv[1]);
+
421 
+
422  lvl::level_t FirstLevel;
+
423  lvl::zLevelLoader LevelLoader(GameWorld, Assets);
+
424  CHECK(LevelLoader.LoadFromFile(level_name));
+
425  CHECK(LevelLoader.PopLevel(FirstLevel));
+
426 
+
427  gWorld World(Window, Assets, GameWorld);
+
428  CHECK(World.LoadLevel(std::move(FirstLevel)));
+
429 
+
430  using evt::EventType;
+
431  util::zTimer Timer(60);
+
432  evt::event_t Evt;
+
433 
+
434  std::cout << "Entering main loop...\n";
+
435  bool quit = false;
+
436  while (!quit && Window.IsOpen())
+
437  {
+
438  Timer.Start();
+
439  evt::zEventHandler::PollEvents();
+
440  while(evt::zEventHandler::GetInstance().PopEvent(Evt))
+
441  {
+
442  quit = (Evt.type == EventType::WINDOW_CLOSE ||
+
443  Evt.key.key == evt::Key::ESCAPE);
+
444  World.HandleEvent(Evt);
+
445  }
+
446 
+
447  World.Update();
+
448  Window.Clear();
+
449  World.Render();
+
450  Window.Update();
+
451  Timer.Delay();
+
452  }
+
453 
+
454  Quit();
+
455  return 0;
+
456 }
+
+
+ + + + diff --git a/docs/_light_8cpp.html b/docs/_light_8cpp.html index da3363e8..1bec7b69 100644 --- a/docs/_light_8cpp.html +++ b/docs/_light_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_light_8cpp__incl.map b/docs/_light_8cpp__incl.map index bda6dd1d..83ece2c0 100644 --- a/docs/_light_8cpp__incl.map +++ b/docs/_light_8cpp__incl.map @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_light_8cpp__incl.png b/docs/_light_8cpp__incl.png index 7ef19b09..6a3c3693 100644 Binary files a/docs/_light_8cpp__incl.png and b/docs/_light_8cpp__incl.png differ diff --git a/docs/_light_8cpp_source.html b/docs/_light_8cpp_source.html index d99d5374..655cf9d7 100644 --- a/docs/_light_8cpp_source.html +++ b/docs/_light_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -126,62 +126,62 @@
15 zLight::zLight(asset::zAssetManager& m_Assets,
16  const gfx::LightType& Type,
17  const uint16_t window_h /*= 800*/) :
-
18  m_type(Type), m_Shader(m_Assets), m_height(window_h),
-
19 
-
20  m_loccol(-1), m_locbrt(-1), m_locpos(-1), m_locatt(-1),
-
21  m_loctmx(-1), m_loctmn(-1)
-
22 {
-
23 }
-
24 
-
25 zLight::~zLight()
-
26 {
-
27  m_Shader.Destroy();
-
28 }
-
29 
-
30 bool zLight::Init()
-
31 {
-
32  bool state = false;
-
33 
-
34  state = m_Shader.LoadVertexShaderFromFile(
-
35  ZENDERER_SHADER_PATH"Default.vs");
-
36 
-
37  switch(m_type)
-
38  {
-
39  case LightType::ZEN_AMBIENT:
-
40  state = state && m_Shader.LoadFragmentShaderFromFile(
-
41  ZENDERER_SHADER_PATH"AmbientLight.fs");
-
42  break;
-
43 
-
44  case LightType::ZEN_POINT:
-
45  state = state && m_Shader.LoadFragmentShaderFromFile(
-
46  ZENDERER_SHADER_PATH"PointLight.fs");
-
47  break;
-
48 
-
49  case LightType::ZEN_SPOTLIGHT:
-
50  state = state && m_Shader.LoadFragmentShaderFromFile(
-
51  ZENDERER_SHADER_PATH"SpotLight.fs");
-
52  break;
-
53 
-
54  default: break;
-
55  }
-
56 
-
57  state = state && m_Shader.CreateShaderObject();
-
58 
-
59  if(state)
-
60  {
-
61  m_loccol = m_Shader.GetUniformLocation("light_col");
-
62  m_locbrt = m_Shader.GetUniformLocation("light_brt");
-
63  m_locpos = m_Shader.GetUniformLocation("light_pos");
-
64  m_loctmx = m_Shader.GetUniformLocation("light_max");
-
65  m_loctmn = m_Shader.GetUniformLocation("light_min");
-
66  m_locatt = m_Shader.GetUniformLocation("light_att");
-
67 
-
68  GLint mvloc = m_Shader.GetUniformLocation("mv"),
-
69  projloc = m_Shader.GetUniformLocation("proj"),
-
70  scrloc = m_Shader.GetUniformLocation("scr_height");
-
71 
-
72  if(m_loccol == -1 || m_locbrt == -1 || mvloc == -1 || projloc == -1)
-
73  {
+
18  m_Shader(m_Assets), m_type(Type),
+
19  m_loccol(-1), m_locbrt(-1), m_locpos(-1), m_locatt(-1),
+
20  m_loctmx(-1), m_loctmn(-1), m_height(window_h)
+
21 {
+
22 }
+
23 
+
24 zLight::~zLight()
+
25 {
+
26  m_Shader.Destroy();
+
27 }
+
28 
+
29 bool zLight::Init()
+
30 {
+
31  bool state = false;
+
32 
+
33  state = m_Shader.LoadVertexShaderFromFile(
+
34  ZENDERER_SHADER_PATH"Default.vs");
+
35 
+
36  switch(m_type)
+
37  {
+
38  case LightType::ZEN_AMBIENT:
+
39  state = state && m_Shader.LoadFragmentShaderFromFile(
+
40  ZENDERER_SHADER_PATH"AmbientLight.fs");
+
41  break;
+
42 
+
43  case LightType::ZEN_POINT:
+
44  state = state && m_Shader.LoadFragmentShaderFromFile(
+
45  ZENDERER_SHADER_PATH"PointLight.fs");
+
46  break;
+
47 
+
48  case LightType::ZEN_SPOTLIGHT:
+
49  state = state && m_Shader.LoadFragmentShaderFromFile(
+
50  ZENDERER_SHADER_PATH"SpotLight.fs");
+
51  break;
+
52 
+
53  default: break;
+
54  }
+
55 
+
56  state = state && m_Shader.CreateShaderObject();
+
57 
+
58  if(state)
+
59  {
+
60  m_loccol = m_Shader.GetUniformLocation("light_col");
+
61  m_locbrt = m_Shader.GetUniformLocation("light_brt");
+
62  m_locpos = m_Shader.GetUniformLocation("light_pos");
+
63  m_loctmx = m_Shader.GetUniformLocation("light_max");
+
64  m_loctmn = m_Shader.GetUniformLocation("light_min");
+
65  m_locatt = m_Shader.GetUniformLocation("light_att");
+
66 
+
67  GLint mvloc = m_Shader.GetUniformLocation("mv"),
+
68  projloc = m_Shader.GetUniformLocation("proj"),
+
69  scrloc = m_Shader.GetUniformLocation("scr_height");
+
70 
+
71  if(m_loccol == -1 || m_locbrt == -1 || mvloc == -1 || projloc == -1)
+
72  {
+
73  m_Shader.Destroy();
74  return false;
75  }
76  else
diff --git a/docs/_light_8hpp.html b/docs/_light_8hpp.html index c1338085..0a335e32 100644 --- a/docs/_light_8hpp.html +++ b/docs/_light_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -126,14 +126,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_light_8hpp__dep__incl.map b/docs/_light_8hpp__dep__incl.map index 3ca0fc02..5cf812b0 100644 --- a/docs/_light_8hpp__dep__incl.map +++ b/docs/_light_8hpp__dep__incl.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/_light_8hpp__dep__incl.png b/docs/_light_8hpp__dep__incl.png index 63ef778d..fdd9ed23 100644 Binary files a/docs/_light_8hpp__dep__incl.png and b/docs/_light_8hpp__dep__incl.png differ diff --git a/docs/_light_8hpp__incl.map b/docs/_light_8hpp__incl.map index e3a33eee..bef4c3e2 100644 --- a/docs/_light_8hpp__incl.map +++ b/docs/_light_8hpp__incl.map @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_light_8hpp__incl.png b/docs/_light_8hpp__incl.png index ed527035..9b125014 100644 Binary files a/docs/_light_8hpp__incl.png and b/docs/_light_8hpp__incl.png differ diff --git a/docs/_light_8hpp_source.html b/docs/_light_8hpp_source.html index 6b38f009..27d38d4b 100644 --- a/docs/_light_8hpp_source.html +++ b/docs/_light_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_log_8cpp.html b/docs/_log_8cpp.html index 4e684991..1d2b1528 100644 --- a/docs/_log_8cpp.html +++ b/docs/_log_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_log_8cpp_source.html b/docs/_log_8cpp_source.html index eb4484dd..fa4555d7 100644 --- a/docs/_log_8cpp_source.html +++ b/docs/_log_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -124,8 +124,8 @@
13 
14 zLog::zLog(const string_t& filename, const bool show_stdout) :
15  m_mode(LogMode::ZEN_INFO),
-
16  m_filename(filename),
-
17  m_system("Log"),
+
16  m_system("Log"),
+
17  m_filename(filename),
18  m_stdout(show_stdout),
19  m_init(false)
20 {}
@@ -214,16 +214,11 @@
103  return (*this);
104 }
105 
-
106 std::ostream& util::operator<<(std::ostream& o, const zLog& Log)
+
106 zLog& zLog::GetEngineLog()
107 {
-
108  return o;
-
109 }
-
110 
-
111 zLog& zLog::GetEngineLog()
-
112 {
-
113  static zLog Log("Zenderer.log");
-
114  return Log;
-
115 }
+
108  static zLog Log("Zenderer.log");
+
109  return Log;
+
110 }
diff --git a/docs/_log_8hpp.html b/docs/_log_8hpp.html index 57a457a1..3c55beb5 100644 --- a/docs/_log_8hpp.html +++ b/docs/_log_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -137,7 +137,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_log_8hpp__dep__incl.map b/docs/_log_8hpp__dep__incl.map index d1bf4e82..ae8f1f68 100644 --- a/docs/_log_8hpp__dep__incl.map +++ b/docs/_log_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_log_8hpp__dep__incl.png b/docs/_log_8hpp__dep__incl.png index 063b628d..c4f5e2e7 100644 Binary files a/docs/_log_8hpp__dep__incl.png and b/docs/_log_8hpp__dep__incl.png differ diff --git a/docs/_log_8hpp_source.html b/docs/_log_8hpp_source.html index 84811aee..9d7da4a0 100644 --- a/docs/_log_8hpp_source.html +++ b/docs/_log_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -179,34 +179,35 @@
173 
175  inline bool IsInit() const;
176 
-
178  friend std::ostream& operator<<(std::ostream& o, const zLog& Log);
-
179 
-
181  static zLog& GetEngineLog();
-
182 
-
184  static zLog& (zLog::*endl)();
-
185 
-
186  private:
-
188  virtual zLog& Newline();
-
189 
-
190  std::stringstream m_str;
-
191  std::ofstream m_log;
-
192 
-
193  LogMode m_mode;
-
194  string_t m_system;
-
195  string_t m_filename;
-
196  bool m_stdout;
-
197  bool m_init;
-
198  };
-
199 
-
200  // Include definition for the templated operator<<
-
201  #include "Log.inl"
-
202 } // namespace util
-
203 } // namespace ic
-
204 
-
205 #endif // ZENDERER__UTILITIES__LOG_HPP
-
206 
-
207 // Detailed documentation for the above class.
-
208 
+
178  friend inline std::ostream&
+
179  operator<<(std::ostream& o, const zLog& Log) { return o; }
+
180 
+
182  static zLog& GetEngineLog();
+
183 
+
185  static zLog& (zLog::*endl)();
+
186 
+
187  private:
+
189  virtual zLog& Newline();
+
190 
+
191  std::stringstream m_str;
+
192  std::ofstream m_log;
+
193 
+
194  LogMode m_mode;
+
195  string_t m_system;
+
196  string_t m_filename;
+
197  bool m_stdout;
+
198  bool m_init;
+
199  };
+
200 
+
201  // Include definition for the templated operator<<
+
202  #include "Log.inl"
+
203 } // namespace util
+
204 } // namespace ic
+
205 
+
206 #endif // ZENDERER__UTILITIES__LOG_HPP
+
207 
+
208 // Detailed documentation for the above class.
+
209 
diff --git a/docs/_log_8inl.html b/docs/_log_8inl.html index e33c0efb..c998d3e3 100644 --- a/docs/_log_8inl.html +++ b/docs/_log_8inl.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_log_8inl__dep__incl.map b/docs/_log_8inl__dep__incl.map index 2115d74f..8e4486fa 100644 --- a/docs/_log_8inl__dep__incl.map +++ b/docs/_log_8inl__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_log_8inl__dep__incl.png b/docs/_log_8inl__dep__incl.png index f13c65d9..263d42f7 100644 Binary files a/docs/_log_8inl__dep__incl.png and b/docs/_log_8inl__dep__incl.png differ diff --git a/docs/_log_8inl_source.html b/docs/_log_8inl_source.html index 8c59329d..070689c6 100644 --- a/docs/_log_8inl_source.html +++ b/docs/_log_8inl_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_logging-example.html b/docs/_logging-example.html index 43cc4613..c6364c50 100644 --- a/docs/_logging-example.html +++ b/docs/_logging-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_material_8cpp.html b/docs/_material_8cpp.html index 409c644d..31fbfbb1 100644 --- a/docs/_material_8cpp.html +++ b/docs/_material_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_material_8cpp__incl.map b/docs/_material_8cpp__incl.map index 58aaea86..f3f3b109 100644 --- a/docs/_material_8cpp__incl.map +++ b/docs/_material_8cpp__incl.map @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_material_8cpp__incl.png b/docs/_material_8cpp__incl.png index 42bb681f..28c44827 100644 Binary files a/docs/_material_8cpp__incl.png and b/docs/_material_8cpp__incl.png differ diff --git a/docs/_material_8cpp_source.html b/docs/_material_8cpp_source.html index 36538050..1d7e843b 100644 --- a/docs/_material_8cpp_source.html +++ b/docs/_material_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -118,221 +118,220 @@
7 using gfx::zMaterial;
8 
9 zMaterial::zMaterial(asset::zAssetManager& Assets) :
-
10  m_Assets(Assets),
+
10  m_Assets(Assets), m_Log(zLog::GetEngineLog()),
11  mp_Texture(&gfxcore::zTexture::GetDefaultTexture()),
-
12  m_Log(zLog::GetEngineLog()),
-
13  m_Effect(EffectType::NO_EFFECT, Assets), m_ID(0)
-
14 {
-
15  m_Effect.Init();
-
16  this->SetID();
-
17 }
-
18 
-
19 zMaterial::zMaterial(const zMaterial& Copy) :
-
20  m_Assets(Copy.m_Assets),
-
21  m_Log(zLog::GetEngineLog()),
-
22  m_Effect(Copy.m_Effect.GetType(), m_Assets),
-
23  mp_Texture(&gfxcore::zTexture::GetDefaultTexture())
-
24 {
-
25  m_Effect.Init();
-
26 
-
27  // We don't want to reload the texture for no reason.
-
28  if(Copy.mp_Texture != mp_Texture)
-
29  mp_Texture->LoadFromExisting(Copy.mp_Texture);
-
30 
-
31  this->SetID();
-
32 }
-
33 
-
34 zMaterial::~zMaterial()
-
35 {
-
36  this->Destroy();
-
37 }
-
38 
-
39 bool zMaterial::LoadFromFile(const string_t& filename)
-
40 {
-
41  this->Destroy();
-
42 
-
43  util::zParser Parser;
-
44  Parser.LoadFromFile(filename);
-
45 
-
46  string_t
-
47  vs = Parser.GetValue("vshader"),
-
48  fs = Parser.GetValue("fshader"),
-
49  tx = Parser.GetValue("texture");
-
50 
-
51  if(vs.empty() || fs.empty() || tx.empty())
-
52  {
-
53  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
-
54  << m_Log.SetSystem("Material")
-
55  << "Invalid .zfx file: Does not contain one of the following:"
-
56  << zLog::endl << "\tVertex shader filename" << zLog::endl
-
57  << "\tFragment shader filename" << zLog::endl
-
58  << "\tTexture filename" << zLog::endl;
-
59 
-
60  return false;
-
61  }
-
62 
-
63  m_Effect.SetType(gfx::EffectType::CUSTOM_EFFECT);
-
64  m_Effect.Init();
-
65  bool ret = m_Effect.LoadCustomEffect(vs, fs);
-
66  ret = ret && mp_Texture->LoadFromFile(tx);
-
67  this->SetID();
-
68  return ret;
-
69 }
-
70 
-
71 bool zMaterial::LoadFromStream(std::ifstream& f,
-
72  const std::streampos& start,
-
73  const std::streampos& end)
-
74 {
-
75  ZEN_ASSERT(f);
-
76 
-
77  f.seekg(start);
-
78  util::zParser Parser;
-
79  Parser.LoadFromStream(f, start, end);
-
80 
-
81  bool valid = false;
-
82  if(Parser.Exists("texture"))
-
83  {
-
84  valid = this->LoadTextureFromFile(Parser.GetValue("texture"));
-
85  }
-
86 
-
87  if(Parser.Exists("vshader") && Parser.Exists("fshader"))
-
88  {
-
89  valid = this->LoadEffect(gfx::EffectType::CUSTOM_EFFECT) &&
-
90  m_Effect.LoadCustomEffect(Parser.GetValue("vshader"),
-
91  Parser.GetValue("fshader"));
-
92  }
-
93 
-
94  f.seekg(start);
-
95  return valid && f;
-
96 }
-
97 
-
98 bool zMaterial::LoadTexture(const gfxcore::zTexture& Texture)
-
99 {
-
100  gfxcore::zTexture* tmp = m_Assets.Create<gfxcore::zTexture>(
-
101  Texture.GetFilename(), Texture.GetOwner());
-
102 
-
103  if(tmp == nullptr)
-
104  {
-
105  // This is a special case where we want to be assigned to the 1x1
-
106  // white texture. We can safely store it internally since it will
-
107  // not be modified, because other methods make sure we are not the
-
108  // default before changing it.
-
109  if(&Texture == &Texture.GetDefaultTexture())
-
110  {
-
111  mp_Texture = const_cast<gfxcore::zTexture*>(&Texture);
-
112  return true;
-
113  }
-
114 
-
115  m_Assets.Delete(tmp);
-
116  return false;
-
117  }
-
118 
-
119  mp_Texture = tmp;
-
120  this->SetID();
-
121  return true;
-
122 }
-
123 
-
124 bool zMaterial::LoadTextureFromFile(const string_t& filename)
-
125 {
-
126  gfxcore::zTexture* tmp = m_Assets.Create<gfxcore::zTexture>(filename);
-
127  mp_Texture = tmp;
-
128  if(mp_Texture == nullptr)
-
129  {
-
130  mp_Texture = &gfxcore::zTexture::GetDefaultTexture();
-
131  this->SetID();
-
132  return false;
-
133  }
-
134 
-
135  return true;
-
136 }
-
137 
-
138 bool zMaterial::LoadTextureFromHandle(const GLuint handle)
-
139 {
-
140  bool ret = mp_Texture->LoadFromExisting(handle);
-
141  this->SetID();
-
142  return ret;
-
143 }
-
144 
-
145 bool zMaterial::LoadEffect(const gfx::EffectType Type)
-
146 {
-
147  bool ret = true;
-
148  if(m_Effect.GetType() != Type)
-
149  {
-
150  m_Effect.Destroy();
-
151  m_Effect.SetType(Type);
-
152  ret = m_Effect.Init();
-
153  this->SetID();
-
154  }
-
155 
-
156  return ret;
-
157 }
-
158 
-
159 bool zMaterial::Attach(gfx::zEffect& E, gfxcore::zTexture& T)
-
160 {
-
161  m_Effect = E;
-
162  bool ret = mp_Texture->LoadFromExisting(&T);
-
163  this->SetID();
-
164  return ret;
-
165 }
-
166 
-
167 bool zMaterial::Enable() const
-
168 {
-
169  return m_Effect.Enable() && mp_Texture->Bind();
-
170 }
-
171 
-
172 bool zMaterial::EnableEffect() const
-
173 {
-
174  return m_Effect.Enable();
-
175 }
-
176 
-
177 bool zMaterial::EnableTexture() const
-
178 {
-
179  return mp_Texture->Bind();
-
180 }
-
181 
-
182 bool zMaterial::Disable() const
-
183 {
-
184  return m_Effect.Disable() && mp_Texture->Unbind();
-
185 }
-
186 
-
187 bool zMaterial::DisableEffect() const
-
188 {
-
189  return m_Effect.Disable();
-
190 }
-
191 
-
192 bool zMaterial::DisableTexture() const
-
193 {
-
194  return mp_Texture->Unbind();
-
195 }
-
196 
-
197 gfx::zEffect& zMaterial::GetEffect()
-
198 {
-
199  return m_Effect;
-
200 }
-
201 
-
202 const gfx::zEffect& zMaterial::GetEffect() const
-
203 {
-
204  return m_Effect;
-
205 }
-
206 
-
207 const gfxcore::zTexture& zMaterial::GetTexture() const
-
208 {
-
209  return *mp_Texture;
-
210 }
-
211 
-
212 void zMaterial::Destroy()
-
213 {
-
214  m_Effect.Destroy();
-
215  if(mp_Texture != &gfxcore::zTexture::GetDefaultTexture())
-
216  m_Assets.Delete(mp_Texture);
-
217  this->SetID();
-
218 }
-
219 
-
220 void zMaterial::SetID()
-
221 {
-
222  m_ID = (mp_Texture->GetID() << 10) & m_Effect.GetID();
-
223  ZEN_ASSERT(m_ID == 0);
-
224 }
+
12  m_Effect(EffectType::NO_EFFECT, Assets), m_ID(0)
+
13 {
+
14  m_Effect.Init();
+
15  this->SetID();
+
16 }
+
17 
+
18 zMaterial::zMaterial(const zMaterial& Copy) :
+
19  m_Assets(Copy.m_Assets),
+
20  m_Log(zLog::GetEngineLog()),
+
21  mp_Texture(&gfxcore::zTexture::GetDefaultTexture()),
+
22  m_Effect(Copy.m_Effect.GetType(), m_Assets)
+
23 {
+
24  m_Effect.Init();
+
25 
+
26  // We don't want to reload the texture for no reason.
+
27  if(Copy.mp_Texture != mp_Texture)
+
28  mp_Texture->LoadFromExisting(Copy.mp_Texture);
+
29 
+
30  this->SetID();
+
31 }
+
32 
+
33 zMaterial::~zMaterial()
+
34 {
+
35  this->Destroy();
+
36 }
+
37 
+
38 bool zMaterial::LoadFromFile(const string_t& filename)
+
39 {
+
40  this->Destroy();
+
41 
+
42  util::zParser Parser;
+
43  Parser.LoadFromFile(filename);
+
44 
+
45  string_t
+
46  vs = Parser.GetValue("vshader"),
+
47  fs = Parser.GetValue("fshader"),
+
48  tx = Parser.GetValue("texture");
+
49 
+
50  if(vs.empty() || fs.empty() || tx.empty())
+
51  {
+
52  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
+
53  << m_Log.SetSystem("Material")
+
54  << "Invalid .zfx file: Does not contain one of the following:"
+
55  << zLog::endl << "\tVertex shader filename" << zLog::endl
+
56  << "\tFragment shader filename" << zLog::endl
+
57  << "\tTexture filename" << zLog::endl;
+
58 
+
59  return false;
+
60  }
+
61 
+
62  m_Effect.SetType(gfx::EffectType::CUSTOM_EFFECT);
+
63  m_Effect.Init();
+
64  bool ret = m_Effect.LoadCustomEffect(vs, fs);
+
65  ret = ret && mp_Texture->LoadFromFile(tx);
+
66  this->SetID();
+
67  return ret;
+
68 }
+
69 
+
70 bool zMaterial::LoadFromStream(std::ifstream& f,
+
71  const std::streampos& start,
+
72  const std::streampos& end)
+
73 {
+
74  ZEN_ASSERT(f);
+
75 
+
76  f.seekg(start);
+
77  util::zParser Parser;
+
78  Parser.LoadFromStream(f, start, end);
+
79 
+
80  bool valid = false;
+
81  if(Parser.Exists("texture"))
+
82  {
+
83  valid = this->LoadTextureFromFile(Parser.GetValue("texture"));
+
84  }
+
85 
+
86  if(Parser.Exists("vshader") && Parser.Exists("fshader"))
+
87  {
+
88  valid = this->LoadEffect(gfx::EffectType::CUSTOM_EFFECT) &&
+
89  m_Effect.LoadCustomEffect(Parser.GetValue("vshader"),
+
90  Parser.GetValue("fshader"));
+
91  }
+
92 
+
93  f.seekg(start);
+
94  return valid && f;
+
95 }
+
96 
+
97 bool zMaterial::LoadTexture(const gfxcore::zTexture& Texture)
+
98 {
+
99  gfxcore::zTexture* tmp = m_Assets.Create<gfxcore::zTexture>(
+
100  Texture.GetFilename(), Texture.GetOwner());
+
101 
+
102  if(tmp == nullptr)
+
103  {
+
104  // This is a special case where we want to be assigned to the 1x1
+
105  // white texture. We can safely store it internally since it will
+
106  // not be modified, because other methods make sure we are not the
+
107  // default before changing it.
+
108  if(&Texture == &Texture.GetDefaultTexture())
+
109  {
+
110  mp_Texture = const_cast<gfxcore::zTexture*>(&Texture);
+
111  return true;
+
112  }
+
113 
+
114  m_Assets.Delete(tmp);
+
115  return false;
+
116  }
+
117 
+
118  mp_Texture = tmp;
+
119  this->SetID();
+
120  return true;
+
121 }
+
122 
+
123 bool zMaterial::LoadTextureFromFile(const string_t& filename)
+
124 {
+
125  gfxcore::zTexture* tmp = m_Assets.Create<gfxcore::zTexture>(filename);
+
126  mp_Texture = tmp;
+
127  if(mp_Texture == nullptr)
+
128  {
+
129  mp_Texture = &gfxcore::zTexture::GetDefaultTexture();
+
130  this->SetID();
+
131  return false;
+
132  }
+
133 
+
134  return true;
+
135 }
+
136 
+
137 bool zMaterial::LoadTextureFromHandle(const GLuint handle)
+
138 {
+
139  bool ret = mp_Texture->LoadFromExisting(handle);
+
140  this->SetID();
+
141  return ret;
+
142 }
+
143 
+
144 bool zMaterial::LoadEffect(const gfx::EffectType Type)
+
145 {
+
146  bool ret = true;
+
147  if(m_Effect.GetType() != Type)
+
148  {
+
149  m_Effect.Destroy();
+
150  m_Effect.SetType(Type);
+
151  ret = m_Effect.Init();
+
152  this->SetID();
+
153  }
+
154 
+
155  return ret;
+
156 }
+
157 
+
158 bool zMaterial::Attach(gfx::zEffect& E, gfxcore::zTexture& T)
+
159 {
+
160  m_Effect = E;
+
161  bool ret = mp_Texture->LoadFromExisting(&T);
+
162  this->SetID();
+
163  return ret;
+
164 }
+
165 
+
166 bool zMaterial::Enable() const
+
167 {
+
168  return m_Effect.Enable() && mp_Texture->Bind();
+
169 }
+
170 
+
171 bool zMaterial::EnableEffect() const
+
172 {
+
173  return m_Effect.Enable();
+
174 }
+
175 
+
176 bool zMaterial::EnableTexture() const
+
177 {
+
178  return mp_Texture->Bind();
+
179 }
+
180 
+
181 bool zMaterial::Disable() const
+
182 {
+
183  return m_Effect.Disable() && mp_Texture->Unbind();
+
184 }
+
185 
+
186 bool zMaterial::DisableEffect() const
+
187 {
+
188  return m_Effect.Disable();
+
189 }
+
190 
+
191 bool zMaterial::DisableTexture() const
+
192 {
+
193  return mp_Texture->Unbind();
+
194 }
+
195 
+
196 gfx::zEffect& zMaterial::GetEffect()
+
197 {
+
198  return m_Effect;
+
199 }
+
200 
+
201 const gfx::zEffect& zMaterial::GetEffect() const
+
202 {
+
203  return m_Effect;
+
204 }
+
205 
+
206 const gfxcore::zTexture& zMaterial::GetTexture() const
+
207 {
+
208  return *mp_Texture;
+
209 }
+
210 
+
211 void zMaterial::Destroy()
+
212 {
+
213  m_Effect.Destroy();
+
214  if(mp_Texture != &gfxcore::zTexture::GetDefaultTexture())
+
215  m_Assets.Delete(mp_Texture);
+
216  this->SetID();
+
217 }
+
218 
+
219 void zMaterial::SetID()
+
220 {
+
221  m_ID = (mp_Texture->GetID() << 10) & m_Effect.GetID();
+
222  ZEN_ASSERT(m_ID == 0);
+
223 }
diff --git a/docs/_material_8hpp.html b/docs/_material_8hpp.html index 3987032c..ffc2cf49 100644 --- a/docs/_material_8hpp.html +++ b/docs/_material_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -126,14 +126,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_material_8hpp__dep__incl.map b/docs/_material_8hpp__dep__incl.map index c2e74863..889cd5a8 100644 --- a/docs/_material_8hpp__dep__incl.map +++ b/docs/_material_8hpp__dep__incl.map @@ -1,40 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_material_8hpp__dep__incl.png b/docs/_material_8hpp__dep__incl.png index 34ccd834..484bfa4f 100644 Binary files a/docs/_material_8hpp__dep__incl.png and b/docs/_material_8hpp__dep__incl.png differ diff --git a/docs/_material_8hpp__incl.map b/docs/_material_8hpp__incl.map index 393ea809..8175bafc 100644 --- a/docs/_material_8hpp__incl.map +++ b/docs/_material_8hpp__incl.map @@ -1,27 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_material_8hpp__incl.png b/docs/_material_8hpp__incl.png index a9b06a85..58d617a3 100644 Binary files a/docs/_material_8hpp__incl.png and b/docs/_material_8hpp__incl.png differ diff --git a/docs/_material_8hpp_source.html b/docs/_material_8hpp_source.html index 8b9dc0d0..5f3f5519 100644 --- a/docs/_material_8hpp_source.html +++ b/docs/_material_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_math_8hpp.html b/docs/_math_8hpp.html index 7d52a49e..52556695 100644 --- a/docs/_math_8hpp.html +++ b/docs/_math_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -128,7 +128,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_math_8hpp__dep__incl.map b/docs/_math_8hpp__dep__incl.map index 2cbe9baf..9532bd34 100644 --- a/docs/_math_8hpp__dep__incl.map +++ b/docs/_math_8hpp__dep__incl.map @@ -1,27 +1,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_math_8hpp__dep__incl.png b/docs/_math_8hpp__dep__incl.png index bd901cc5..1fa652d6 100644 Binary files a/docs/_math_8hpp__dep__incl.png and b/docs/_math_8hpp__dep__incl.png differ diff --git a/docs/_math_8hpp_source.html b/docs/_math_8hpp_source.html index c2e80744..e7003edb 100644 --- a/docs/_math_8hpp_source.html +++ b/docs/_math_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_math_core_8cpp.html b/docs/_math_core_8cpp.html index ea35b6a0..88d270c2 100644 --- a/docs/_math_core_8cpp.html +++ b/docs/_math_core_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_math_core_8cpp_source.html b/docs/_math_core_8cpp_source.html index 48f4e210..ebc5a591 100644 --- a/docs/_math_core_8cpp_source.html +++ b/docs/_math_core_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_math_core_8hpp.html b/docs/_math_core_8hpp.html index 6fcf9887..249014f0 100644 --- a/docs/_math_core_8hpp.html +++ b/docs/_math_core_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,7 +132,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_math_core_8hpp__dep__incl.map b/docs/_math_core_8hpp__dep__incl.map index c56d89f7..e4e92880 100644 --- a/docs/_math_core_8hpp__dep__incl.map +++ b/docs/_math_core_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_math_core_8hpp__dep__incl.png b/docs/_math_core_8hpp__dep__incl.png index af17a540..3d1f9b3f 100644 Binary files a/docs/_math_core_8hpp__dep__incl.png and b/docs/_math_core_8hpp__dep__incl.png differ diff --git a/docs/_math_core_8hpp_source.html b/docs/_math_core_8hpp_source.html index 6995a862..50874110 100644 --- a/docs/_math_core_8hpp_source.html +++ b/docs/_math_core_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_math_core_8inl.html b/docs/_math_core_8inl.html index fa5320e5..3b2b93d4 100644 --- a/docs/_math_core_8inl.html +++ b/docs/_math_core_8inl.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -116,7 +116,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_math_core_8inl__dep__incl.map b/docs/_math_core_8inl__dep__incl.map index 7ee58d2e..c6ec5f79 100644 --- a/docs/_math_core_8inl__dep__incl.map +++ b/docs/_math_core_8inl__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_math_core_8inl__dep__incl.png b/docs/_math_core_8inl__dep__incl.png index 76dabe94..1b26f2b0 100644 Binary files a/docs/_math_core_8inl__dep__incl.png and b/docs/_math_core_8inl__dep__incl.png differ diff --git a/docs/_math_core_8inl_source.html b/docs/_math_core_8inl_source.html index fe4b785b..a8942fae 100644 --- a/docs/_math_core_8inl_source.html +++ b/docs/_math_core_8inl_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_matrix_8cpp.html b/docs/_matrix_8cpp.html index 5794b7e5..986c2e27 100644 --- a/docs/_matrix_8cpp.html +++ b/docs/_matrix_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,13 +109,14 @@
Matrix.cpp File Reference
-
#include "Zenderer/Math/Matrix.hpp"
+
#include <cstring>
+#include "Zenderer/Math/Matrix.hpp"
Include dependency graph for Matrix.cpp:
- +

Go to the source code of this file.

diff --git a/docs/_matrix_8cpp__incl.map b/docs/_matrix_8cpp__incl.map index 82d3f62c..b3ef09ce 100644 --- a/docs/_matrix_8cpp__incl.map +++ b/docs/_matrix_8cpp__incl.map @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/docs/_matrix_8cpp__incl.png b/docs/_matrix_8cpp__incl.png index 05effea2..a7efd371 100644 Binary files a/docs/_matrix_8cpp__incl.png and b/docs/_matrix_8cpp__incl.png differ diff --git a/docs/_matrix_8cpp_source.html b/docs/_matrix_8cpp_source.html index 76336479..b633fbcd 100644 --- a/docs/_matrix_8cpp_source.html +++ b/docs/_matrix_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,78 +109,79 @@
Matrix.cpp
-Go to the documentation of this file.
1 #include "Zenderer/Math/Matrix.hpp"
-
2 
-
3 using namespace zen;
-
4 using namespace math;
-
5 
-
6 matrix4x4_t::matrix4x4_t()
-
7 {
-
8  memset(m_values, 0, sizeof(m_values));
-
9 }
-
10 
-
11 matrix4x4_t::matrix4x4_t(const real_t values[4][4])
-
12 {
-
13  for(size_t i = 0; i < 4; ++i)
-
14  for(size_t j = 0; j < 4; ++j)
-
15  m_values[i][j] = values[i][j];
-
16 }
-
17 
-
18 matrix4x4_t::matrix4x4_t(const real_t** ppvalues)
-
19 {
-
20  for(size_t i = 0; i < 4; ++i)
-
21  for(size_t j = 0; j < 4; ++j)
-
22  m_values[i][j] = ppvalues[i][j];
-
23 }
-
24 
-
25 matrix4x4_t::matrix4x4_t(const matrix4x4_t& Copy)
-
26 {
-
27  memcpy(m_values, Copy.GetPointer(), sizeof(m_values));
-
28 }
-
29 
-
30 matrix4x4_t& matrix4x4_t::operator=(const matrix4x4_t& Copy)
-
31 {
-
32  memcpy(m_values, Copy.GetPointer(), sizeof(m_values));
-
33 
-
34  return (*this);
-
35 }
-
36 
-
37 real_t* matrix4x4_t::operator[](uint8_t index)
-
38 {
-
39  clamp<uint8_t>(index, 0, 3);
-
40  return m_values[index];
-
41 }
-
42 
-
43 const real_t* const matrix4x4_t::operator[](uint8_t index) const
-
44 {
-
45  clamp<uint8_t>(index, 0, 3);
-
46  return m_values[index];
-
47 }
-
48 
-
49 matrix4x4_t matrix4x4_t::operator*(matrix4x4_t& Other) const
-
50 {
-
51  matrix4x4_t Res;
-
52 
-
53  for(uint8_t r = 0; r < 4; ++r)
-
54  for(uint8_t c = 0; c < 4; ++c)
-
55  for(uint8_t e = 0; e < 4; ++e)
-
56  Res[r][c] += (m_values[r][e]) * (Other[e][c]);
-
57 
-
58  return Res;
-
59 }
-
60 
-
61 matrix4x4_t matrix4x4_t::CreateIdentityMatrix()
-
62 {
-
63  matrix4x4_t Result;
-
64  Result[0][0] = Result[1][1] = Result[2][2] = Result[3][3] = 1.0;
-
65  return Result;
-
66 }
-
67 
-
68 const matrix4x4_t& matrix4x4_t::GetIdentityMatrix()
-
69 {
-
70  static const matrix4x4_t IDENTITY = matrix4x4_t::CreateIdentityMatrix();
-
71  return IDENTITY;
-
72 }
+Go to the documentation of this file.
1 #include <cstring>
+
2 #include "Zenderer/Math/Matrix.hpp"
+
3 
+
4 using namespace zen;
+
5 using namespace math;
+
6 
+
7 matrix4x4_t::matrix4x4_t()
+
8 {
+
9  memset(m_values, 0, sizeof(m_values));
+
10 }
+
11 
+
12 matrix4x4_t::matrix4x4_t(const real_t values[4][4])
+
13 {
+
14  for(size_t i = 0; i < 4; ++i)
+
15  for(size_t j = 0; j < 4; ++j)
+
16  m_values[i][j] = values[i][j];
+
17 }
+
18 
+
19 matrix4x4_t::matrix4x4_t(const real_t** ppvalues)
+
20 {
+
21  for(size_t i = 0; i < 4; ++i)
+
22  for(size_t j = 0; j < 4; ++j)
+
23  m_values[i][j] = ppvalues[i][j];
+
24 }
+
25 
+
26 matrix4x4_t::matrix4x4_t(const matrix4x4_t& Copy)
+
27 {
+
28  memcpy(m_values, Copy.GetPointer(), sizeof(m_values));
+
29 }
+
30 
+
31 matrix4x4_t& matrix4x4_t::operator=(const matrix4x4_t& Copy)
+
32 {
+
33  memcpy(m_values, Copy.GetPointer(), sizeof(m_values));
+
34 
+
35  return (*this);
+
36 }
+
37 
+
38 real_t* matrix4x4_t::operator[](uint8_t index)
+
39 {
+
40  clamp<uint8_t>(index, 0, 3);
+
41  return m_values[index];
+
42 }
+
43 
+
44 const real_t* const matrix4x4_t::operator[](uint8_t index) const
+
45 {
+
46  clamp<uint8_t>(index, 0, 3);
+
47  return m_values[index];
+
48 }
+
49 
+
50 matrix4x4_t matrix4x4_t::operator*(matrix4x4_t& Other) const
+
51 {
+
52  matrix4x4_t Res;
+
53 
+
54  for(uint8_t r = 0; r < 4; ++r)
+
55  for(uint8_t c = 0; c < 4; ++c)
+
56  for(uint8_t e = 0; e < 4; ++e)
+
57  Res[r][c] += (m_values[r][e]) * (Other[e][c]);
+
58 
+
59  return Res;
+
60 }
+
61 
+
62 matrix4x4_t matrix4x4_t::CreateIdentityMatrix()
+
63 {
+
64  matrix4x4_t Result;
+
65  Result[0][0] = Result[1][1] = Result[2][2] = Result[3][3] = 1.0;
+
66  return Result;
+
67 }
+
68 
+
69 const matrix4x4_t& matrix4x4_t::GetIdentityMatrix()
+
70 {
+
71  static const matrix4x4_t IDENTITY = matrix4x4_t::CreateIdentityMatrix();
+
72  return IDENTITY;
+
73 }
diff --git a/docs/_matrix_8hpp.html b/docs/_matrix_8hpp.html index 77200332..4a00eefb 100644 --- a/docs/_matrix_8hpp.html +++ b/docs/_matrix_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,7 +129,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_matrix_8hpp__dep__incl.map b/docs/_matrix_8hpp__dep__incl.map index 2e988cf2..013a043a 100644 --- a/docs/_matrix_8hpp__dep__incl.map +++ b/docs/_matrix_8hpp__dep__incl.map @@ -1,46 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_matrix_8hpp__dep__incl.png b/docs/_matrix_8hpp__dep__incl.png index 1caa3269..3e6abe0f 100644 Binary files a/docs/_matrix_8hpp__dep__incl.png and b/docs/_matrix_8hpp__dep__incl.png differ diff --git a/docs/_matrix_8hpp_source.html b/docs/_matrix_8hpp_source.html index 1b213a08..e86e85aa 100644 --- a/docs/_matrix_8hpp_source.html +++ b/docs/_matrix_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_menu_8cpp.html b/docs/_menu_8cpp.html index d4a32dfd..c00cdc5c 100644 --- a/docs/_menu_8cpp.html +++ b/docs/_menu_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_menu_8cpp__incl.map b/docs/_menu_8cpp__incl.map index 07232006..26f0b82a 100644 --- a/docs/_menu_8cpp__incl.map +++ b/docs/_menu_8cpp__incl.map @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_menu_8cpp__incl.png b/docs/_menu_8cpp__incl.png index 3ce61454..ddba3c06 100644 Binary files a/docs/_menu_8cpp__incl.png and b/docs/_menu_8cpp__incl.png differ diff --git a/docs/_menu_8cpp_source.html b/docs/_menu_8cpp_source.html index 9dbee236..9238e4ec 100644 --- a/docs/_menu_8cpp_source.html +++ b/docs/_menu_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -116,8 +116,8 @@
5 
6 zMenu::zMenu(gfx::zWindow& Window, asset::zAssetManager& Assets) :
7  m_Scene(Window.GetWidth(), Window.GetHeight(), Assets),
-
8  mp_Font(Assets.Create<gui::zFont>()),
-
9  mp_Bg(nullptr), m_spacing(0)
+
8  mp_Bg(nullptr), mp_Font(Assets.Create<gui::zFont>()),
+
9  m_spacing(0)
10 {
11  m_Scene.Init();
12  m_menuActions.clear();
diff --git a/docs/_menu_8hpp.html b/docs/_menu_8hpp.html index 7e94c8f0..22add488 100644 --- a/docs/_menu_8hpp.html +++ b/docs/_menu_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -128,14 +128,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_menu_8hpp__dep__incl.map b/docs/_menu_8hpp__dep__incl.map index 25f40da4..b0218b52 100644 --- a/docs/_menu_8hpp__dep__incl.map +++ b/docs/_menu_8hpp__dep__incl.map @@ -1,8 +1,9 @@ - - + + - - + + + diff --git a/docs/_menu_8hpp__dep__incl.png b/docs/_menu_8hpp__dep__incl.png index 72bd3dfd..1f176bd1 100644 Binary files a/docs/_menu_8hpp__dep__incl.png and b/docs/_menu_8hpp__dep__incl.png differ diff --git a/docs/_menu_8hpp__incl.map b/docs/_menu_8hpp__incl.map index b7a8eaad..67a28a09 100644 --- a/docs/_menu_8hpp__incl.map +++ b/docs/_menu_8hpp__incl.map @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_menu_8hpp__incl.png b/docs/_menu_8hpp__incl.png index 9f4037ff..adf7a514 100644 Binary files a/docs/_menu_8hpp__incl.png and b/docs/_menu_8hpp__incl.png differ diff --git a/docs/_menu_8hpp_source.html b/docs/_menu_8hpp_source.html index d75eb978..20dfb364 100644 --- a/docs/_menu_8hpp_source.html +++ b/docs/_menu_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -150,7 +150,7 @@
59  void SetSpacing(const uint16_t vertical_spacing);
60 
61  private:
-
62  gfx::zScene m_Scene;
+
62  gfx::zScene m_Scene;
63  const obj::zEntity* mp_Bg;
64  gui::zFont* mp_Font;
65  color4f_t m_acolor, m_ncolor;
diff --git a/docs/_mouse_8cpp.html b/docs/_mouse_8cpp.html index bf3db9f0..34c73200 100644 --- a/docs/_mouse_8cpp.html +++ b/docs/_mouse_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_mouse_8cpp_source.html b/docs/_mouse_8cpp_source.html index 58380965..3204ea72 100644 --- a/docs/_mouse_8cpp_source.html +++ b/docs/_mouse_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_mouse_8hpp.html b/docs/_mouse_8hpp.html index 2740b33b..3385d21b 100644 --- a/docs/_mouse_8hpp.html +++ b/docs/_mouse_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -133,7 +133,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_mouse_8hpp__dep__incl.map b/docs/_mouse_8hpp__dep__incl.map index dc6e85ab..4b74792b 100644 --- a/docs/_mouse_8hpp__dep__incl.map +++ b/docs/_mouse_8hpp__dep__incl.map @@ -2,30 +2,31 @@ - + - + - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/_mouse_8hpp__dep__incl.png b/docs/_mouse_8hpp__dep__incl.png index af618682..8e98b3bf 100644 Binary files a/docs/_mouse_8hpp__dep__incl.png and b/docs/_mouse_8hpp__dep__incl.png differ diff --git a/docs/_mouse_8hpp_source.html b/docs/_mouse_8hpp_source.html index 5b10d835..3c446e2c 100644 --- a/docs/_mouse_8hpp_source.html +++ b/docs/_mouse_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_music2_d_8cpp.html b/docs/_music2_d_8cpp.html index 36a29491..ddc2fe7b 100644 --- a/docs/_music2_d_8cpp.html +++ b/docs/_music2_d_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_music2_d_8cpp_source.html b/docs/_music2_d_8cpp_source.html index 4101b6b4..54da5d74 100644 --- a/docs/_music2_d_8cpp_source.html +++ b/docs/_music2_d_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_music2_d_8hpp.html b/docs/_music2_d_8hpp.html index 4c95817c..da30d454 100644 --- a/docs/_music2_d_8hpp.html +++ b/docs/_music2_d_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,7 +129,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_music2_d_8hpp__dep__incl.map b/docs/_music2_d_8hpp__dep__incl.map index f64c1d50..9437c700 100644 --- a/docs/_music2_d_8hpp__dep__incl.map +++ b/docs/_music2_d_8hpp__dep__incl.map @@ -1,8 +1,9 @@ - - + + - - + + + diff --git a/docs/_music2_d_8hpp__dep__incl.png b/docs/_music2_d_8hpp__dep__incl.png index 5d70422d..01c27ecb 100644 Binary files a/docs/_music2_d_8hpp__dep__incl.png and b/docs/_music2_d_8hpp__dep__incl.png differ diff --git a/docs/_music2_d_8hpp_source.html b/docs/_music2_d_8hpp_source.html index 76d3bce0..245efc32 100644 --- a/docs/_music2_d_8hpp_source.html +++ b/docs/_music2_d_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_open_g_l_8cpp.html b/docs/_open_g_l_8cpp.html index 0717199d..7914aa96 100644 --- a/docs/_open_g_l_8cpp.html +++ b/docs/_open_g_l_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_open_g_l_8cpp_source.html b/docs/_open_g_l_8cpp_source.html index 08aa9924..fe3368c4 100644 --- a/docs/_open_g_l_8cpp_source.html +++ b/docs/_open_g_l_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_open_g_l_8hpp.html b/docs/_open_g_l_8hpp.html index f3e7d226..c9c784f2 100644 --- a/docs/_open_g_l_8hpp.html +++ b/docs/_open_g_l_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -137,7 +137,7 @@
- +

Go to the source code of this file.

@@ -218,7 +218,7 @@
Examples:
VertexArray.
-

Definition at line 96 of file OpenGL.hpp.

+

Definition at line 101 of file OpenGL.hpp.

@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,95 +115,100 @@
29 
30 #include <vector>
31 
-
32 #include "GL/glew.h"
-
33 #include "GL/glfw3.h"
-
34 
-
35 #include "Zenderer/Core/Types.hpp"
-
36 #include "Zenderer/Math/Vector.hpp"
-
37 #include "Zenderer/Utilities/Assert.hpp"
-
38 
-
39 #ifdef GL
-
40  #undef GL
-
41 #endif // GL
-
42 
-
43 #ifdef ZEN_DEBUG_BUILD
-
44  #define GL(f) f; zen::gfxcore::glCheck(#f, __LINE__, __FILE__);
-
46 #else
-
47  #define GL(f) f; if(glGetError() != GL_NO_ERROR) return false;
-
48 #endif // ZEN_DEBUG_BUILD
-
49 
-
50 namespace zen
-
51 {
-
52  void ZEN_API Quit();
-
53  namespace gfx { class ZEN_API zWindow; }
-
54 
-
61 namespace gfxcore
-
62 {
-
73  inline ZEN_API bool glCheck(const char* expr,
-
74  const uint32_t line,
-
75  const char* file)
-
76  {
-
77  GLenum error_code = glGetError();
-
78 
-
79  if(error_code == GL_NO_ERROR) return true;
-
80 
-
81  // So it's not recreated on the stack every time.
-
82  static std::stringstream ss;
+
32 // I statically link GLEW when using MinGW.
+
33 #ifdef __GNUC__
+
34  #define GLEW_STATIC
+
35 #endif // __GNUC__
+
36 
+
37 #include "GL/glew.h"
+
38 #include "GL/glfw3.h"
+
39 
+
40 #include "Zenderer/Core/Types.hpp"
+
41 #include "Zenderer/Math/Vector.hpp"
+
42 #include "Zenderer/Utilities/Assert.hpp"
+
43 
+
44 #ifdef GL
+
45  #undef GL
+
46 #endif // GL
+
47 
+
48 #ifdef ZEN_DEBUG_BUILD
+
49  #define GL(f) f; zen::gfxcore::glCheck(#f, __LINE__, __FILE__);
+
51 #else
+
52  #define GL(f) f; if(glGetError() != GL_NO_ERROR) return false;
+
53 #endif // ZEN_DEBUG_BUILD
+
54 
+
55 namespace zen
+
56 {
+
57  void ZEN_API Quit();
+
58  namespace gfx { class ZEN_API zWindow; }
+
59 
+
66 namespace gfxcore
+
67 {
+
78  inline ZEN_API bool glCheck(const char* expr,
+
79  const uint32_t line,
+
80  const char* file)
+
81  {
+
82  GLenum error_code = glGetError();
83 
-
84  // Clear existing data (since static).
-
85  ss.str(std::string());
-
86 
-
87  // Format: CODE (STRING).
-
88  ss << error_code << " (" << gluErrorString(error_code) << ").";
-
89 
-
90  // Express our discontent.
-
91  util::runtime_assert(false, expr, line, file, ss.str().c_str());
-
92 
-
93  return false;
-
94  }
-
95 
-
96  struct ZEN_API vertex_t
-
97  {
-
98  math::vector_t position;
-
99  math::vector_t tc;
-
100  color4f_t color;
-
101  };
-
102 
-
104  class ZEN_API zGLSubsystem
-
105  {
-
106  public:
-
107  zGLSubsystem(const string_t name = "OpenGL");
-
108  virtual ~zGLSubsystem();
-
109 
-
110  virtual bool Init() = 0;
-
111  virtual bool Destroy() = 0;
-
112 
-
113  virtual bool Bind() const = 0;
-
114  virtual bool Unbind() const = 0;
-
115 
-
116  virtual GLuint GetObjectHandle() const = 0;
+
84  if(error_code == GL_NO_ERROR) return true;
+
85 
+
86  // So it's not recreated on the stack every time.
+
87  static std::stringstream ss;
+
88 
+
89  // Clear existing data (since static).
+
90  ss.str(std::string());
+
91 
+
92  // Format: CODE (STRING).
+
93  ss << error_code << " (" << gluErrorString(error_code) << ").";
+
94 
+
95  // Express our discontent.
+
96  util::runtime_assert(false, expr, line, file, ss.str().c_str());
+
97 
+
98  return false;
+
99  }
+
100 
+
101  struct ZEN_API vertex_t
+
102  {
+
103  math::vector_t position;
+
104  math::vector_t tc;
+
105  color4f_t color;
+
106  };
+
107 
+
109  class ZEN_API zGLSubsystem
+
110  {
+
111  public:
+
112  zGLSubsystem(const string_t name = "OpenGL");
+
113  virtual ~zGLSubsystem();
+
114 
+
115  virtual bool Init() = 0;
+
116  virtual bool Destroy() = 0;
117 
-
118  inline bool IsInit() { return m_init; }
-
119 
-
120  virtual inline const string_t& GetName() const
-
121  { return m_name; }
+
118  virtual bool Bind() const = 0;
+
119  virtual bool Unbind() const = 0;
+
120 
+
121  virtual GLuint GetObjectHandle() const = 0;
122 
-
123  friend ZEN_API void zen::Quit();
-
124  friend gfx::zWindow;
-
125 
-
126  protected:
-
127  bool m_init;
-
128 
-
129  private:
-
130  static std::vector<zGLSubsystem*> sp_allGLSystems;
-
131 
-
132  string_t m_name;
-
133  };
-
134 } // namespace gfx
-
135 } // namespace zen
+
123  inline bool IsInit() { return m_init; }
+
124 
+
125  virtual inline const string_t& GetName() const
+
126  { return m_name; }
+
127 
+
128  friend ZEN_API void zen::Quit();
+
129  friend gfx::zWindow;
+
130 
+
131  protected:
+
132  bool m_init;
+
133 
+
134  private:
+
135  static std::vector<zGLSubsystem*> sp_allGLSystems;
136 
-
137 #endif // ZENDERER__CORE_GRAPHICS__OPENGL_HPP
-
138 
+
137  string_t m_name;
+
138  };
+
139 } // namespace gfx
+
140 } // namespace zen
+
141 
+
142 #endif // ZENDERER__CORE_GRAPHICS__OPENGL_HPP
+
143 
diff --git a/docs/_parsing-example.html b/docs/_parsing-example.html index e8107848..c391b880 100644 --- a/docs/_parsing-example.html +++ b/docs/_parsing-example.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_physics_8hpp.html b/docs/_physics_8hpp.html index 9a2c6536..b396ff55 100644 --- a/docs/_physics_8hpp.html +++ b/docs/_physics_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_physics_8hpp_source.html b/docs/_physics_8hpp_source.html index e416d524..e59eb3ed 100644 --- a/docs/_physics_8hpp_source.html +++ b/docs/_physics_8hpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_polygon_8cpp.html b/docs/_polygon_8cpp.html index 4bf10ee1..b738b66a 100644 --- a/docs/_polygon_8cpp.html +++ b/docs/_polygon_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_polygon_8cpp__incl.map b/docs/_polygon_8cpp__incl.map index 101853b5..4849abd9 100644 --- a/docs/_polygon_8cpp__incl.map +++ b/docs/_polygon_8cpp__incl.map @@ -1,35 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_polygon_8cpp__incl.png b/docs/_polygon_8cpp__incl.png index 3280f935..115b95a5 100644 Binary files a/docs/_polygon_8cpp__incl.png and b/docs/_polygon_8cpp__incl.png differ diff --git a/docs/_polygon_8cpp_source.html b/docs/_polygon_8cpp_source.html index 64f52c28..f8cfa4e3 100644 --- a/docs/_polygon_8cpp_source.html +++ b/docs/_polygon_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -118,8 +118,8 @@
7 using gfx::zPolygon;
8 
9 zPolygon::zPolygon(asset::zAssetManager& Assets, const size_t preload) :
-
10  m_Assets(Assets), mp_VAO(nullptr), m_Material(Assets),
-
11  mp_MVMatrix(nullptr), m_offset(0), m_internal(false)
+
10  m_Assets(Assets), mp_MVMatrix(nullptr), mp_VAO(nullptr),
+
11  m_offset(0), m_Material(Assets), m_internal(false)
12 {
13  m_DrawData.Vertices = nullptr;
14  m_DrawData.Indices = nullptr;
@@ -133,354 +133,417 @@
22 }
23 
24 zPolygon::zPolygon(const zPolygon& Copy) :
-
25  m_Assets(Copy.m_Assets),
-
26  mp_VAO(nullptr), m_Material(m_Assets),
-
27  mp_MVMatrix(nullptr), m_offset(0),
-
28  m_internal(false), m_BoundingBox(Copy.m_BoundingBox)
-
29 {
-
30  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
31  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
32 
-
33  m_DrawData.vcount = Copy.m_DrawData.vcount;
-
34  m_DrawData.icount = Copy.m_DrawData.icount;
-
35  m_DrawData.Vertices = new gfxcore::vertex_t[m_DrawData.vcount];
-
36  m_DrawData.Indices = new gfxcore::index_t[m_DrawData.icount];
-
37 
-
38  ZEN_ASSERT(m_DrawData.vcount > 0 && m_DrawData.icount > 0);
-
39 
-
40  for(size_t i = 0; i < m_DrawData.icount; ++i)
-
41  m_DrawData.Indices[i] = Copy.m_DrawData.Indices[i];
-
42 
-
43  for(size_t v = 0; v < m_DrawData.vcount; ++v)
-
44  m_DrawData.Vertices[v] = Copy.m_DrawData.Vertices[v];
-
45 
-
46  if(Copy.mp_MVMatrix != nullptr)
-
47  mp_MVMatrix = new math::matrix4x4_t(*Copy.mp_MVMatrix);
-
48 
-
49  m_Verts.reserve(Copy.m_Verts.size());
-
50  for(auto i : Copy.m_Verts) m_Verts.emplace_back(i);
-
51 
-
52  m_Tris.reserve(Copy.m_Tris.size());
-
53  for(auto i : Copy.m_Tris) m_Tris.emplace_back(i);
-
54 }
-
55 
-
56 zPolygon::zPolygon(zPolygon&& Move) :
-
57  m_Assets(Move.m_Assets),
-
58  mp_VAO(nullptr), m_Material(m_Assets),
-
59  mp_MVMatrix(Move.mp_MVMatrix), m_offset(0),
-
60  m_internal(false), m_Verts(Move.m_Verts),
-
61  m_Tris(Move.m_Tris)
-
62 {
-
63  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
64  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
65 
-
66  m_DrawData.vcount = Move.m_DrawData.vcount;
-
67  m_DrawData.icount = Move.m_DrawData.icount;
-
68  m_DrawData.Vertices = Move.m_DrawData.Vertices;
-
69  m_DrawData.Indices = Move.m_DrawData.Indices;
-
70 
-
71  Move.m_DrawData.Vertices = nullptr;
-
72  Move.m_DrawData.Indices = nullptr;
-
73  Move.mp_MVMatrix = nullptr;
+
25  m_Assets(Copy.m_Assets), mp_MVMatrix(nullptr),
+
26  mp_VAO(nullptr), m_offset(0), m_Material(m_Assets),
+
27  m_BoundingBox(Copy.m_BoundingBox), m_internal(false)
+
28 {
+
29  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
+
30  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
+
31 
+
32  m_DrawData.vcount = Copy.m_DrawData.vcount;
+
33  m_DrawData.icount = Copy.m_DrawData.icount;
+
34  m_DrawData.Vertices = new gfxcore::vertex_t[m_DrawData.vcount];
+
35  m_DrawData.Indices = new gfxcore::index_t[m_DrawData.icount];
+
36 
+
37  ZEN_ASSERT(m_DrawData.vcount > 0 && m_DrawData.icount > 0);
+
38 
+
39  for(size_t i = 0; i < m_DrawData.icount; ++i)
+
40  m_DrawData.Indices[i] = Copy.m_DrawData.Indices[i];
+
41 
+
42  for(size_t v = 0; v < m_DrawData.vcount; ++v)
+
43  m_DrawData.Vertices[v] = Copy.m_DrawData.Vertices[v];
+
44 
+
45  if(Copy.mp_MVMatrix != nullptr)
+
46  mp_MVMatrix = new math::matrix4x4_t(*Copy.mp_MVMatrix);
+
47 
+
48  m_Verts.reserve(Copy.m_Verts.size());
+
49  for(auto i : Copy.m_Verts) m_Verts.emplace_back(i);
+
50 
+
51  m_Tris.reserve(Copy.m_Tris.size());
+
52  for(auto i : Copy.m_Tris) m_Tris.emplace_back(i);
+
53 }
+
54 
+
55 zPolygon::zPolygon(zPolygon&& Move) :
+
56  m_Assets(Move.m_Assets), mp_MVMatrix(Move.mp_MVMatrix),
+
57  mp_VAO(nullptr), m_offset(0), m_Verts(Move.m_Verts),
+
58  m_Tris(Move.m_Tris), m_Material(m_Assets), m_internal(false)
+
59 {
+
60  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
+
61  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
+
62 
+
63  m_DrawData.vcount = Move.m_DrawData.vcount;
+
64  m_DrawData.icount = Move.m_DrawData.icount;
+
65  m_DrawData.Vertices = Move.m_DrawData.Vertices;
+
66  m_DrawData.Indices = Move.m_DrawData.Indices;
+
67 
+
68  Move.m_DrawData.Vertices = nullptr;
+
69  Move.m_DrawData.Indices = nullptr;
+
70  Move.mp_MVMatrix = nullptr;
+
71 
+
72  ZEN_ASSERT(m_DrawData.vcount > 0 && m_DrawData.icount > 0);
+
73 }
74 
-
75  ZEN_ASSERT(m_DrawData.vcount > 0 && m_DrawData.icount > 0);
-
76 }
-
77 
-
78 zPolygon::~zPolygon()
-
79 {
-
80  if(m_DrawData.vcount != 0) delete m_DrawData.Vertices;
-
81  if(m_DrawData.icount != 0) delete m_DrawData.Indices;
-
82  if(m_internal) delete mp_VAO;
-
83  if(mp_MVMatrix) delete mp_MVMatrix;
-
84  m_Verts.clear();
-
85 }
-
86 
-
87 void zPolygon::Move(const math::vector_t& Position)
-
88 {
-
89  math::vector_t d = Position - math::vector_t(m_BoundingBox.x,
-
90  m_BoundingBox.y);
+
75 zPolygon::~zPolygon()
+
76 {
+
77  if(m_DrawData.vcount != 0) delete m_DrawData.Vertices;
+
78  if(m_DrawData.icount != 0) delete m_DrawData.Indices;
+
79  if(m_internal) delete mp_VAO;
+
80  if(mp_MVMatrix) delete mp_MVMatrix;
+
81  m_Verts.clear();
+
82 }
+
83 
+
84 void zPolygon::Move(const math::vector_t& Position)
+
85 {
+
86  math::vector_t d = Position - math::vector_t(m_BoundingBox.x,
+
87  m_BoundingBox.y);
+
88 
+
89  m_BoundingBox.x = Position.x;
+
90  m_BoundingBox.y = Position.y;
91 
-
92  m_BoundingBox.x = Position.x;
-
93  m_BoundingBox.y = Position.y;
+
92  for(auto& i : m_Tris) i = i + d;
+
93 }
94 
-
95  for(auto& i : m_Tris) i = i + d;
-
96 }
-
97 
-
98 void zPolygon::Move(const real_t x, const real_t y)
-
99 {
-
100  math::vector_t d = math::vector_t(x, y) - math::vector_t(m_BoundingBox.x,
-
101  m_BoundingBox.y);
+
95 void zPolygon::Move(const real_t x, const real_t y)
+
96 {
+
97  math::vector_t d = math::vector_t(x, y) - math::vector_t(m_BoundingBox.x,
+
98  m_BoundingBox.y);
+
99 
+
100  m_BoundingBox.x = x;
+
101  m_BoundingBox.y = y;
102 
-
103  m_BoundingBox.x = x;
-
104  m_BoundingBox.y = y;
+
103  for(auto& i : m_Tris) i = i + d;
+
104 }
105 
-
106  for(auto& i : m_Tris) i = i + d;
-
107 }
-
108 
-
109 void zPolygon::AttachMaterial(gfx::zMaterial& Material)
-
110 {
-
111  m_Material.LoadEffect(Material.GetEffect().GetType());
-
112  m_Material.LoadTexture(Material.GetTexture());
-
113 }
-
114 
-
115 void zPolygon::RemoveMaterial()
-
116 {
-
117  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
-
118  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
-
119 }
-
120 
-
121 void zPolygon::AddVertex(const math::vector_t& Position)
-
122 {
-
123  m_Verts.emplace_back(Position);
-
124 }
-
125 
-
126 zPolygon& zPolygon::Create()
-
127 {
-
128  if(m_Verts.size() <= 2) return (*this);
-
129  if(m_DrawData.Indices == nullptr || m_DrawData.icount == 0)
-
130  {
-
131  uint16_t tris = (m_Verts.size() - 2) * 3;
-
132  gfxcore::index_t* indices = new gfxcore::index_t[tris];
-
133 
-
134  for(uint16_t i = 0; i < tris; i += 3)
-
135  {
-
136  uint16_t x = i / 3;
-
137  indices[i] = 0;
-
138  indices[i+1] = x + 1;
-
139  indices[i+2] = x + 2;
-
140  }
-
141 
-
142  m_DrawData.Indices = indices;
-
143  m_DrawData.icount = tris;
-
144  }
+
106 void zPolygon::AttachMaterial(gfx::zMaterial& Material)
+
107 {
+
108  m_Material.LoadEffect(Material.GetEffect().GetType());
+
109  m_Material.LoadTexture(Material.GetTexture());
+
110 }
+
111 
+
112 void zPolygon::RemoveMaterial()
+
113 {
+
114  m_Material.LoadEffect(gfx::EffectType::NO_EFFECT);
+
115  m_Material.LoadTexture(zRenderer::GetDefaultTexture());
+
116 }
+
117 
+
118 void zPolygon::AddVertex(const math::vector_t& Position)
+
119 {
+
120  m_Verts.emplace_back(Position);
+
121 }
+
122 
+
123 zPolygon& zPolygon::Create(const bool do_triangulation)
+
124 {
+
125  if(m_Verts.size() <= 2) return (*this);
+
126  if(m_DrawData.Indices == nullptr || m_DrawData.icount == 0)
+
127  {
+
128  uint16_t tris = (m_Verts.size() - 2) * 3;
+
129  gfxcore::index_t* indices = new gfxcore::index_t[tris];
+
130 
+
131  for(uint16_t i = 0; i < tris; i += 3)
+
132  {
+
133  uint16_t x = i / 3;
+
134  indices[i] = 0;
+
135  indices[i+1] = x + 1;
+
136  indices[i+2] = x + 2;
+
137  }
+
138 
+
139  m_DrawData.Indices = indices;
+
140  m_DrawData.icount = tris;
+
141  }
+
142 
+
143  m_DrawData.Vertices = new gfxcore::vertex_t[m_Verts.size()];
+
144  m_DrawData.vcount = m_Verts.size();
145 
-
146  m_DrawData.Vertices = new gfxcore::vertex_t[m_Verts.size()];
-
147  m_DrawData.vcount = m_Verts.size();
-
148 
-
149  for(size_t i = 0; i < m_Verts.size(); ++i)
-
150  {
-
151  m_DrawData.Vertices[i].position = std::move(m_Verts[i]);
-
152  m_DrawData.Vertices[i].color = m_Color;
-
153  }
+
146  for(size_t i = 0; i < m_Verts.size(); ++i)
+
147  {
+
148  m_DrawData.Vertices[i].position = std::move(m_Verts[i]);
+
149  m_DrawData.Vertices[i].color = m_Color;
+
150  }
+
151 
+
152  m_Tris = do_triangulation ? math::triangulate(m_Verts) : std::move(m_Verts);
+
153  m_Verts.clear();
154 
-
155  // Calculate lowest and highest y-values.
-
156  real_t low, high;
-
157  low = high = m_Verts[0].y;
+
155  // Calculate lowest and highest x/y-values.
+
156  m_BoundingBox.h = this->CalcH();
+
157  m_BoundingBox.w = this->CalcW();
158 
-
159  for(auto& i : m_Verts)
-
160  {
-
161  low = math::min<real_t>(low, i.y);
-
162  high = math::max<real_t>(high, i.y);
-
163  }
-
164 
-
165  m_BoundingBox.h = (high - low);
-
166 
-
167  // Calculate lowest and highest x-values.
-
168  low = high = m_Verts[0].x;
-
169 
-
170  for(auto& i : m_Verts)
-
171  {
-
172  low = math::min<real_t>(low, i.x);
-
173  high = math::max<real_t>(high, i.x);
-
174  }
+
159  return (*this);
+
160 }
+
161 
+
162 bool zPolygon::Draw(const bool is_bound /*= false*/)
+
163 {
+
164  if(mp_VAO == nullptr && !is_bound)
+
165  {
+
166  // Create a vertex array and load our data.
+
167  mp_VAO = new gfxcore::zVertexArray(GL_STATIC_DRAW);
+
168  mp_VAO->Init();
+
169  m_offset = mp_VAO->AddData(m_DrawData);
+
170  if(!mp_VAO->Offload()) return false;
+
171 
+
172  // Create our model-view matrix.
+
173  mp_MVMatrix = new math::matrix4x4_t(math::
+
174  matrix4x4_t::GetIdentityMatrix());
175 
-
176  m_BoundingBox.w = (high - low);
-
177 
-
178  m_Tris = math::triangulate(m_Verts);
-
179  m_Verts.clear();
-
180  return (*this);
-
181 }
-
182 
-
183 bool zPolygon::Draw(const bool is_bound /*= false*/)
-
184 {
-
185  if(mp_VAO == nullptr && !is_bound)
-
186  {
-
187  // Create a vertex array and load our data.
-
188  mp_VAO = new gfxcore::zVertexArray(GL_STATIC_DRAW);
-
189  mp_VAO->Init();
-
190  m_offset = mp_VAO->AddData(m_DrawData);
-
191  if(!mp_VAO->Offload()) return false;
-
192 
-
193  // Create our model-view matrix.
-
194  mp_MVMatrix = new math::matrix4x4_t(math::
-
195  matrix4x4_t::GetIdentityMatrix());
-
196 
-
197  // So we can differentiate between a VAO from a `zScene`
-
198  // and the one we made ourselves.
-
199  m_internal = true;
-
200  }
-
201 
-
202  // If something isn't previously bound, we bind the VAO
-
203  // and the material. If no material, use global default.
-
204  if(!is_bound)
-
205  {
-
206  if(!mp_VAO->Bind()) return false;
-
207 
-
208  // Insert our coordinates to transform in the shader.
-
209  // Ignore the Z coordinate because that's only used for depth
-
210  // sorting internally anyway and has no effect on visuals.
-
211  (*mp_MVMatrix)[0][3] = m_BoundingBox.x;
-
212  (*mp_MVMatrix)[1][3] = m_BoundingBox.y;
-
213  //(*mp_MVMatrix)[2][3] = m_Position.z;
-
214 
-
215  // Bind our material. If we haven't set one, the default will be used.
-
216  // We need a default texture because otherwise the color would
-
217  // always be black due to the way the shader works.
-
218  const gfx::zEffect& Effect = m_Material.GetEffect();
-
219  m_Material.Enable();
+
176  // So we can differentiate between a VAO from a `zScene`
+
177  // and the one we made ourselves.
+
178  m_internal = true;
+
179  }
+
180 
+
181  // If something isn't previously bound, we bind the VAO
+
182  // and the material. If no material, use global default.
+
183  if(!is_bound)
+
184  {
+
185  if(!mp_VAO->Bind()) return false;
+
186 
+
187  // Insert our coordinates to transform in the shader.
+
188  // Ignore the Z coordinate because that's only used for depth
+
189  // sorting internally anyway and has no effect on visuals.
+
190  (*mp_MVMatrix)[0][3] = m_BoundingBox.x;
+
191  (*mp_MVMatrix)[1][3] = m_BoundingBox.y;
+
192  // (*mp_MVMatrix)[2][3] = m_Position.z;
+
193 
+
194  // Bind our material. If we haven't set one, the default will be used.
+
195  // We need a default texture because otherwise the color would
+
196  // always be black due to the way the shader works.
+
197  const gfx::zEffect& Effect = m_Material.GetEffect();
+
198  m_Material.Enable();
+
199 
+
200  // All effects have these parameters in the vertex shader.
+
201  if(!Effect.SetParameter("mv", *mp_MVMatrix) ||
+
202  !Effect.SetParameter("proj", zRenderer::GetProjectionMatrix()))
+
203  {
+
204  zRenderer::ResetMaterialState();
+
205  return false;
+
206  }
+
207  }
+
208 
+
209  GL(glDrawElements(GL_TRIANGLES, m_DrawData.icount,
+
210  gfxcore::INDEX_TYPE,
+
211  (void*)(sizeof(index_t) * m_offset)));
+
212 
+
213  return is_bound ? true : zRenderer::ResetMaterialState() && mp_VAO->Unbind();
+
214 }
+
215 
+
216 void zPolygon::LoadIntoVAO(gfxcore::zVertexArray& VAO, const bool keep)
+
217 {
+
218  if(m_DrawData.Vertices == nullptr ||
+
219  m_DrawData.Indices == nullptr) return;
220 
-
221  // All effects have these parameters in the vertex shader.
-
222  if(!Effect.SetParameter("mv", *mp_MVMatrix) ||
-
223  !Effect.SetParameter("proj", zRenderer::GetProjectionMatrix()))
-
224  {
-
225  zRenderer::ResetMaterialState();
-
226  return false;
-
227  }
-
228  }
-
229 
-
230  GL(glDrawElements(GL_TRIANGLES, m_DrawData.icount,
-
231  gfxcore::INDEX_TYPE,
-
232  (void*)(sizeof(index_t) * m_offset)));
-
233 
-
234  return is_bound ? true : zRenderer::ResetMaterialState() && mp_VAO->Unbind();
-
235 }
-
236 
-
237 void zPolygon::LoadIntoVAO(gfxcore::zVertexArray& VAO, const bool keep)
-
238 {
-
239  if(m_DrawData.Vertices == nullptr ||
-
240  m_DrawData.Indices == nullptr) return;
-
241 
-
242  gfxcore::index_t i = VAO.AddData(m_DrawData);
-
243  if(!keep)
-
244  {
-
245  delete[] m_DrawData.Vertices;
-
246  delete[] m_DrawData.Indices;
-
247  m_DrawData.Vertices = nullptr;
-
248  m_DrawData.Indices = nullptr;
-
249  m_offset = i;
-
250  mp_VAO = &VAO;
-
251  }
-
252 }
-
253 
-
254 bool zPolygon::Collides(const zPolygon& Other, math::vector_t* poi)
-
255 {
-
256  for(size_t i = 0; i < m_Tris.size(); i += 3)
-
257  {
-
258  for(size_t j = 0; j < Other.m_Tris.size(); j += 3)
-
259  {
-
260  math::tri_t t1 = {
-
261  m_Tris[i],
-
262  m_Tris[i+1],
-
263  m_Tris[i+2]
-
264  };
-
265 
-
266  math::tri_t t2 = {
-
267  Other.m_Tris[j],
-
268  Other.m_Tris[j+1],
-
269  Other.m_Tris[j+2]
-
270  };
-
271 
-
272  if(math::collides(t1, t2, poi)) return true;
-
273  }
-
274  }
-
275 
-
276  return false;
-
277 }
-
278 
-
279 bool zPolygon::Collides(const math::aabb_t& other)
-
280 {
-
281  for(size_t i = 0; i < m_Tris.size(); i += 3)
-
282  {
-
283  math::tri_t t = {
-
284  m_Tris[i],
-
285  m_Tris[i+1],
-
286  m_Tris[i+2]
-
287  };
-
288 
-
289  if(other.collides(t)) return true;
-
290  }
-
291 
-
292  return false;
-
293 }
-
294 
-
295 void zPolygon::SetColor(const color4f_t& Color)
-
296 {
-
297  m_Color = Color;
-
298  for(size_t i = 0; i < m_DrawData.vcount; ++i)
-
299  m_DrawData.Vertices[i].color = Color;
-
300 }
+
221  gfxcore::index_t i = VAO.AddData(m_DrawData);
+
222  if(!keep)
+
223  {
+
224  delete[] m_DrawData.Vertices;
+
225  delete[] m_DrawData.Indices;
+
226  m_DrawData.Vertices = nullptr;
+
227  m_DrawData.Indices = nullptr;
+
228  m_offset = i;
+
229  mp_VAO = &VAO;
+
230  }
+
231 }
+
232 
+
233 bool zPolygon::Collides(const zPolygon& Other, math::cquery_t* q) const
+
234 {
+
235  for(size_t i = 0; i < m_Tris.size(); i += 3)
+
236  {
+
237  for(size_t j = 0; j < Other.m_Tris.size(); j += 3)
+
238  {
+
239  math::tri_t t1 = {
+
240  m_Tris[i],
+
241  m_Tris[i+1],
+
242  m_Tris[i+2]
+
243  };
+
244 
+
245  math::tri_t t2 = {
+
246  Other.m_Tris[j],
+
247  Other.m_Tris[j+1],
+
248  Other.m_Tris[j+2]
+
249  };
+
250 
+
251  if(math::collides(t1, t2, q))
+
252  {
+
253  if(q != nullptr)
+
254  {
+
255  q->tri1 = std::move(t1);
+
256  q->tri2 = std::move(t2);
+
257  q->collision = true;
+
258  }
+
259 
+
260  return true;
+
261  }
+
262  }
+
263  }
+
264 
+
265  return false;
+
266 }
+
267 
+
268 bool zPolygon::Collides(const math::aabb_t& other) const
+
269 {
+
270  for(size_t i = 0; i < m_Tris.size(); i += 3)
+
271  {
+
272  math::tri_t t = {
+
273  m_Tris[i],
+
274  m_Tris[i+1],
+
275  m_Tris[i+2]
+
276  };
+
277 
+
278  if(other.collides(t)) return true;
+
279  }
+
280 
+
281  return false;
+
282 }
+
283 
+
284 void zPolygon::SetColor(const color4f_t& Color)
+
285 {
+
286  m_Color = Color;
+
287  for(size_t i = 0; i < m_DrawData.vcount; ++i)
+
288  m_DrawData.Vertices[i].color = Color;
+
289 }
+
290 
+
291 void zPolygon::SetColor(const real_t r, const real_t g,
+
292  const real_t b, const real_t a)
+
293 {
+
294  this->SetColor(color4f_t(r, g, b, a));
+
295 }
+
296 
+
297 void zPolygon::SetIndices(const std::vector<gfxcore::index_t>& Indices)
+
298 {
+
299  if(m_DrawData.Indices != nullptr && m_DrawData.icount > 0)
+
300  delete[] m_DrawData.Indices;
301 
-
302 void zPolygon::SetIndices(const std::vector<gfxcore::index_t>& Indices)
-
303 {
-
304  if(m_DrawData.Indices != nullptr && m_DrawData.icount > 0)
-
305  delete[] m_DrawData.Indices;
+
302  m_DrawData.icount = Indices.size();
+
303  m_DrawData.Indices = new gfxcore::index_t[m_DrawData.icount];
+
304  std::copy(Indices.begin(), Indices.end(), m_DrawData.Indices);
+
305 }
306 
-
307  m_DrawData.icount = Indices.size();
-
308  m_DrawData.Indices = new gfxcore::index_t[m_DrawData.icount];
-
309  std::copy(Indices.begin(), Indices.end(), m_DrawData.Indices);
-
310 }
+
307 int16_t zPolygon::CalcX() const
+
308 {
+
309  ZEN_ASSERTM(!m_Verts.empty() || m_DrawData.vcount > 0,
+
310  "polygon has no vertex data");
311 
-
312 uint16_t zPolygon::CalcH()
-
313 {
-
314  if(!(m_Verts.size() || m_DrawData.vcount)) return 0;
-
315 
-
316  // Calculate lowest and highest y-values.
-
317  real_t low, high;
-
318  if(m_DrawData.vcount > 0)
-
319  low = high = m_DrawData.Vertices[0].position.y;
-
320  else
-
321  low = high = m_Verts[0].y;
-
322 
-
323  for(auto& i : m_Verts)
-
324  {
-
325  low = math::min<real_t>(low, i.y);
-
326  high = math::max<real_t>(high, i.y);
-
327  }
+
312  int16_t low = m_Verts.empty() ? m_DrawData.Vertices[0].position.x
+
313  : m_Verts[0].x;
+
314 
+
315  for(auto& i : m_Verts)
+
316  low = math::min<int16_t>(low, i.x);
+
317 
+
318  for(size_t i = 0; i < m_DrawData.vcount; ++i)
+
319  low = math::min<int16_t>(low, m_DrawData.Vertices[i].position.x);
+
320 
+
321  return low;
+
322 }
+
323 
+
324 int16_t zPolygon::CalcY() const
+
325 {
+
326  ZEN_ASSERTM(!m_Verts.empty() || m_DrawData.vcount > 0,
+
327  "polygon has no vertex data");
328 
-
329  for(size_t i = 0; i < m_DrawData.vcount; ++i)
-
330  {
-
331  low = math::min<real_t>(low, m_DrawData.Vertices[i].position.y);
-
332  high = math::max<real_t>(high, m_DrawData.Vertices[i].position.y);
-
333  }
+
329  int16_t low = m_Verts.empty() ? m_DrawData.Vertices[0].position.y
+
330  : m_Verts[0].y;
+
331 
+
332  for(auto& i : m_Verts)
+
333  low = math::min<int16_t>(low, i.y);
334 
-
335  return (m_BoundingBox.h = (high - low));
-
336 }
+
335  for(size_t i = 0; i < m_DrawData.vcount; ++i)
+
336  low = math::min<int16_t>(low, m_DrawData.Vertices[i].position.y);
337 
-
338 uint16_t zPolygon::CalcW()
-
339 {
-
340  if(!(m_Verts.size() || m_DrawData.vcount)) return 0;
-
341 
-
342  // Calculate lowest and highest x-values.
-
343  real_t left, right;
-
344  if(m_DrawData.vcount > 0)
-
345  left = right = m_DrawData.Vertices[0].position.x;
-
346  else
-
347  left = right = m_Verts[0].x;
-
348 
-
349  for(auto& i : m_Verts)
-
350  {
-
351  left = math::min<real_t>(left, i.x);
-
352  right = math::max<real_t>(right, i.x);
-
353  }
-
354 
-
355  for(size_t i = 0; i < m_DrawData.vcount; ++i)
-
356  {
-
357  left = math::min<real_t>(left, m_DrawData.Vertices[i].position.x);
-
358  right = math::max<real_t>(right, m_DrawData.Vertices[i].position.x);
-
359  }
-
360 
-
361  return (m_BoundingBox.w = (right - left));
-
362 }
+
338  return low;
+
339 }
+
340 
+
341 uint16_t zPolygon::CalcH()
+
342 {
+
343  if(!(m_Verts.size() || m_DrawData.vcount)) return 0;
+
344 
+
345  // Calculate lowest and highest y-values.
+
346  real_t low, high;
+
347  if(m_DrawData.vcount > 0)
+
348  low = high = m_DrawData.Vertices[0].position.y;
+
349  else
+
350  low = high = m_Verts[0].y;
+
351 
+
352  for(auto& i : m_Verts)
+
353  {
+
354  low = math::min<real_t>(low, i.y);
+
355  high = math::max<real_t>(high, i.y);
+
356  }
+
357 
+
358  for(size_t i = 0; i < m_DrawData.vcount; ++i)
+
359  {
+
360  low = math::min<real_t>(low, m_DrawData.Vertices[i].position.y);
+
361  high = math::max<real_t>(high, m_DrawData.Vertices[i].position.y);
+
362  }
363 
-
364 bool zPolygon::IsModifiable() const
-
365 {
-
366  return (mp_VAO == nullptr || !mp_VAO->Offloaded());
-
367 }
-
368 
-
369 const gfx::zMaterial& zPolygon::GetMaterial() const
-
370 {
-
371  return m_Material;
-
372 }
+
364  return (m_BoundingBox.h = (high - low));
+
365 }
+
366 
+
367 uint16_t zPolygon::CalcW()
+
368 {
+
369  if(!(m_Verts.size() || m_DrawData.vcount)) return 0;
+
370 
+
371  // Calculate lowest and highest x-values.
+
372  real_t left, right;
+
373  if(m_DrawData.vcount > 0)
+
374  left = right = m_DrawData.Vertices[0].position.x;
+
375  else
+
376  left = right = m_Verts[0].x;
+
377 
+
378  for(auto& i : m_Verts)
+
379  {
+
380  left = math::min<real_t>(left, i.x);
+
381  right = math::max<real_t>(right, i.x);
+
382  }
+
383 
+
384  for(size_t i = 0; i < m_DrawData.vcount; ++i)
+
385  {
+
386  left = math::min<real_t>(left, m_DrawData.Vertices[i].position.x);
+
387  right = math::max<real_t>(right, m_DrawData.Vertices[i].position.x);
+
388  }
+
389 
+
390  return (m_BoundingBox.w = (right - left));
+
391 }
+
392 
+
393 int zPolygon::GetLowPoint() const
+
394 {
+
395  if(m_Verts.empty() && m_DrawData.vcount == 0) return 0;
+
396 
+
397  int low = m_Verts.empty() ? m_DrawData.Vertices[0].position.y
+
398  : m_Verts[0].y;
+
399 
+
400  for(auto& i : m_Verts) low = math::min<int>(low, i.y);
+
401  std::for_each(m_DrawData.Vertices,
+
402  m_DrawData.Vertices + m_DrawData.vcount,
+
403  [&low](const gfxcore::vertex_t& v) {
+
404  low = math::min<int>(low, v.position.y);
+
405  });
+
406 
+
407  return low;
+
408 }
+
409 
+
410 int zPolygon::GetLeftPoint() const
+
411 {
+
412  if(m_Verts.empty() && m_DrawData.vcount == 0) return 0;
+
413 
+
414  int16_t left = m_Verts.empty() ? m_DrawData.Vertices[0].position.x
+
415  : m_Verts[0].x;
+
416 
+
417  for(auto& i : m_Verts) left = math::min<int>(left, i.x);
+
418  std::for_each(m_DrawData.Vertices,
+
419  m_DrawData.Vertices + m_DrawData.vcount,
+
420  [&left](const gfxcore::vertex_t& v) {
+
421  left = math::min<int>(left, v.position.x);
+
422  });
+
423 
+
424  return left;
+
425 }
+
426 
+
427 bool zPolygon::IsModifiable() const
+
428 {
+
429  return (mp_VAO == nullptr || !mp_VAO->Offloaded());
+
430 }
+
431 
+
432 const gfx::zMaterial& zPolygon::GetMaterial() const
+
433 {
+
434  return m_Material;
+
435 }
diff --git a/docs/_polygon_8hpp.html b/docs/_polygon_8hpp.html index fa88c16e..e7e5b464 100644 --- a/docs/_polygon_8hpp.html +++ b/docs/_polygon_8hpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -117,7 +117,8 @@

Zenderer/CoreGraphics/Polygon.hpp - A vertex-agnostic convex primitive. More...

-
#include "Zenderer/CoreGraphics/OpenGL.hpp"
+
#include <algorithm>
+#include "Zenderer/CoreGraphics/OpenGL.hpp"
#include "Zenderer/CoreGraphics/Renderer.hpp"
#include "Zenderer/Math/Shapes.hpp"
@@ -125,14 +126,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_polygon_8hpp__dep__incl.map b/docs/_polygon_8hpp__dep__incl.map index 95e126ef..34a2d3fb 100644 --- a/docs/_polygon_8hpp__dep__incl.map +++ b/docs/_polygon_8hpp__dep__incl.map @@ -1,29 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_polygon_8hpp__dep__incl.png b/docs/_polygon_8hpp__dep__incl.png index fa7499ae..36d06b5d 100644 Binary files a/docs/_polygon_8hpp__dep__incl.png and b/docs/_polygon_8hpp__dep__incl.png differ diff --git a/docs/_polygon_8hpp__incl.map b/docs/_polygon_8hpp__incl.map index a4171ed5..ee306879 100644 --- a/docs/_polygon_8hpp__incl.map +++ b/docs/_polygon_8hpp__incl.map @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_polygon_8hpp__incl.png b/docs/_polygon_8hpp__incl.png index 836e4803..9077383a 100644 Binary files a/docs/_polygon_8hpp__incl.png and b/docs/_polygon_8hpp__incl.png differ diff --git a/docs/_polygon_8hpp_source.html b/docs/_polygon_8hpp_source.html index bdb3b2de..ccd3eee7 100644 --- a/docs/_polygon_8hpp_source.html +++ b/docs/_polygon_8hpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -113,133 +113,106 @@
22 #ifndef ZENDERER__GRAPHICS__POLYGON_HPP
23 #define ZENDERER__GRAPHICS__POLYGON_HPP
24 
-
25 #include "Zenderer/CoreGraphics/OpenGL.hpp"
-
26 #include "Zenderer/CoreGraphics/Renderer.hpp"
-
27 #include "Zenderer/Math/Shapes.hpp"
-
28 
-
29 namespace zen
-
30 {
-
31 namespace obj { class ZEN_API zEntity; }
-
32 namespace gfx
-
33 {
-
35  class ZEN_API zPolygon
-
36  {
-
37  public:
-
38  zPolygon(asset::zAssetManager& Assets, const size_t preload = 0);
-
39  ~zPolygon();
-
40 
-
41  zPolygon(const zPolygon& Copy);
-
42  zPolygon(zPolygon&& Move);
-
43 
-
51  void AddVertex(const math::vector_t& Position);
-
52 
-
59  virtual zPolygon& Create();
-
60 
-
69  virtual void Move(const math::vector_t& Position);
-
70 
-
72  virtual void Move(const real_t x, const real_t y);
-
73 
-
88  void AttachMaterial(gfx::zMaterial& Material);
-
89 
-
91  void RemoveMaterial();
-
92 
-
106  bool Draw(const bool is_bound = false);
-
107 
-
118  void LoadIntoVAO(gfxcore::zVertexArray& VAO,
-
119  const bool preserve = true);
-
120 
-
132  virtual bool Collides(const zPolygon& Other, math::vector_t* poi = nullptr);
-
133  virtual bool Collides(const math::aabb_t& other);
+
25 #include <algorithm>
+
26 
+
27 #include "Zenderer/CoreGraphics/OpenGL.hpp"
+
28 #include "Zenderer/CoreGraphics/Renderer.hpp"
+
29 #include "Zenderer/Math/Shapes.hpp"
+
30 
+
31 namespace zen
+
32 {
+
33 namespace obj { class ZEN_API zEntity; }
+
34 namespace gfx
+
35 {
+
37  class ZEN_API zPolygon
+
38  {
+
39  public:
+
40  zPolygon(asset::zAssetManager& Assets, const size_t preload = 0);
+
41  virtual ~zPolygon();
+
42 
+
43  zPolygon(const zPolygon& Copy);
+
44  zPolygon(zPolygon&& Move);
+
45 
+
53  void AddVertex(const math::vector_t& Position);
+
54 
+
73  virtual zPolygon& Create(const bool do_triangulation = true);
+
74 
+
83  virtual void Move(const math::vector_t& Position);
+
84 
+
86  virtual void Move(const real_t x, const real_t y);
+
87 
+
102  void AttachMaterial(gfx::zMaterial& Material);
+
103 
+
105  void RemoveMaterial();
+
106 
+
120  bool Draw(const bool is_bound = false);
+
121 
+
132  void LoadIntoVAO(gfxcore::zVertexArray& VAO,
+
133  const bool preserve = true);
134 
-
143  void SetIndices(const std::vector<gfxcore::index_t>& Indices);
-
144 
-
146  void SetColor(const color4f_t& Color);
-
147 
-
148  inline const std::vector<math::vector_t>&
-
149  GetTriangulation() const { return m_Tris; }
-
150 
-
151  inline math::vector_t GetPosition() const
-
152  { return math::vector_t(m_BoundingBox.x, m_BoundingBox.y); }
-
153 
-
154  inline const math::rect_t&
-
155  GetBoundingBox() const { return m_BoundingBox; }
-
156 
-
157  inline real_t GetX() const { return m_BoundingBox.x; }
-
158  inline real_t GetY() const { return m_BoundingBox.y; }
-
159 
-
161  inline uint16_t GetH() const { return m_BoundingBox.h; }
-
162 
-
164  inline uint16_t GetW() const { return m_BoundingBox.w; }
-
165 
-
168  uint16_t CalcH();
+
146  virtual bool Collides(const zPolygon& Other, math::cquery_t* q = nullptr) const;
+
147  virtual bool Collides(const math::aabb_t& other) const;
+
148 
+
157  void SetIndices(const std::vector<gfxcore::index_t>& Indices);
+
158 
+
160  void SetColor(const color4f_t& Color);
+
161  void SetColor(const real_t r, const real_t g,
+
162  const real_t b, const real_t a = 1.0);
+
163 
+
164  inline const std::vector<math::vector_t>&
+
165  GetTriangulation() const { return m_Tris; }
+
166 
+
167  inline math::vector_t GetPosition() const
+
168  { return math::vector_t(m_BoundingBox.x, m_BoundingBox.y); }
169 
-
172  uint16_t CalcW();
-
173 
-
174  int GetLowPoint() const
-
175  {
-
176  if(m_Verts.empty() && m_DrawData.vcount == 0) return 0;
-
177 
-
178  int low = m_Verts.empty() ?
-
179  m_DrawData.Vertices[0].position.y :
-
180  m_Verts[0].y;
+
170  inline const math::rect_t&
+
171  GetBoundingBox() const { return m_BoundingBox; }
+
172 
+
173  inline real_t GetX() const { return m_BoundingBox.x; }
+
174  inline real_t GetY() const { return m_BoundingBox.y; }
+
175 
+
177  inline uint16_t GetH() const { return m_BoundingBox.h; }
+
178 
+
180  inline uint16_t GetW() const { return m_BoundingBox.w; }
181 
-
182  for(auto& i : m_Verts) low = math::min<int>(low, i.y);
-
183  std::for_each(m_DrawData.Vertices,
-
184  m_DrawData.Vertices + m_DrawData.vcount,
-
185  [&low](const gfxcore::vertex_t& v) {
-
186  low = math::min<int>(low, v.position.y);
-
187  }
-
188  );
-
189 
-
190  return low;
-
191  }
-
192 
-
193  int GetLeftPoint() const
-
194  {
-
195  if(m_Verts.empty() && m_DrawData.vcount == 0) return 0;
-
196 
-
197  int16_t left = m_Verts.empty() ?
-
198  m_DrawData.Vertices[0].position.x :
-
199  m_Verts[0].x;
-
200 
-
201  for(auto& i : m_Verts) left = math::min<int>(left, i.x);
-
202  std::for_each(m_DrawData.Vertices,
-
203  m_DrawData.Vertices + m_DrawData.vcount,
-
204  [&left](const gfxcore::vertex_t& v) {
-
205  left = math::min<int>(left, v.position.x);
-
206  }
-
207  );
-
208 
-
209  return left;
-
210  }
-
211 
-
213  bool IsModifiable() const;
-
214 
-
215  const gfx::zMaterial& GetMaterial() const;
-
216 
-
218  friend class ZEN_API obj::zEntity;
-
219 
-
220  private:
-
221  asset::zAssetManager& m_Assets;
-
222  math::matrix4x4_t* mp_MVMatrix;
-
223  gfxcore::zVertexArray* mp_VAO;
-
224  gfxcore::index_t m_offset;
+
183  int16_t CalcX() const;
+
184 
+
186  int16_t CalcY() const;
+
187 
+
190  uint16_t CalcH();
+
191 
+
194  uint16_t CalcW();
+
195 
+
196  int GetLowPoint() const;
+
197  int GetLeftPoint() const;
+
198 
+
200  bool IsModifiable() const;
+
201 
+
202  const gfx::zMaterial& GetMaterial() const;
+
203 
+
205  friend class ZEN_API obj::zEntity;
+
206 
+
207  private:
+
208  asset::zAssetManager& m_Assets;
+
209  math::matrix4x4_t* mp_MVMatrix;
+
210  gfxcore::zVertexArray* mp_VAO;
+
211  gfxcore::index_t m_offset;
+
212 
+
213  protected:
+
214  virtual void MapTexCoords() { ZEN_ASSERTM(false, "not implemented"); }
+
215 
+
216  std::vector<math::vector_t> m_Verts, m_Tris;
+
217  gfx::zMaterial m_Material;
+
218  math::rect_t m_BoundingBox;
+
219  gfxcore::DrawBatch m_DrawData;
+
220  color4f_t m_Color;
+
221  bool m_internal;
+
222  };
+
223 } // namespace gfx
+
224 } // namespace zen
225 
-
226  protected:
-
227  virtual void MapTexCoords() { ZEN_ASSERTM(false, "not implemented"); }
-
228 
-
229  std::vector<math::vector_t> m_Verts, m_Tris;
-
230  gfx::zMaterial m_Material;
-
231  math::rect_t m_BoundingBox;
-
232  gfxcore::DrawBatch m_DrawData;
-
233  color4f_t m_Color;
-
234  bool m_internal;
-
235  };
-
236 } // namespace gfx
-
237 } // namespace zen
-
238 
-
239 #endif // ZENDERER__GRAPHICS__POLYGON_HPP
-
240 
+
226 #endif // ZENDERER__GRAPHICS__POLYGON_HPP
+
227 
diff --git a/docs/_polygons-example.html b/docs/_polygons-example.html index cad8ad89..b6c40e1e 100644 --- a/docs/_polygons-example.html +++ b/docs/_polygons-example.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_pong_8cpp.html b/docs/_pong_8cpp.html index 399514c5..33c575b2 100644 --- a/docs/_pong_8cpp.html +++ b/docs/_pong_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,7 +123,7 @@
- +

Go to the source code of this file.

@@ -170,8 +170,8 @@ - - + +
Data Fields
diff --git a/docs/_open_g_l_8hpp__dep__incl.map b/docs/_open_g_l_8hpp__dep__incl.map index 8e8ab90b..77f48acc 100644 --- a/docs/_open_g_l_8hpp__dep__incl.map +++ b/docs/_open_g_l_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_open_g_l_8hpp__dep__incl.png b/docs/_open_g_l_8hpp__dep__incl.png index 504eb023..f5a7237e 100644 Binary files a/docs/_open_g_l_8hpp__dep__incl.png and b/docs/_open_g_l_8hpp__dep__incl.png differ diff --git a/docs/_open_g_l_8hpp_source.html b/docs/_open_g_l_8hpp_source.html index f7053ad7..a2ee303e 100644 --- a/docs/_open_g_l_8hpp_source.html +++ b/docs/_open_g_l_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
 
string_t build_packet (PacketType type, const string_t &data)
 
int main ()
 
int main1 ()
 
@@ -318,7 +318,7 @@

Function Documentation

- +

@@ -351,7 +351,7 @@

Function Documentation

- +

@@ -377,7 +377,7 @@

Function Documentation

- +

@@ -414,7 +414,7 @@

Function Documentation

- +

@@ -451,18 +451,18 @@

Function Documentation

- +

- +

Variables

- + diff --git a/docs/_pong_8cpp.js b/docs/_pong_8cpp.js index a9442f65..b57e8339 100644 --- a/docs/_pong_8cpp.js +++ b/docs/_pong_8cpp.js @@ -25,7 +25,7 @@ var _pong_8cpp = [ "make_ball", "_pong_8cpp.html#a98a1b5ac138d1987c46cd622078b22a1", null ], [ "parse_msg", "_pong_8cpp.html#a637c70a19336d9c6a75c3b3891e2b334", null ], [ "build_packet", "_pong_8cpp.html#a5b10b66252707bc1a2af033fedb13daa", null ], - [ "main", "_pong_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4", null ], + [ "main1", "_pong_8cpp.html#a8006ac13983b83591702d97d584fc0eb", null ], [ "MAX_PONG", "_pong_8cpp.html#ae2d1697fd03b28bff8fb7a35ded43576", null ], [ "MIN_PONG", "_pong_8cpp.html#a820fea2a5356fb4906694179880791a4", null ], [ "RNG", "_pong_8cpp.html#a05b25dc9afee78bc28be5ed318874aee", null ] diff --git a/docs/_pong_8cpp__incl.map b/docs/_pong_8cpp__incl.map index 68d9dc83..abd448d7 100644 --- a/docs/_pong_8cpp__incl.map +++ b/docs/_pong_8cpp__incl.map @@ -1,43 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_pong_8cpp__incl.png b/docs/_pong_8cpp__incl.png index 19793833..0157a4c4 100644 Binary files a/docs/_pong_8cpp__incl.png and b/docs/_pong_8cpp__incl.png differ diff --git a/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.map b/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.map index 5d015a5a..86efedd3 100644 --- a/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.map +++ b/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.png b/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.png index 0530bb2b..03e145f6 100644 Binary files a/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.png and b/docs/_pong_8cpp_a232e48cb66000f2afe8774ea9c30b480_icgraph.png differ diff --git a/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.map b/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.map index 6c47e6ed..e9eb5f52 100644 --- a/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.map +++ b/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.png b/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.png index d82a9f74..aae930ef 100644 Binary files a/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.png and b/docs/_pong_8cpp_a5b10b66252707bc1a2af033fedb13daa_icgraph.png differ diff --git a/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.map b/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.map index db213140..eb98ad38 100644 --- a/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.map +++ b/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.png b/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.png index 8d4b01ef..e344aed0 100644 Binary files a/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.png and b/docs/_pong_8cpp_a637c70a19336d9c6a75c3b3891e2b334_icgraph.png differ diff --git a/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.map b/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.map index 1d73ac5e..d6bcd72b 100644 --- a/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.map +++ b/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.png b/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.png index 86965f81..87eda102 100644 Binary files a/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.png and b/docs/_pong_8cpp_a6f341495c32e1c9c4cca59d84b85a94c_icgraph.png differ diff --git a/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.map b/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.map index d58b5d63..010232c2 100644 --- a/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.map +++ b/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.png b/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.png index 0ed10908..5d60faa2 100644 Binary files a/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.png and b/docs/_pong_8cpp_a98a1b5ac138d1987c46cd622078b22a1_icgraph.png differ diff --git a/docs/_pong_8cpp_source.html b/docs/_pong_8cpp_source.html index 2aeddacf..8cb200b2 100644 --- a/docs/_pong_8cpp_source.html +++ b/docs/_pong_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -152,7 +152,7 @@
41 string_t build_packet(PacketType type, const string_t& data);
42 
43 #if defined(ZEN_DEBUG_BUILD) || !defined(_WIN32)
-
44 int main()
+
44 int main1()
45 #elif defined(_WIN32)
46 int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmd, int nShowCmd)
47 #endif // ZEN_DEBUG_BUILD
@@ -164,7 +164,7 @@
53 
54  Main.Init();
55 
-
56  gfx::zScene Field(Main.GetWidth(), Main.GetHeight(), Assets);
+
56  gfx::zScene Field(Main.GetWidth(), Main.GetHeight(), Assets);
57 
58  Field.Init();
59  Field.EnableLighting();
@@ -177,7 +177,7 @@
66  obj::zEntity& Ball = Field.AddEntity();
67  gfx::zLight& BallLight = Field.AddLight(gfx::LightType::ZEN_POINT);
68 
-
69  gfx::zQuad Paddle(Assets, 8, 64); Paddle.Create();
+
69  gfx::zQuad Paddle(Assets, 8, 64); Paddle.Create();
70  Paddle.SetColor(color4f_t(1.0, 1.0, 1.0));
71 
72  LeftPaddle.AddPrimitive(Paddle);
@@ -314,7 +314,7 @@
203  // User chose a host?
204  if(host != -1)
205  {
-
206  gfx::zScene Prelim(Main.GetWidth(), Main.GetHeight(), Assets);
+
206  gfx::zScene Prelim(Main.GetWidth(), Main.GetHeight(), Assets);
207  Prelim.Init();
208  Prelim.DisableLighting();
209 
@@ -422,7 +422,7 @@
311  // loop to differentiate between who defers ball velocity creation.
312  is_start = true;
313 
-
314  gfx::zScene Waiter(Main.GetWidth(), Main.GetHeight(), Assets);
+
314  gfx::zScene Waiter(Main.GetWidth(), Main.GetHeight(), Assets);
315  Waiter.Init();
316  Waiter.DisableLighting();
317 
@@ -516,7 +516,7 @@
405  // Create a near-black background for the light to properly render.
406  gfx::zQuad* pQuad = new gfx::zQuad(Assets, Main.GetWidth(),
407  Main.GetHeight());
-
408  pQuad->Create().SetColor(color4f_t(0.1, 0.1, 0.1, 1.0));
+
408  pQuad->Create().SetColor(color4f_t(0.1, 0.1, 0.1, 1.0));
409  BG.AddPrimitive(*pQuad);
410  delete pQuad;
411 
diff --git a/docs/_quad_8cpp.html b/docs/_quad_8cpp.html index 336a3287..8b3c3aee 100644 --- a/docs/_quad_8cpp.html +++ b/docs/_quad_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_quad_8cpp__incl.map b/docs/_quad_8cpp__incl.map index 9a226a6d..300bf3a1 100644 --- a/docs/_quad_8cpp__incl.map +++ b/docs/_quad_8cpp__incl.map @@ -1,35 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_quad_8cpp__incl.png b/docs/_quad_8cpp__incl.png index ff2250ad..91890890 100644 Binary files a/docs/_quad_8cpp__incl.png and b/docs/_quad_8cpp__incl.png differ diff --git a/docs/_quad_8cpp_source.html b/docs/_quad_8cpp_source.html index 9525f0df..fb08854b 100644 --- a/docs/_quad_8cpp_source.html +++ b/docs/_quad_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -136,7 +136,7 @@
25 {
26 }
27 
-
28 gfx::zPolygon& zQuad::Create()
+
28 gfx::zPolygon& zQuad::Create(const bool triangulate)
29 {
30  if(m_DrawData.Vertices == nullptr)
31  {
diff --git a/docs/_quad_8hpp.html b/docs/_quad_8hpp.html index 07ff7d59..c25d2f41 100644 --- a/docs/_quad_8hpp.html +++ b/docs/_quad_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,14 +123,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_quad_8hpp__dep__incl.map b/docs/_quad_8hpp__dep__incl.map index 6668d1c3..bfcb64fc 100644 --- a/docs/_quad_8hpp__dep__incl.map +++ b/docs/_quad_8hpp__dep__incl.map @@ -1,25 +1,26 @@ - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/_quad_8hpp__dep__incl.png b/docs/_quad_8hpp__dep__incl.png index db37d361..4ed57224 100644 Binary files a/docs/_quad_8hpp__dep__incl.png and b/docs/_quad_8hpp__dep__incl.png differ diff --git a/docs/_quad_8hpp__incl.map b/docs/_quad_8hpp__incl.map index 62e6eab2..e33b3ee2 100644 --- a/docs/_quad_8hpp__incl.map +++ b/docs/_quad_8hpp__incl.map @@ -1,35 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_quad_8hpp__incl.png b/docs/_quad_8hpp__incl.png index 4b7f90cb..38a50e99 100644 Binary files a/docs/_quad_8hpp__incl.png and b/docs/_quad_8hpp__incl.png differ diff --git a/docs/_quad_8hpp_source.html b/docs/_quad_8hpp_source.html index b44c5113..9877efda 100644 --- a/docs/_quad_8hpp_source.html +++ b/docs/_quad_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,60 +129,83 @@
39 
40  ~zQuad();
41 
-
42  virtual gfx::zPolygon& Create();
-
43 
-
45  //void Move(const real_t x, const real_t y, const real_t z = 1.0);
-
46  //void Move(const math::vector_t& Position);
-
47 
-
53  void Resize(const math::vectoru16_t& Size);
-
54 
-
56  void Resize(const uint16_t w, const uint16_t h);
-
57 
-
58  virtual bool Collides(const zPolygon& Other, math::vector_t* poi = nullptr)
-
59  {
-
60  const math::aabb_t us(m_BoundingBox);
-
61 
-
62  for(size_t i = 0; i < Other.GetTriangulation().size(); i += 3)
-
63  {
-
64  math::tri_t t = {
-
65  Other.GetTriangulation()[i],
-
66  Other.GetTriangulation()[i+1],
-
67  Other.GetTriangulation()[i+2]
-
68  };
-
69 
-
70  if(us.collides(t)) return true;
-
71  }
-
72 
-
73  return false;
-
74  }
-
75 
-
76  bool Collides(const zQuad& Other, math::vector_t* poi = nullptr)
-
77  {
-
78  return math::aabb_t(m_BoundingBox).collides(math::aabb_t(Other.m_BoundingBox));
-
79  }
-
80 
-
81  bool Collides(const math::aabb_t& other)
-
82  {
-
83  return other.collides(m_BoundingBox);
-
84  }
-
85 
-
118  void SetInverted(const bool flag);
-
119 
-
131  void SetRepeating(const bool flag);
-
132 
-
133  private:
-
134  void LoadRegularVertices(); // Standard quad
-
135  void LoadInvertedVertices(); // Inverted quad using -y instead of 0
-
136  void LoadRegularTC(); // Tex-coords to match standard quad
-
137  void LoadInvertedTC(); // Tex-coords to match inverted quad
-
138 
-
139  bool m_inv, m_rep;
-
140  };
-
141 } // namespace gfx
-
142 } // namespace zen
-
143 
-
144 #endif // ZENDERER__GRAPHICS__QUAD_HPP
-
145 
+
44  gfx::zPolygon& Create(const bool triangluate = true);
+
45 
+
47  //void Move(const real_t x, const real_t y, const real_t z = 1.0);
+
48  //void Move(const math::vector_t& Position);
+
49 
+
55  void Resize(const math::vectoru16_t& Size);
+
56 
+
58  void Resize(const uint16_t w, const uint16_t h);
+
59 
+
60  virtual bool Collides(const zPolygon& Other, math::cquery_t* q) const
+
61  {
+
62  const math::aabb_t us(m_BoundingBox);
+
63  for(size_t i = 0; i < Other.GetTriangulation().size(); i += 3)
+
64  {
+
65  math::tri_t t = {
+
66  Other.GetTriangulation()[i],
+
67  Other.GetTriangulation()[i+1],
+
68  Other.GetTriangulation()[i+2]
+
69  };
+
70 
+
71  if(us.collides(t))
+
72  {
+
73  if(q != nullptr)
+
74  {
+
75  q->box1 = std::move(us);
+
76  q->tri2 = std::move(t);
+
77  q->collision = true;
+
78  }
+
79 
+
80  return true;
+
81  }
+
82  }
+
83 
+
84  return false;
+
85  }
+
86 
+
87 
+
88  bool Collides(const zQuad& Other, math::cquery_t* q) const
+
89  {
+
90  math::aabb_t us(m_BoundingBox), them(Other.m_BoundingBox);
+
91  if(us.collides(them))
+
92  {
+
93  if(q != nullptr)
+
94  {
+
95  q->box1 = std::move(us);
+
96  q->box2 = std::move(them);
+
97  q->collision = true;
+
98  }
+
99 
+
100  return true;
+
101  }
+
102 
+
103  return false;
+
104  }
+
105 
+
106  bool Collides(const math::aabb_t& other)
+
107  {
+
108  return other.collides(m_BoundingBox);
+
109  }
+
110 
+
143  void SetInverted(const bool flag);
+
144 
+
156  void SetRepeating(const bool flag);
+
157 
+
158  private:
+
159  void LoadRegularVertices(); // Standard quad
+
160  void LoadInvertedVertices(); // Inverted quad using -y instead of 0
+
161  void LoadRegularTC(); // Tex-coords to match standard quad
+
162  void LoadInvertedTC(); // Tex-coords to match inverted quad
+
163 
+
164  bool m_inv, m_rep;
+
165  };
+
166 } // namespace gfx
+
167 } // namespace zen
+
168 
+
169 #endif // ZENDERER__GRAPHICS__QUAD_HPP
+
170 
diff --git a/docs/_random-example.html b/docs/_random-example.html index 03061c8d..33491e96 100644 --- a/docs/_random-example.html +++ b/docs/_random-example.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_random_8hpp.html b/docs/_random_8hpp.html index d8be4b8b..edb4f118 100644 --- a/docs/_random_8hpp.html +++ b/docs/_random_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,7 +132,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_random_8hpp__dep__incl.map b/docs/_random_8hpp__dep__incl.map index 9e0c093a..73d3137f 100644 --- a/docs/_random_8hpp__dep__incl.map +++ b/docs/_random_8hpp__dep__incl.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/_random_8hpp__dep__incl.png b/docs/_random_8hpp__dep__incl.png index 2fdf853b..271b632e 100644 Binary files a/docs/_random_8hpp__dep__incl.png and b/docs/_random_8hpp__dep__incl.png differ diff --git a/docs/_random_8hpp_source.html b/docs/_random_8hpp_source.html index 6751292f..8308daf2 100644 --- a/docs/_random_8hpp_source.html +++ b/docs/_random_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -150,19 +150,20 @@
91  auto choice(InputIterator begin, InputIterator end) -> decltype(*begin)&
92  {
93  int d = std::distance(begin, end);
-
94  ZEN_ASSERT(d >= 0);
-
95  std::advance(tmp, this->randint(0, d));
-
96  return *tmp;
-
97  }
-
98 
-
99  private:
-
100  RNG m_RNG;
-
101  };
-
102 }
+
94  InputIterator tmp = begin;
+
95  ZEN_ASSERT(d >= 0);
+
96  std::advance(tmp, this->randint(0, d));
+
97  return *tmp;
+
98  }
+
99 
+
100  private:
+
101  RNG m_RNG;
+
102  };
103 }
-
104 
-
105 #endif // ZENDERER__UTILITIES__RANDOM_HPP
-
106 
+
104 }
+
105 
+
106 #endif // ZENDERER__UTILITIES__RANDOM_HPP
+
107 
diff --git a/docs/_render_target_8cpp.html b/docs/_render_target_8cpp.html index dad31f13..a2febf8f 100644 --- a/docs/_render_target_8cpp.html +++ b/docs/_render_target_8cpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_render_target_8cpp__incl.map b/docs/_render_target_8cpp__incl.map index 5afa94e1..df1af844 100644 --- a/docs/_render_target_8cpp__incl.map +++ b/docs/_render_target_8cpp__incl.map @@ -1,35 +1,35 @@ - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/docs/_render_target_8cpp__incl.png b/docs/_render_target_8cpp__incl.png index 36b00116..6827a896 100644 Binary files a/docs/_render_target_8cpp__incl.png and b/docs/_render_target_8cpp__incl.png differ diff --git a/docs/_render_target_8cpp_source.html b/docs/_render_target_8cpp_source.html index a72c8c47..84fbf094 100644 --- a/docs/_render_target_8cpp_source.html +++ b/docs/_render_target_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -119,14 +119,14 @@
8 
9 zRenderTarget::zRenderTarget(const math::rect_t& Dimensions) :
10  zGLSubsystem("RenderTarget"), m_Log(zLog::GetEngineLog()),
-
11  m_Viewport(Dimensions.w, Dimensions.h), m_fbo(0), m_texture(0),
-
12  m_rbos(nullptr), m_rbo_count(0)
+
11  m_Viewport(Dimensions.w, Dimensions.h), m_texture(0),
+
12  m_fbo(0), m_rbos(nullptr), m_rbo_count(0)
13 {
14 }
15 
16 zRenderTarget::zRenderTarget(const uint16_t w, const uint16_t h) :
17  zGLSubsystem("RenderTarget"), m_Log(zLog::GetEngineLog()),
-
18  m_Viewport(w, h), m_fbo(0), m_texture(0), m_rbos(nullptr), m_rbo_count(0)
+
18  m_Viewport(w, h), m_texture(0), m_fbo(0), m_rbos(nullptr), m_rbo_count(0)
19 {
20 }
21 
diff --git a/docs/_render_target_8hpp.html b/docs/_render_target_8hpp.html index 147aba93..36abeaa3 100644 --- a/docs/_render_target_8hpp.html +++ b/docs/_render_target_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -125,14 +125,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_render_target_8hpp__dep__incl.map b/docs/_render_target_8hpp__dep__incl.map index 0079809a..0bd2ca21 100644 --- a/docs/_render_target_8hpp__dep__incl.map +++ b/docs/_render_target_8hpp__dep__incl.map @@ -1,18 +1,19 @@ - - - - - - - - - - - + + + + + + + + + + + - - - + + + + diff --git a/docs/_render_target_8hpp__dep__incl.png b/docs/_render_target_8hpp__dep__incl.png index 1566e0e1..460b44b6 100644 Binary files a/docs/_render_target_8hpp__dep__incl.png and b/docs/_render_target_8hpp__dep__incl.png differ diff --git a/docs/_render_target_8hpp__incl.map b/docs/_render_target_8hpp__incl.map index 66c1f863..e2950c21 100644 --- a/docs/_render_target_8hpp__incl.map +++ b/docs/_render_target_8hpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_render_target_8hpp__incl.png b/docs/_render_target_8hpp__incl.png index f61f26c4..31cd107a 100644 Binary files a/docs/_render_target_8hpp__incl.png and b/docs/_render_target_8hpp__incl.png differ diff --git a/docs/_render_target_8hpp_source.html b/docs/_render_target_8hpp_source.html index 1b8393f4..ff1572f6 100644 --- a/docs/_render_target_8hpp_source.html +++ b/docs/_render_target_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_renderer_8cpp.html b/docs/_renderer_8cpp.html index d6f0568b..50610a51 100644 --- a/docs/_renderer_8cpp.html +++ b/docs/_renderer_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_renderer_8cpp__incl.map b/docs/_renderer_8cpp__incl.map index f378af4a..ed5f1335 100644 --- a/docs/_renderer_8cpp__incl.map +++ b/docs/_renderer_8cpp__incl.map @@ -1,33 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_renderer_8cpp__incl.png b/docs/_renderer_8cpp__incl.png index 14759324..2cbc5331 100644 Binary files a/docs/_renderer_8cpp__incl.png and b/docs/_renderer_8cpp__incl.png differ diff --git a/docs/_renderer_8cpp_source.html b/docs/_renderer_8cpp_source.html index ce5c9622..1bf3aa21 100644 --- a/docs/_renderer_8cpp_source.html +++ b/docs/_renderer_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_renderer_8hpp.html b/docs/_renderer_8hpp.html index d6261a27..acc88195 100644 --- a/docs/_renderer_8hpp.html +++ b/docs/_renderer_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -128,14 +128,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_renderer_8hpp__dep__incl.map b/docs/_renderer_8hpp__dep__incl.map index 85cc4f56..84b70e52 100644 --- a/docs/_renderer_8hpp__dep__incl.map +++ b/docs/_renderer_8hpp__dep__incl.map @@ -1,38 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_renderer_8hpp__dep__incl.png b/docs/_renderer_8hpp__dep__incl.png index 2e6b99d7..870400bb 100644 Binary files a/docs/_renderer_8hpp__dep__incl.png and b/docs/_renderer_8hpp__dep__incl.png differ diff --git a/docs/_renderer_8hpp__incl.map b/docs/_renderer_8hpp__incl.map index 4d92cfe1..3dd4fc07 100644 --- a/docs/_renderer_8hpp__incl.map +++ b/docs/_renderer_8hpp__incl.map @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_renderer_8hpp__incl.png b/docs/_renderer_8hpp__incl.png index 915b19e2..2fc8dd2e 100644 Binary files a/docs/_renderer_8hpp__incl.png and b/docs/_renderer_8hpp__incl.png differ diff --git a/docs/_renderer_8hpp_source.html b/docs/_renderer_8hpp_source.html index 37bff843..a028a88b 100644 --- a/docs/_renderer_8hpp_source.html +++ b/docs/_renderer_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_renderer_8inl.html b/docs/_renderer_8inl.html index 7a122bb9..1faffd51 100644 --- a/docs/_renderer_8inl.html +++ b/docs/_renderer_8inl.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_renderer_8inl__dep__incl.map b/docs/_renderer_8inl__dep__incl.map index 8a6450ed..f1fbad1d 100644 --- a/docs/_renderer_8inl__dep__incl.map +++ b/docs/_renderer_8inl__dep__incl.map @@ -1,39 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_renderer_8inl__dep__incl.png b/docs/_renderer_8inl__dep__incl.png index a51e9efb..883c6209 100644 Binary files a/docs/_renderer_8inl__dep__incl.png and b/docs/_renderer_8inl__dep__incl.png differ diff --git a/docs/_renderer_8inl_source.html b/docs/_renderer_8inl_source.html index b926973d..256194e1 100644 --- a/docs/_renderer_8inl_source.html +++ b/docs/_renderer_8inl_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_scene_8cpp.html b/docs/_scene_8cpp.html index b812de36..e32887f1 100644 --- a/docs/_scene_8cpp.html +++ b/docs/_scene_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_scene_8cpp__incl.map b/docs/_scene_8cpp__incl.map index f47589b6..b2a4b9b6 100644 --- a/docs/_scene_8cpp__incl.map +++ b/docs/_scene_8cpp__incl.map @@ -1,38 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_scene_8cpp__incl.png b/docs/_scene_8cpp__incl.png index 3147080c..79fd370a 100644 Binary files a/docs/_scene_8cpp__incl.png and b/docs/_scene_8cpp__incl.png differ diff --git a/docs/_scene_8cpp_source.html b/docs/_scene_8cpp_source.html index 1dbefddf..d52553e7 100644 --- a/docs/_scene_8cpp_source.html +++ b/docs/_scene_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -120,271 +120,312 @@
9 using gfxcore::BlendFunc;
10 
11 zScene::zScene(const uint16_t w, const uint16_t h, asset::zAssetManager& Mgr) :
-
12  zSubsystem("Scene"), m_Assets(Mgr),
-
13  m_Log(util::zLog::GetEngineLog()), m_FBO1(w, h), m_FBO2(w, h),
-
14  m_lighting(false), m_ppfx(false), m_through(false)
-
15 {
-
16 }
-
17 
-
18 zScene::~zScene()
-
19 {
-
20  this->Destroy();
-
21 }
-
22 
-
23 bool zScene::Init()
-
24 {
-
25  return m_Assets.IsInit() && m_Geometry.Init() &&
-
26  m_FBO1.Init() && m_FBO2.Init();
-
27 }
-
28 
-
29 bool zScene::Destroy()
-
30 {
-
31  return this->Clear() && m_FBO1.Destroy() &&
-
32  m_FBO2.Destroy() && m_Geometry.Destroy();
-
33 }
-
34 
-
35 obj::zEntity& zScene::AddEntity()
-
36 {
-
37  obj::zEntity* pNew = new obj::zEntity(m_Assets);
-
38  m_allEntities.push_back(pNew);
-
39  return *m_allEntities.back();
-
40 }
-
41 
-
42 zLight& zScene::AddLight(const LightType& Type)
-
43 {
-
44  zLight* pNew = new zLight(m_Assets, Type, m_FBO1.GetHeight());
-
45  pNew->Init();
-
46  m_allLights.push_back(pNew);
-
47  return *m_allLights.back();
-
48 }
-
49 
-
50 zEffect& zScene::AddEffect(const EffectType& Type)
-
51 {
-
52  zEffect* pNew = new zEffect(Type, m_Assets);
-
53  if(pNew->Init())
-
54  {
-
55  pNew->Enable();
-
56  pNew->SetParameter("mv", math::matrix4x4_t::GetIdentityMatrix());
-
57  pNew->SetParameter("proj", zRenderer::GetProjectionMatrix());
-
58  pNew->Disable();
-
59  }
-
60 
-
61  m_allPPFX.push_back(pNew);
-
62  return *m_allPPFX.back();
-
63 }
-
64 
-
65 obj::zEntity& zScene::InsertEntity(const uint32_t index)
-
66 {
-
67  obj::zEntity* pNew = new obj::zEntity(m_Assets);
-
68  auto i = m_allEntities.begin();
-
69  for(size_t j = 0, s = m_allEntities.size();
-
70  j < s && j != index; ++j, ++i);
-
71  // No -op
-
72 
-
73  m_allEntities.insert(i, pNew);
-
74  return *pNew;
-
75 }
-
76 
-
77 bool zScene::RemoveEntity(const obj::zEntity& Obj)
-
78 {
-
79  auto i = m_allEntities.begin(),
-
80  j = m_allEntities.end();
-
81 
-
82  for( ; i != j; ++i)
-
83  {
-
84  if(*i == &Obj)
-
85  {
-
86  delete *i;
-
87  m_allEntities.erase(i);
-
88  return true;
-
89  }
-
90  }
-
91 
-
92  return false;
-
93 }
-
94 
-
95 bool zScene::RemoveEntity(const uint32_t index)
-
96 {
-
97  if(!this->IsValidEntityIndex(index)) return false;
-
98 
-
99  auto i = m_allEntities.begin();
-
100  for(size_t j = 0; j <= index; ++j, ++i);
-
101  // No-op
-
102 
-
103  delete *i;
-
104  m_allEntities.erase(i);
-
105  return true;
-
106 }
-
107 
-
108 bool zScene::Clear()
-
109 {
-
110  for(auto i : m_allEntities) delete i;
-
111  for(auto i : m_allLights) delete i;
-
112  for(auto i : m_allPPFX) delete i;
+
12  zSubsystem("Scene"), m_Log(util::zLog::GetEngineLog()), m_Assets(Mgr),
+
13  m_Geometry(GL_DYNAMIC_DRAW), m_FBO1(w, h), m_FBO2(w, h),
+
14  m_Camera(0.0, 0.0, 0.0), m_lighting(false),
+
15  m_ppfx(false), m_through(false)
+
16 {
+
17 }
+
18 
+
19 zScene::~zScene()
+
20 {
+
21  this->Destroy();
+
22 }
+
23 
+
24 bool zScene::Init()
+
25 {
+
26  return m_Assets.IsInit() && m_Geometry.Init() &&
+
27  m_FBO1.Init() && m_FBO2.Init();
+
28 }
+
29 
+
30 bool zScene::Destroy()
+
31 {
+
32  return this->Clear() && m_FBO1.Destroy() &&
+
33  m_FBO2.Destroy() && m_Geometry.Destroy();
+
34 }
+
35 
+
36 obj::zEntity& zScene::AddEntity()
+
37 {
+
38  obj::zEntity* pNew = new obj::zEntity(m_Assets);
+
39  m_allEntities.push_back(pNew);
+
40  return *m_allEntities.back();
+
41 }
+
42 
+
43 zLight& zScene::AddLight(const LightType& Type)
+
44 {
+
45  zLight* pNew = new zLight(m_Assets, Type, m_FBO1.GetHeight());
+
46  pNew->Init();
+
47  m_allLights.push_back(pNew);
+
48  return *m_allLights.back();
+
49 }
+
50 
+
51 zEffect& zScene::AddEffect(const EffectType& Type)
+
52 {
+
53  zEffect* pNew = new zEffect(Type, m_Assets);
+
54  if(pNew->Init())
+
55  {
+
56  pNew->Enable();
+
57  pNew->SetParameter("mv", math::matrix4x4_t::GetIdentityMatrix());
+
58  pNew->SetParameter("proj", zRenderer::GetProjectionMatrix());
+
59  pNew->Disable();
+
60  }
+
61 
+
62  m_allPPFX.push_back(pNew);
+
63  return *m_allPPFX.back();
+
64 }
+
65 
+
66 obj::zEntity& zScene::InsertEntity(const uint32_t index)
+
67 {
+
68  obj::zEntity* pNew = new obj::zEntity(m_Assets);
+
69  auto i = m_allEntities.begin();
+
70  for(size_t j = 0, s = m_allEntities.size();
+
71  j < s && j != index; ++j, ++i);
+
72  // No-op
+
73 
+
74  m_allEntities.insert(i, pNew);
+
75  return *pNew;
+
76 }
+
77 
+
78 bool zScene::RemoveEntity(const obj::zEntity& Obj)
+
79 {
+
80  auto i = m_allEntities.begin(),
+
81  j = m_allEntities.end();
+
82 
+
83  for( ; i != j; ++i)
+
84  {
+
85  if(*i == &Obj)
+
86  {
+
87  delete *i;
+
88  m_allEntities.erase(i);
+
89  return true;
+
90  }
+
91  }
+
92 
+
93  return false;
+
94 }
+
95 
+
96 bool zScene::RemoveEntity(const uint32_t index)
+
97 {
+
98  if(!this->IsValidEntityIndex(index)) return false;
+
99 
+
100  auto i = m_allEntities.begin();
+
101  for(size_t j = 0; j <= index; ++j, ++i);
+
102  // No-op
+
103 
+
104  delete *i;
+
105  m_allEntities.erase(i);
+
106  return true;
+
107 }
+
108 
+
109 bool zScene::RemoveLight(const gfx::zLight& Light)
+
110 {
+
111  auto i = m_allLights.begin(),
+
112  j = m_allLights.end();
113 
-
114  m_allEntities.clear();
-
115  m_allLights.clear();
-
116  m_allPPFX.clear();
-
117 
-
118  return m_Geometry.Clear();
-
119 }
-
120 
-
121 bool zScene::Render()
-
122 {
-
123  // Called every frame because there is no more appropriate
-
124  // time to call it. Things won't be offloaded multiple times.
-
125  for(auto& i : m_allEntities)
-
126  {
-
127  i->Offload(m_Geometry, false);
-
128  }
-
129 
-
130  m_Geometry.Offload();
-
131 
-
132  // Clear our frame buffers from the last drawing.
-
133  // We will be rendering to FBO1 at first.
-
134  color4f_t Clear = color4f_t(0.0, 0.0, 0.0);
-
135  if(m_through) Clear.a = 0.0;
-
136  m_FBO2.Bind(); m_FBO2.Clear(Clear);
-
137  m_FBO1.Bind(); m_FBO1.Clear(Clear);
-
138 
-
139  // Set the standard blending state.
-
140  bool blend = zRenderer::BlendOperation(BlendFunc::IS_ENABLED);
-
141  zRenderer::BlendOperation(BlendFunc::STANDARD_BLEND);
-
142 
-
143  // All geometry is stored here.
-
144  m_Geometry.Bind();
-
145 
-
146  // Prepare for primitive rendering.
-
147  const zEffect& E = zRenderer::GetDefaultEffect();
-
148 
-
149  // Commence individual primitive rendering.
-
150  for(auto& i : m_allEntities)
-
151  {
-
152  i->Update();
-
153  if(!i->m_enabled) continue;
-
154 
-
155  // Adjust for the camera.
-
156  i->Move(i->GetPosition() + m_Camera);
-
157 
-
158  // Set the matrix for transformation.
-
159  const math::matrix4x4_t& Tmp = i->GetTransformation();
-
160 
-
161  for(const auto& j : *i)
-
162  {
-
163  auto& M = j->GetMaterial();
-
164  M.Enable();
-
165  M.GetEffect().SetParameter("mv", Tmp);
-
166  j->Draw(true);
-
167  }
-
168 
-
169  // Move back to original position.
-
170  i->Move(i->GetPosition() - m_Camera);
-
171  }
-
172 
-
173  // Shortcut reference.
-
174  gfxcore::zVertexArray& FS = zRenderer::GetFullscreenVBO();
-
175 
-
176  // Primitive rendering is complete.
-
177  // Now, render lights with additive blending.
-
178  GLuint final_texture = m_FBO1.GetTexture();
+
114  for( ; i != j; ++i)
+
115  {
+
116  if(*i == &Light)
+
117  {
+
118  delete *i;
+
119  m_allLights.erase(i);
+
120  return true;
+
121  }
+
122  }
+
123 
+
124  return false;
+
125 }
+
126 
+
127 bool zScene::ShiftEntity(obj::zEntity& Obj, const uint32_t index)
+
128 {
+
129  if(!this->IsValidEntityIndex(index)) return false;
+
130  auto i = m_allEntities.begin(),
+
131  j = m_allEntities.end();
+
132 
+
133  for( ; i != j; ++i)
+
134  {
+
135  if(*i == &Obj)
+
136  {
+
137  i = m_allEntities.erase(i);
+
138  break;
+
139  }
+
140  }
+
141 
+
142  if(i == j) return false;
+
143 
+
144  auto tmp = m_allEntities.begin();
+
145  std::advance(tmp, index);
+
146  m_allEntities.insert(tmp, &Obj);
+
147  return true;
+
148 }
+
149 
+
150 bool zScene::Clear()
+
151 {
+
152  for(auto i : m_allEntities) delete i;
+
153  for(auto i : m_allLights) delete i;
+
154  for(auto i : m_allPPFX) delete i;
+
155 
+
156  m_allEntities.clear();
+
157  m_allLights.clear();
+
158  m_allPPFX.clear();
+
159 
+
160  return m_Geometry.Clear();
+
161 }
+
162 
+
163 bool zScene::Render()
+
164 {
+
165  // Called every frame because there is no more appropriate
+
166  // time to call it. Things won't be offloaded multiple times.
+
167  for(auto& i : m_allEntities)
+
168  {
+
169  i->Offload(m_Geometry, false);
+
170  }
+
171 
+
172  m_Geometry.Offload();
+
173 
+
174  // Clear our frame buffers from the last drawing.
+
175  // We will be rendering to FBO1 at first.
+
176  color4f_t Clear = color4f_t(0.0, 0.0, 0.0, m_through ? 0.0 : 1.0);
+
177  m_FBO2.Bind(); m_FBO2.Clear(Clear);
+
178  m_FBO1.Bind(); m_FBO1.Clear(Clear);
179 
-
180  if(m_lighting)
-
181  {
-
182  // We want to render to the entire scene.
+
180  // Set the standard blending state.
+
181  bool blend = zRenderer::BlendOperation(BlendFunc::IS_ENABLED);
+
182  zRenderer::BlendOperation(BlendFunc::STANDARD_BLEND);
183 
-
184  // Lighting renders ON the geometry, so we
-
185  // bind the FBO1 texture to render onto. The
-
186  // final result ends up on the FBO2 texture.
-
187  m_FBO2.Bind();
-
188  zRenderer::EnableTexture(final_texture);
-
189  zRenderer::BlendOperation(BlendFunc::ADDITIVE_BLEND);
-
190 
-
191  for(auto& i : m_allLights)
-
192  {
-
193  i->Enable();
-
194 
-
195  // Move with scene
-
196  i->Adjust(m_Camera.x, m_Camera.y);
-
197 
-
198  FS.Draw();
-
199 
-
200  // Restore state
-
201  i->Adjust(-m_Camera.x, -m_Camera.y);
-
202  i->Disable();
-
203  }
-
204 
-
205  final_texture = m_FBO2.GetTexture();
-
206  zRenderer::BlendOperation(BlendFunc::STANDARD_BLEND);
-
207  }
-
208 
-
209  // Ping-pong post-processing effects.
-
210  // This means one is drawn to FBO1, then FBO1's result
-
211  // is used to draw on FBO2, etc.
-
212  if(m_ppfx)
-
213  {
-
214  // If there was lighting, the first texture is
-
215  // the second FBO.
-
216  zRenderTarget& One = m_lighting ? m_FBO2 : m_FBO1;
-
217  zRenderTarget& Two = m_lighting ? m_FBO1 : m_FBO2;
-
218 
-
219  auto i = m_allPPFX.begin(), j = m_allPPFX.end();
+
184  // All geometry is stored here.
+
185  m_Geometry.Bind();
+
186 
+
187  // Prepare for primitive rendering.
+
188  const zEffect& E = zRenderer::GetDefaultEffect();
+
189 
+
190  // Commence individual primitive rendering.
+
191  for(auto& i : m_allEntities)
+
192  {
+
193  i->Update();
+
194  if(!i->m_enabled) continue;
+
195 
+
196  // Adjust for the camera.
+
197  i->Move(i->GetPosition() + m_Camera);
+
198 
+
199  // Set the matrix for transformation.
+
200  const math::matrix4x4_t& Tmp = i->GetTransformation();
+
201 
+
202  for(const auto& j : *i)
+
203  {
+
204  auto& M = j->GetMaterial();
+
205  M.Enable();
+
206  M.GetEffect().SetParameter("mv", Tmp);
+
207  j->Draw(true);
+
208  }
+
209 
+
210  // Move back to original position.
+
211  i->Move(i->GetPosition() - m_Camera);
+
212  }
+
213 
+
214  // Shortcut reference.
+
215  gfxcore::zVertexArray& FS = zRenderer::GetFullscreenVBO();
+
216 
+
217  // Primitive rendering is complete.
+
218  // Now, render lights with additive blending.
+
219  GLuint final_texture = m_FBO1.GetTexture();
220 
-
221  for(size_t c = 0; i != j; ++i, ++c)
-
222  {
-
223  auto& FX = *i;
-
224  bool even = ((c & 0x1) == 0);
-
225  if(even) Two.Bind();
-
226  else One.Bind();
-
227 
-
228  FX->Enable();
-
229  zRenderer::EnableTexture(final_texture);
-
230  FS.Draw();
-
231  FX->Disable();
-
232 
-
233  final_texture = even ? Two.GetTexture() : One.GetTexture();
-
234  }
-
235  }
-
236 
-
237  // Now we have the final scene data in `final_texture`
+
221  if(m_lighting)
+
222  {
+
223  // We want to render to the entire scene.
+
224 
+
225  // Lighting renders ON the geometry, so we
+
226  // bind the FBO1 texture to render onto. The
+
227  // final result ends up on the FBO2 texture.
+
228  m_FBO2.Bind();
+
229  zRenderer::EnableTexture(final_texture);
+
230  zRenderer::BlendOperation(BlendFunc::ADDITIVE_BLEND);
+
231 
+
232  for(auto& i : m_allLights)
+
233  {
+
234  i->Enable();
+
235 
+
236  // Move with scene
+
237  i->Adjust(m_Camera.x, m_Camera.y);
238 
-
239  // Doesn't matter which we disable.
-
240  m_FBO1.Unbind();
-
241 
-
242  E.Enable();
-
243  zRenderer::EnableTexture(final_texture);
-
244  if(!m_through) zRenderer::BlendOperation(BlendFunc::DISABLE_BLEND);
-
245  GL(glDisable(GL_DEPTH_TEST));
-
246 
-
247  // Make sure the right data is set.
-
248  E.SetParameter("mv", math::matrix4x4_t::GetIdentityMatrix());
-
249  E.SetParameter("proj", zRenderer::GetProjectionMatrix());
-
250 
-
251  FS.Draw();
-
252 
-
253  zRenderer::EnableTexture(0);
-
254  zRenderer::ResetMaterialState();
-
255 
-
256  if(!blend && m_through) zRenderer::BlendOperation(BlendFunc::DISABLE_BLEND);
-
257 
-
258  return true;
-
259 }
-
260 
-
261 int32_t zScene::GetEntityIndex(const obj::zEntity& D)
-
262 {
-
263  int32_t index = -1;
-
264  for(auto i : m_allEntities)
-
265  {
-
266  ++index;
-
267  if(i == &D) return index;
-
268  }
-
269 
-
270  return index;
-
271 }
-
272 
-
273 bool zScene::IsValidEntityIndex(int32_t i)
-
274 {
-
275  return (i > 0 && i < m_allEntities.size());
-
276 }
+
239  FS.Draw();
+
240 
+
241  // Restore state
+
242  i->Adjust(-m_Camera.x, -m_Camera.y);
+
243  i->Disable();
+
244  }
+
245 
+
246  final_texture = m_FBO2.GetTexture();
+
247  zRenderer::BlendOperation(BlendFunc::STANDARD_BLEND);
+
248  }
+
249 
+
250  // Ping-pong post-processing effects.
+
251  // This means one is drawn to FBO1, then FBO1's result
+
252  // is used to draw on FBO2, etc.
+
253  if(m_ppfx)
+
254  {
+
255  // If there was lighting, the first texture is
+
256  // the second FBO.
+
257  zRenderTarget& One = m_lighting ? m_FBO2 : m_FBO1;
+
258  zRenderTarget& Two = m_lighting ? m_FBO1 : m_FBO2;
+
259 
+
260  auto i = m_allPPFX.begin(), j = m_allPPFX.end();
+
261 
+
262  for(size_t c = 0; i != j; ++i, ++c)
+
263  {
+
264  auto& FX = *i;
+
265  bool even = ((c & 0x1) == 0);
+
266  if(even) Two.Bind();
+
267  else One.Bind();
+
268 
+
269  FX->Enable();
+
270  zRenderer::EnableTexture(final_texture);
+
271  FS.Draw();
+
272  FX->Disable();
+
273 
+
274  final_texture = even ? Two.GetTexture() : One.GetTexture();
+
275  }
+
276  }
+
277 
+
278  // Now we have the final scene data in `final_texture`
+
279 
+
280  // Doesn't matter which we disable.
+
281  m_FBO1.Unbind();
+
282 
+
283  E.Enable();
+
284  zRenderer::EnableTexture(final_texture);
+
285  if(!m_through) zRenderer::BlendOperation(BlendFunc::DISABLE_BLEND);
+
286  GL(glDisable(GL_DEPTH_TEST));
+
287 
+
288  // Make sure the right data is set.
+
289  E.SetParameter("mv", math::matrix4x4_t::GetIdentityMatrix());
+
290  E.SetParameter("proj", zRenderer::GetProjectionMatrix());
+
291 
+
292  FS.Draw();
+
293 
+
294  zRenderer::EnableTexture(0);
+
295  zRenderer::ResetMaterialState();
+
296 
+
297  if(!blend && m_through) zRenderer::BlendOperation(BlendFunc::DISABLE_BLEND);
+
298 
+
299  return true;
+
300 }
+
301 
+
302 int32_t zScene::GetEntityIndex(const obj::zEntity& D)
+
303 {
+
304  int32_t index = -1;
+
305  for(auto i : m_allEntities)
+
306  {
+
307  ++index;
+
308  if(i == &D) return index;
+
309  }
+
310 
+
311  return index;
+
312 }
+
313 
+
314 bool zScene::IsValidEntityIndex(int32_t i)
+
315 {
+
316  return (i >= 0 && static_cast<size_t>(i) < m_allEntities.size());
+
317 }
diff --git a/docs/_scene_8hpp.html b/docs/_scene_8hpp.html index 53fa8c10..5b073493 100644 --- a/docs/_scene_8hpp.html +++ b/docs/_scene_8hpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,14 +132,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

@@ -147,6 +147,7 @@ +
int main int main1 ( )
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.

Data Structures

class  zen::gfx::zScene
 A high-level rendering wrapper allowing for special effects and lighting. More...
 

@@ -169,7 +170,7 @@

Detailed Description

Author
George Kudrayvtsev (halcyon)
-
Version
1.0
+
Version
1.1
Copyright
Apache License v2.0 Licensed under the Apache License, Version 2.0 (the "License").
You may not use this file except in compliance with the License.
You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0
diff --git a/docs/_scene_8hpp__dep__incl.map b/docs/_scene_8hpp__dep__incl.map index 73556c5b..f837acb4 100644 --- a/docs/_scene_8hpp__dep__incl.map +++ b/docs/_scene_8hpp__dep__incl.map @@ -1,13 +1,14 @@ - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/_scene_8hpp__dep__incl.png b/docs/_scene_8hpp__dep__incl.png index 261ba380..05b47830 100644 Binary files a/docs/_scene_8hpp__dep__incl.png and b/docs/_scene_8hpp__dep__incl.png differ diff --git a/docs/_scene_8hpp__incl.map b/docs/_scene_8hpp__incl.map index ce555834..629e715f 100644 --- a/docs/_scene_8hpp__incl.map +++ b/docs/_scene_8hpp__incl.map @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_scene_8hpp__incl.png b/docs/_scene_8hpp__incl.png index 885c1850..57f6fc65 100644 Binary files a/docs/_scene_8hpp__incl.png and b/docs/_scene_8hpp__incl.png differ diff --git a/docs/_scene_8hpp_source.html b/docs/_scene_8hpp_source.html index 4baf69ad..9ea78ad2 100644 --- a/docs/_scene_8hpp_source.html +++ b/docs/_scene_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -130,80 +130,84 @@
40 {
41 namespace gfx
42 {
-
43  class ZEN_API zScene : public zSubsystem
-
44  {
-
45  public:
-
46  zScene(const uint16_t w, const uint16_t h, asset::zAssetManager& Mgr);
-
47  ~zScene();
-
48 
-
50  bool Init();
-
51  bool Destroy();
-
52 
-
62  obj::zEntity& AddEntity();
-
63 
-
65  inline obj::zAnimation& AddAnimation()
-
66  {
-
67  obj::zAnimation* pNew = new obj::zAnimation(m_Assets);
-
68  m_allEntities.push_back(pNew);
-
69  return static_cast<obj::zAnimation&>(*m_allEntities.back());
-
70  }
-
71 
-
81  template<typename T>
-
82  obj::zEntity& AddPrimitive();
-
83 
-
100  zLight& AddLight(const LightType& Type);
-
101 
-
120  zEffect& AddEffect(const EffectType& Type);
-
121 
-
143  obj::zEntity& InsertEntity(const uint32_t index);
-
144 
-
154  bool RemoveEntity(const obj::zEntity& Obj);
-
155  bool RemoveEntity(const uint32_t index);
-
156 
-
158  bool Clear();
-
159 
-
162  bool Render();
-
163 
-
165  bool IsValidEntityIndex(int32_t i);
-
166 
-
168  int32_t GetEntityIndex(const obj::zEntity& D);
-
169 
-
171  inline uint16_t GetWidth() const { return m_FBO1.GetWidth(); }
-
172 
-
174  inline uint16_t GetHeight() const { return m_FBO1.GetHeight(); }
-
175 
-
177  void EnableLighting() { m_lighting = true; }
-
178  void DisableLighting() { m_lighting = false; }
-
179  bool ToggleLighting() { return m_lighting = !m_lighting; }
-
180 
-
182  void EnablePostProcessing() { m_ppfx = true; }
-
183  void DisablePostProcessing(){ m_ppfx = false; }
-
184  bool TogglePostProcessing() { return m_ppfx = !m_ppfx; }
+
44  class ZEN_API zScene : public zSubsystem
+
45  {
+
46  public:
+
47  zScene(const uint16_t w, const uint16_t h, asset::zAssetManager& Mgr);
+
48  ~zScene();
+
49 
+
51  bool Init();
+
52  bool Destroy();
+
53 
+
63  obj::zEntity& AddEntity();
+
64 
+
66  inline obj::zAnimation& AddAnimation()
+
67  {
+
68  obj::zAnimation* pNew = new obj::zAnimation(m_Assets);
+
69  m_allEntities.push_back(pNew);
+
70  return static_cast<obj::zAnimation&>(*m_allEntities.back());
+
71  }
+
72 
+
82  template<typename T>
+
83  obj::zEntity& AddPrimitive();
+
84 
+
101  zLight& AddLight(const LightType& Type);
+
102 
+
121  zEffect& AddEffect(const EffectType& Type);
+
122 
+
144  obj::zEntity& InsertEntity(const uint32_t index);
+
145 
+
155  bool RemoveEntity(const obj::zEntity& Obj);
+
156  bool RemoveEntity(const uint32_t index);
+
157 
+
164  bool RemoveLight(const gfx::zLight& Light);
+
165 
+
177  bool ShiftEntity(obj::zEntity& Obj, const uint32_t index);
+
178 
+
180  bool Clear();
+
181 
+
184  bool Render();
185 
-
199  inline void SetSeeThrough(bool flag) { m_through = flag; }
-
200 
-
201  private:
-
202  util::zLog& m_Log;
-
203  asset::zAssetManager& m_Assets;
-
204  gfxcore::zVertexArray m_Geometry;
-
205  gfx::zRenderTarget m_FBO1, m_FBO2;
-
206 
-
207  math::vector_t m_Camera;
-
208 
-
209  // Lists of things that will be rendered.
-
210  std::list<zLight*> m_allLights;
-
211  std::list<zEffect*> m_allPPFX;
-
212  std::list<obj::zEntity*> m_allEntities;
-
213 
-
214  bool m_lighting, m_ppfx, m_through;
-
215  };
-
216 
-
217  #include "Scene.inl"
-
218 }
-
219 }
-
220 
-
221 #endif // ZENDERER__GRAPHICS__SCENE_HPP
-
222 
+
187  bool IsValidEntityIndex(int32_t i);
+
188 
+
190  int32_t GetEntityIndex(const obj::zEntity& D);
+
191 
+
193  inline uint16_t GetWidth() const { return m_FBO1.GetWidth(); }
+
194 
+
196  inline uint16_t GetHeight() const { return m_FBO1.GetHeight(); }
+
197 
+
199  void EnableLighting() { m_lighting = true; }
+
200  void DisableLighting() { m_lighting = false; }
+
201  bool ToggleLighting() { return m_lighting = !m_lighting; }
+
202 
+
204  void EnablePostProcessing() { m_ppfx = true; }
+
205  void DisablePostProcessing(){ m_ppfx = false; }
+
206  bool TogglePostProcessing() { return m_ppfx = !m_ppfx; }
+
207 
+
221  inline void SetSeeThrough(bool flag) { m_through = flag; }
+
222 
+
223  private:
+
224  util::zLog& m_Log;
+
225  asset::zAssetManager& m_Assets;
+
226  gfxcore::zVertexArray m_Geometry;
+
227  gfx::zRenderTarget m_FBO1, m_FBO2;
+
228 
+
229  math::vector_t m_Camera;
+
230 
+
231  // Lists of things that will be rendered.
+
232  std::list<zLight*> m_allLights;
+
233  std::list<zEffect*> m_allPPFX;
+
234  std::list<obj::zEntity*> m_allEntities;
+
235 
+
236  bool m_lighting, m_ppfx, m_through;
+
237  };
+
238 
+
239  #include "Scene.inl"
+
240 }
+
241 }
+
242 
+
243 #endif // ZENDERER__GRAPHICS__SCENE_HPP
+
244 
diff --git a/docs/_scene_8inl.html b/docs/_scene_8inl.html index ba504b5f..2cbfee3d 100644 --- a/docs/_scene_8inl.html +++ b/docs/_scene_8inl.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,7 +114,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_scene_8inl__dep__incl.map b/docs/_scene_8inl__dep__incl.map index 033f883e..1cf7579e 100644 --- a/docs/_scene_8inl__dep__incl.map +++ b/docs/_scene_8inl__dep__incl.map @@ -1,14 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/_scene_8inl__dep__incl.png b/docs/_scene_8inl__dep__incl.png index bf062c1f..20ffe472 100644 Binary files a/docs/_scene_8inl__dep__incl.png and b/docs/_scene_8inl__dep__incl.png differ diff --git a/docs/_scene_8inl_source.html b/docs/_scene_8inl_source.html index a1cf185c..b14de61f 100644 --- a/docs/_scene_8inl_source.html +++ b/docs/_scene_8inl_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_scenes-example.html b/docs/_scenes-example.html index ba4a519b..abd519c1 100644 --- a/docs/_scenes-example.html +++ b/docs/_scenes-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_scripting-example.html b/docs/_scripting-example.html index 857b2976..02a1a07f 100644 --- a/docs/_scripting-example.html +++ b/docs/_scripting-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_scripting_2lua_8hpp.html b/docs/_scripting_2lua_8hpp.html index c76798a6..0e07e573 100644 --- a/docs/_scripting_2lua_8hpp.html +++ b/docs/_scripting_2lua_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_scripting_2lua_8hpp_source.html b/docs/_scripting_2lua_8hpp_source.html index 7d01491f..6c086a2e 100644 --- a/docs/_scripting_2lua_8hpp_source.html +++ b/docs/_scripting_2lua_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_settings_8cpp.html b/docs/_settings_8cpp.html index d5123a16..ebcd8547 100644 --- a/docs/_settings_8cpp.html +++ b/docs/_settings_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_settings_8cpp_source.html b/docs/_settings_8cpp_source.html index a8470d7a..cb1c1eb5 100644 --- a/docs/_settings_8cpp_source.html +++ b/docs/_settings_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -234,12 +234,17 @@
124  if(iter == m_Options.end())
125  {
126  // Create a new blank option and return it.
-
127  m_Options.emplace(std::make_pair(hash, zOption()));
-
128  return m_Options[hash];
-
129  }
-
130 
-
131  return iter->second;
-
132 }
+
127 #ifndef __GNUC__
+
128  m_Options.emplace(hash, zOption());
+
129 
+
130 #else
+
131  m_Options[hash] = zOption();
+
132 #endif
+
133  return m_Options[hash];
+
134  }
+
135 
+
136  return iter->second;
+
137 }
diff --git a/docs/_settings_8hpp.html b/docs/_settings_8hpp.html index 9c7cd836..b992fc42 100644 --- a/docs/_settings_8hpp.html +++ b/docs/_settings_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -133,7 +133,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_settings_8hpp__dep__incl.map b/docs/_settings_8hpp__dep__incl.map index d2ff1796..302a8500 100644 --- a/docs/_settings_8hpp__dep__incl.map +++ b/docs/_settings_8hpp__dep__incl.map @@ -1,41 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_settings_8hpp__dep__incl.png b/docs/_settings_8hpp__dep__incl.png index 6c19b531..135d6d30 100644 Binary files a/docs/_settings_8hpp__dep__incl.png and b/docs/_settings_8hpp__dep__incl.png differ diff --git a/docs/_settings_8hpp_source.html b/docs/_settings_8hpp_source.html index 9debd97b..576b4e0c 100644 --- a/docs/_settings_8hpp_source.html +++ b/docs/_settings_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_shader_8cpp.html b/docs/_shader_8cpp.html index 2b243800..3716ad0b 100644 --- a/docs/_shader_8cpp.html +++ b/docs/_shader_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_shader_8cpp_source.html b/docs/_shader_8cpp_source.html index 6f657faa..6829cd32 100644 --- a/docs/_shader_8cpp_source.html +++ b/docs/_shader_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -193,7 +193,7 @@
82  GLint length = string.length();
83  GL(glShaderSource(shader, 1, &src, &length));
84 
-
85  ZEN_ASSERT(length == string.length());
+
85  ZEN_ASSERT(static_cast<size_t>(length) == string.length());
86 
87  GL(glCompileShader(shader));
88  GL(glGetShaderiv(shader, GL_COMPILE_STATUS, &error_code));
diff --git a/docs/_shader_8hpp.html b/docs/_shader_8hpp.html index ca3efac8..03e5c3a3 100644 --- a/docs/_shader_8hpp.html +++ b/docs/_shader_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -135,7 +135,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_shader_8hpp__dep__incl.map b/docs/_shader_8hpp__dep__incl.map index b744ed12..e4b38911 100644 --- a/docs/_shader_8hpp__dep__incl.map +++ b/docs/_shader_8hpp__dep__incl.map @@ -1,46 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_shader_8hpp__dep__incl.png b/docs/_shader_8hpp__dep__incl.png index 593f3bcb..eeb9d451 100644 Binary files a/docs/_shader_8hpp__dep__incl.png and b/docs/_shader_8hpp__dep__incl.png differ diff --git a/docs/_shader_8hpp_source.html b/docs/_shader_8hpp_source.html index 9377ca51..ad4e3a58 100644 --- a/docs/_shader_8hpp_source.html +++ b/docs/_shader_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_shader_files_8hpp.html b/docs/_shader_files_8hpp.html index c09976db..c09acfc5 100644 --- a/docs/_shader_files_8hpp.html +++ b/docs/_shader_files_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,7 +129,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_shader_files_8hpp__dep__incl.map b/docs/_shader_files_8hpp__dep__incl.map index cac2129f..237008b5 100644 --- a/docs/_shader_files_8hpp__dep__incl.map +++ b/docs/_shader_files_8hpp__dep__incl.map @@ -1,43 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_shader_files_8hpp__dep__incl.png b/docs/_shader_files_8hpp__dep__incl.png index 8933a9c8..54b201c8 100644 Binary files a/docs/_shader_files_8hpp__dep__incl.png and b/docs/_shader_files_8hpp__dep__incl.png differ diff --git a/docs/_shader_files_8hpp_source.html b/docs/_shader_files_8hpp_source.html index 13a23df4..8d98a86b 100644 --- a/docs/_shader_files_8hpp_source.html +++ b/docs/_shader_files_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_shader_set_8cpp.html b/docs/_shader_set_8cpp.html index 144556e8..7118fc1b 100644 --- a/docs/_shader_set_8cpp.html +++ b/docs/_shader_set_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_shader_set_8cpp_source.html b/docs/_shader_set_8cpp_source.html index f4c201b8..1f21f392 100644 --- a/docs/_shader_set_8cpp_source.html +++ b/docs/_shader_set_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,8 +123,8 @@
12 zShaderSet::zShaderSet(asset::zAssetManager& Assets) :
13  zGLSubsystem("ShaderSet"),
14  m_AssetManager(Assets), m_Log(zLog::GetEngineLog()),
-
15  mp_FShader(nullptr), mp_VShader(nullptr), m_program(0),
-
16  m_error_str(""), m_refcount(0), m_ID(0)
+
15  mp_VShader(nullptr), mp_FShader(nullptr),
+
16  m_error_str(""), m_program(0), m_refcount(0), m_ID(0)
17 {}
18 
19 zShaderSet::~zShaderSet()
@@ -134,306 +134,303 @@
23 }
24 
25 zShaderSet::zShaderSet(const zShaderSet& Copy) :
-
26  m_Log(Copy.m_Log),
-
27  m_AssetManager(Copy.m_AssetManager),
-
28  mp_FShader(Copy.mp_FShader),
-
29  mp_VShader(Copy.mp_VShader),
-
30  m_error_str(Copy.GetError()),
-
31  m_link_log(Copy.GetLinkerLog()),
-
32  m_program(Copy.m_program)
-
33 {
-
34 }
-
35 
-
36 zShaderSet& zShaderSet::operator=(const zShaderSet& Copy)
-
37 {
-
38  mp_FShader = Copy.mp_FShader;
-
39  mp_VShader = Copy.mp_VShader;
-
40  m_error_str = Copy.GetError();
-
41  m_link_log = Copy.GetLinkerLog();
-
42  m_program = Copy.m_program;
+
26  m_AssetManager(Copy.m_AssetManager), m_Log(Copy.m_Log),
+
27  mp_VShader(Copy.mp_VShader), mp_FShader(Copy.mp_FShader),
+
28  m_error_str(Copy.GetError()), m_link_log(Copy.GetLinkerLog()),
+
29  m_program(Copy.m_program)
+
30 {
+
31 }
+
32 
+
33 zShaderSet& zShaderSet::operator=(const zShaderSet& Copy)
+
34 {
+
35  mp_FShader = Copy.mp_FShader;
+
36  mp_VShader = Copy.mp_VShader;
+
37  m_error_str = Copy.GetError();
+
38  m_link_log = Copy.GetLinkerLog();
+
39  m_program = Copy.m_program;
+
40 
+
41  return (*this);
+
42 }
43 
-
44  return (*this);
-
45 }
-
46 
-
47 bool zShaderSet::LoadFromFile(const string_t& vs, const string_t& fs)
-
48 {
-
49  // Kill any existing shader programs.
-
50  this->Destroy();
+
44 bool zShaderSet::LoadFromFile(const string_t& vs, const string_t& fs)
+
45 {
+
46  // Kill any existing shader programs.
+
47  this->Destroy();
+
48 
+
49  mp_FShader = m_AssetManager.Create<zShader>(vs);
+
50  mp_VShader = m_AssetManager.Create<zShader>(fs);
51 
-
52  mp_FShader = m_AssetManager.Create<zShader>(vs);
-
53  mp_VShader = m_AssetManager.Create<zShader>(fs);
-
54 
-
55  if(mp_FShader == nullptr)
-
56  {
-
57  this->ShowLoadError(fs, "fragment");
-
58  return false;
-
59  }
-
60 
-
61  if(mp_VShader == nullptr)
-
62  {
-
63  this->ShowLoadError(vs, "vertex");
-
64  return false;
-
65  }
+
52  if(mp_FShader == nullptr)
+
53  {
+
54  this->ShowLoadError(fs, "fragment");
+
55  return false;
+
56  }
+
57 
+
58  if(mp_VShader == nullptr)
+
59  {
+
60  this->ShowLoadError(vs, "vertex");
+
61  return false;
+
62  }
+
63 
+
64  return this->CreateShaderObject();
+
65 }
66 
-
67  return this->CreateShaderObject();
-
68 }
-
69 
-
70 bool zShaderSet::LoadVertexShaderFromFile(const string_t& filename)
-
71 {
-
72  this->DestroyVS();
-
73 
-
74  mp_VShader = m_AssetManager.Create<zShader>(filename);
-
75  if(mp_VShader == nullptr)
-
76  {
-
77  this->ShowLoadError(filename, "vertex");
-
78  return false;
-
79  }
+
67 bool zShaderSet::LoadVertexShaderFromFile(const string_t& filename)
+
68 {
+
69  this->DestroyVS();
+
70 
+
71  mp_VShader = m_AssetManager.Create<zShader>(filename);
+
72  if(mp_VShader == nullptr)
+
73  {
+
74  this->ShowLoadError(filename, "vertex");
+
75  return false;
+
76  }
+
77 
+
78  return true;
+
79 }
80 
-
81  return true;
-
82 }
-
83 
-
84 bool zShaderSet::LoadFragmentShaderFromFile(const string_t& filename)
-
85 {
-
86  this->DestroyFS();
-
87 
-
88  mp_FShader = m_AssetManager.Create<zShader>(filename);
-
89  if(mp_FShader == nullptr)
-
90  {
-
91  this->ShowLoadError(filename, "fragment");
-
92  return false;
-
93  }
+
81 bool zShaderSet::LoadFragmentShaderFromFile(const string_t& filename)
+
82 {
+
83  this->DestroyFS();
+
84 
+
85  mp_FShader = m_AssetManager.Create<zShader>(filename);
+
86  if(mp_FShader == nullptr)
+
87  {
+
88  this->ShowLoadError(filename, "fragment");
+
89  return false;
+
90  }
+
91 
+
92  return true;
+
93 }
94 
-
95  return true;
-
96 }
-
97 
-
98 bool zShaderSet::LoadVertexShaderFromStr(const string_t& str)
-
99 {
-
100  this->DestroyVS();
-
101 
-
102  mp_VShader = m_AssetManager.Create<zShader>();
-
103  mp_VShader->SetType(GL_VERTEX_SHADER);
-
104  return mp_VShader->LoadFromRaw(str);
-
105 }
-
106 
-
107 bool zShaderSet::LoadFragmentShaderFromStr(const string_t& str)
-
108 {
-
109  this->DestroyFS();
-
110 
-
111  mp_FShader = m_AssetManager.Create<zShader>();
-
112  mp_FShader->SetType(GL_FRAGMENT_SHADER);
-
113  return mp_FShader->LoadFromRaw(str);
-
114 }
-
115 
-
116 bool zShaderSet::CreateShaderObject()
-
117 {
-
118  if(mp_FShader == nullptr || mp_VShader == nullptr)
-
119  {
-
120  m_error_str = "No shader objects loaded.";
-
121 
-
122  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
-
123  << m_Log.SetSystem("ShaderSet")
-
124  << m_error_str << zLog::endl;
+
95 bool zShaderSet::LoadVertexShaderFromStr(const string_t& str)
+
96 {
+
97  this->DestroyVS();
+
98 
+
99  mp_VShader = m_AssetManager.Create<zShader>();
+
100  mp_VShader->SetType(GL_VERTEX_SHADER);
+
101  return mp_VShader->LoadFromRaw(str);
+
102 }
+
103 
+
104 bool zShaderSet::LoadFragmentShaderFromStr(const string_t& str)
+
105 {
+
106  this->DestroyFS();
+
107 
+
108  mp_FShader = m_AssetManager.Create<zShader>();
+
109  mp_FShader->SetType(GL_FRAGMENT_SHADER);
+
110  return mp_FShader->LoadFromRaw(str);
+
111 }
+
112 
+
113 bool zShaderSet::CreateShaderObject()
+
114 {
+
115  if(mp_FShader == nullptr || mp_VShader == nullptr)
+
116  {
+
117  m_error_str = "No shader objects loaded.";
+
118 
+
119  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
+
120  << m_Log.SetSystem("ShaderSet")
+
121  << m_error_str << zLog::endl;
+
122 
+
123  return (m_init = false);
+
124  }
125 
-
126  return (m_init = false);
-
127  }
-
128 
-
129  // Test for existing shader program.
-
130  for(auto& i : s_shaderPrograms)
-
131  {
-
132  zShaderSet& SS = *(i.first);
-
133  if(SS.mp_VShader == mp_VShader &&
-
134  SS.mp_FShader == mp_FShader &&
-
135  SS.m_program != 0)
-
136  {
-
137  m_Log << m_Log.SetMode(LogMode::ZEN_DEBUG)
-
138  << m_Log.SetSystem("ShaderSet")
-
139  << "Found existing shader program for {'"
-
140  << mp_VShader->GetFilename() << "', '"
-
141  << mp_FShader->GetFilename() << "'}: " << SS.m_program
-
142  << '.' << zLog::endl;
-
143 
-
144  // We have a match, so copy the shader program handle
-
145  // instead of creating a new one. It may have errors, so we
-
146  // give feedback to the user accordingly.
-
147  m_program = SS.m_program;
-
148  m_error_str = SS.m_error_str;
-
149  m_link_log = SS.m_link_log;
-
150  m_ID = SS.m_ID;
-
151  m_refcount = ++SS.m_refcount;
-
152  return (m_init = m_error_str.empty());
-
153  }
-
154  }
-
155 
-
156  // Create shader program and attach shaders.
-
157  m_program = GL(glCreateProgram());
-
158  GL(glAttachShader(m_program, mp_VShader->GetShaderObject()));
-
159  GL(glAttachShader(m_program, mp_FShader->GetShaderObject()));
-
160 
-
161  // Link the compiled shader objects to the program.
-
162  GLint err = GL_NO_ERROR;
-
163  GL(glLinkProgram(m_program));
-
164  GL(glGetProgramiv(m_program, GL_LINK_STATUS, &err));
-
165 
-
166  int length = 0;
+
126  // Test for existing shader program.
+
127  for(auto& i : s_shaderPrograms)
+
128  {
+
129  zShaderSet& SS = *(i.first);
+
130  if(SS.mp_VShader == mp_VShader &&
+
131  SS.mp_FShader == mp_FShader &&
+
132  SS.m_program != 0)
+
133  {
+
134  m_Log << m_Log.SetMode(LogMode::ZEN_DEBUG)
+
135  << m_Log.SetSystem("ShaderSet")
+
136  << "Found existing shader program for {'"
+
137  << mp_VShader->GetFilename() << "', '"
+
138  << mp_FShader->GetFilename() << "'}: " << SS.m_program
+
139  << '.' << zLog::endl;
+
140 
+
141  // We have a match, so copy the shader program handle
+
142  // instead of creating a new one. It may have errors, so we
+
143  // give feedback to the user accordingly.
+
144  m_program = SS.m_program;
+
145  m_error_str = SS.m_error_str;
+
146  m_link_log = SS.m_link_log;
+
147  m_ID = SS.m_ID;
+
148  m_refcount = ++SS.m_refcount;
+
149  return (m_init = m_error_str.empty());
+
150  }
+
151  }
+
152 
+
153  // Create shader program and attach shaders.
+
154  m_program = GL(glCreateProgram());
+
155  GL(glAttachShader(m_program, mp_VShader->GetShaderObject()));
+
156  GL(glAttachShader(m_program, mp_FShader->GetShaderObject()));
+
157 
+
158  // Link the compiled shader objects to the program.
+
159  GLint err = GL_NO_ERROR;
+
160  GL(glLinkProgram(m_program));
+
161  GL(glGetProgramiv(m_program, GL_LINK_STATUS, &err));
+
162 
+
163  int length = 0;
+
164 
+
165  // Get log length to make an appropriate buffer.
+
166  GL(glGetProgramiv(m_program, GL_INFO_LOG_LENGTH, &length));
167 
-
168  // Get log length to make an appropriate buffer.
-
169  GL(glGetProgramiv(m_program, GL_INFO_LOG_LENGTH, &length));
-
170 
-
171  // Delete old log.
-
172  m_error_str.clear();
-
173  m_link_log.clear();
-
174 
-
175  // Get log.
-
176  if(length > 1)
-
177  {
-
178  char* buffer = new char[length];
-
179  GL(glGetProgramInfoLog(m_program, length, &length, buffer));
+
168  // Delete old log.
+
169  m_error_str.clear();
+
170  m_link_log.clear();
+
171 
+
172  // Get log.
+
173  if(length > 1)
+
174  {
+
175  char* buffer = new char[length];
+
176  GL(glGetProgramInfoLog(m_program, length, &length, buffer));
+
177 
+
178  m_link_log = buffer;
+
179  delete[] buffer;
180 
-
181  m_link_log = buffer;
-
182  delete[] buffer;
-
183 
-
184  m_Log << m_Log.SetMode(LogMode::ZEN_DEBUG)
-
185  << m_Log.SetSystem("ShaderSet") << "Shader linker log: "
-
186  << m_link_log << zLog::endl;
-
187  }
-
188 
-
189  // Link failed?
-
190  if(err == GL_FALSE)
-
191  {
-
192  GL(glDeleteProgram(m_program));
-
193  m_error_str = m_link_log;
-
194 
-
195  // Show log.
-
196  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
-
197  << m_Log.SetSystem("ShaderSet")
-
198  << "Failed to link shader objects to program: "
-
199  << m_error_str << "." << zLog::endl;
-
200 
-
201  this->Destroy();
-
202  return (m_init = false);
-
203  }
-
204 
-
205  // Add ourselves to the internal program storage.
-
206  ++m_refcount;
-
207  m_ID = s_ID++;
+
181  m_Log << m_Log.SetMode(LogMode::ZEN_DEBUG)
+
182  << m_Log.SetSystem("ShaderSet") << "Shader linker log: "
+
183  << m_link_log << zLog::endl;
+
184  }
+
185 
+
186  // Link failed?
+
187  if(err == GL_FALSE)
+
188  {
+
189  GL(glDeleteProgram(m_program));
+
190  m_error_str = m_link_log;
+
191 
+
192  // Show log.
+
193  m_Log << m_Log.SetMode(LogMode::ZEN_ERROR)
+
194  << m_Log.SetSystem("ShaderSet")
+
195  << "Failed to link shader objects to program: "
+
196  << m_error_str << "." << zLog::endl;
+
197 
+
198  this->Destroy();
+
199  return (m_init = false);
+
200  }
+
201 
+
202  // Add ourselves to the internal program storage.
+
203  ++m_refcount;
+
204  m_ID = s_ID++;
+
205 
+
206  ZEN_ASSERTM(s_ID < (1 << 6),
+
207  "too many shader programs; material ID will not be unique");
208 
-
209  ZEN_ASSERTM(s_ID < (1 << 6),
-
210  "too many shader programs; material ID will not be unique");
-
211 
-
212  s_shaderPrograms[this] = m_program;
-
213  return (m_init = true);
-
214 }
-
215 
-
216 bool zShaderSet::Bind() const
-
217 {
-
218  if(m_program == 0)
-
219  {
-
220  this->ShowProgramError();
-
221  return false;
-
222  }
-
223 
-
224  GL(glUseProgram(m_program));
-
225  return true;
-
226 }
-
227 
-
228 bool zShaderSet::Unbind() const
-
229 {
-
230  if(m_program == 0)
-
231  {
-
232  this->ShowProgramError();
-
233  return false;
-
234  }
-
235 
-
236  GL(glUseProgram(0));
-
237  return true;
-
238 }
-
239 
-
240 uint16_t zShaderSet::GetShaderObject() const
-
241 {
-
242  return m_program;
-
243 }
-
244 
-
245 GLuint zShaderSet::GetObjectHandle() const
-
246 {
-
247  return this->GetShaderObject();
-
248 }
-
249 
-
250 GLint zShaderSet::GetUniformLocation(const string_t& name) const
-
251 {
-
252  if(m_program == 0)
-
253  {
-
254  this->ShowProgramError();
-
255  return -1;
-
256  }
-
257 
-
258  GLint loc = -1;
-
259  GL(loc = glGetUniformLocation(m_program, name.c_str()));
-
260  return loc;
-
261 }
-
262 
-
263 GLint zShaderSet::GetAttributeLocation(const string_t& name) const
-
264 {
-
265  if(m_program == 0)
-
266  {
-
267  this->ShowProgramError();
-
268  return -1;
-
269  }
-
270 
-
271  GLint loc = -1;
-
272  GL(loc = glGetAttribLocation(m_program, name.c_str()));
-
273  return loc;
-
274 }
-
275 
-
276 const string_t& zShaderSet::GetError() const
-
277 {
-
278  return m_error_str;
-
279 }
-
280 
-
281 const string_t& zShaderSet::GetLinkerLog() const
-
282 {
-
283  return m_link_log;
-
284 }
-
285 
-
286 bool zShaderSet::Destroy()
-
287 {
-
288  if(!m_init) return false;
+
209  s_shaderPrograms[this] = m_program;
+
210  return (m_init = true);
+
211 }
+
212 
+
213 bool zShaderSet::Bind() const
+
214 {
+
215  if(m_program == 0)
+
216  {
+
217  this->ShowProgramError();
+
218  return false;
+
219  }
+
220 
+
221  GL(glUseProgram(m_program));
+
222  return true;
+
223 }
+
224 
+
225 bool zShaderSet::Unbind() const
+
226 {
+
227  if(m_program == 0)
+
228  {
+
229  this->ShowProgramError();
+
230  return false;
+
231  }
+
232 
+
233  GL(glUseProgram(0));
+
234  return true;
+
235 }
+
236 
+
237 uint16_t zShaderSet::GetShaderObject() const
+
238 {
+
239  return m_program;
+
240 }
+
241 
+
242 GLuint zShaderSet::GetObjectHandle() const
+
243 {
+
244  return this->GetShaderObject();
+
245 }
+
246 
+
247 GLint zShaderSet::GetUniformLocation(const string_t& name) const
+
248 {
+
249  if(m_program == 0)
+
250  {
+
251  this->ShowProgramError();
+
252  return -1;
+
253  }
+
254 
+
255  GLint loc = -1;
+
256  GL(loc = glGetUniformLocation(m_program, name.c_str()));
+
257  return loc;
+
258 }
+
259 
+
260 GLint zShaderSet::GetAttributeLocation(const string_t& name) const
+
261 {
+
262  if(m_program == 0)
+
263  {
+
264  this->ShowProgramError();
+
265  return -1;
+
266  }
+
267 
+
268  GLint loc = -1;
+
269  GL(loc = glGetAttribLocation(m_program, name.c_str()));
+
270  return loc;
+
271 }
+
272 
+
273 const string_t& zShaderSet::GetError() const
+
274 {
+
275  return m_error_str;
+
276 }
+
277 
+
278 const string_t& zShaderSet::GetLinkerLog() const
+
279 {
+
280  return m_link_log;
+
281 }
+
282 
+
283 bool zShaderSet::Destroy()
+
284 {
+
285  if(!m_init) return false;
+
286 
+
287  this->DestroyFS();
+
288  this->DestroyVS();
289 
-
290  this->DestroyFS();
-
291  this->DestroyVS();
-
292 
-
293  if(m_program > 0 && --m_refcount == 0)
-
294  {
-
295  GL(glDeleteProgram(m_program));
-
296  }
-
297 
-
298  m_error_str = "";
-
299  m_ID = m_program = 0;
-
300  return !(m_init = false);
-
301 }
-
302 
-
303 bool zShaderSet::DestroyFS()
-
304 {
-
305  if(mp_FShader != nullptr)
-
306  {
-
307  m_AssetManager.Delete(mp_FShader);
-
308  mp_FShader = nullptr;
-
309  return true;
-
310  }
+
290  if(m_program > 0 && --m_refcount == 0)
+
291  {
+
292  GL(glDeleteProgram(m_program));
+
293  }
+
294 
+
295  m_error_str = "";
+
296  m_ID = m_program = 0;
+
297  return !(m_init = false);
+
298 }
+
299 
+
300 bool zShaderSet::DestroyFS()
+
301 {
+
302  if(mp_FShader != nullptr)
+
303  {
+
304  m_AssetManager.Delete(mp_FShader);
+
305  mp_FShader = nullptr;
+
306  return true;
+
307  }
+
308 
+
309  return false;
+
310 }
311 
-
312  return false;
-
313 }
-
314 
-
315 bool zShaderSet::DestroyVS()
-
316 {
-
317  if(mp_VShader != nullptr)
-
318  {
-
319  m_AssetManager.Delete(mp_VShader);
-
320  mp_VShader = nullptr;
-
321  return true;
-
322  }
-
323 
-
324  return false;
-
325 }
+
312 bool zShaderSet::DestroyVS()
+
313 {
+
314  if(mp_VShader != nullptr)
+
315  {
+
316  m_AssetManager.Delete(mp_VShader);
+
317  mp_VShader = nullptr;
+
318  return true;
+
319  }
+
320 
+
321  return false;
+
322 }
diff --git a/docs/_shader_set_8hpp.html b/docs/_shader_set_8hpp.html index 8a8e5267..8a1c424c 100644 --- a/docs/_shader_set_8hpp.html +++ b/docs/_shader_set_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -133,7 +133,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_shader_set_8hpp__dep__incl.map b/docs/_shader_set_8hpp__dep__incl.map index 9da42c42..5ed8adb0 100644 --- a/docs/_shader_set_8hpp__dep__incl.map +++ b/docs/_shader_set_8hpp__dep__incl.map @@ -1,44 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_shader_set_8hpp__dep__incl.png b/docs/_shader_set_8hpp__dep__incl.png index 2a071bb7..a8f37b6b 100644 Binary files a/docs/_shader_set_8hpp__dep__incl.png and b/docs/_shader_set_8hpp__dep__incl.png differ diff --git a/docs/_shader_set_8hpp_source.html b/docs/_shader_set_8hpp_source.html index c9316e00..a09cb549 100644 --- a/docs/_shader_set_8hpp_source.html +++ b/docs/_shader_set_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_shapes_8cpp.html b/docs/_shapes_8cpp.html index 8481165a..6f01defb 100644 --- a/docs/_shapes_8cpp.html +++ b/docs/_shapes_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,13 +109,14 @@
Shapes.cpp File Reference
-
#include "Zenderer/Math/Shapes.hpp"
+
#include <algorithm>
+#include "Zenderer/Math/Shapes.hpp"
Include dependency graph for Shapes.cpp:
- +

Go to the source code of this file.

diff --git a/docs/_shapes_8cpp__incl.map b/docs/_shapes_8cpp__incl.map index 4e0ccaf2..1c9cc7c5 100644 --- a/docs/_shapes_8cpp__incl.map +++ b/docs/_shapes_8cpp__incl.map @@ -1,12 +1,12 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/docs/_shapes_8cpp__incl.png b/docs/_shapes_8cpp__incl.png index 871ffcf1..1ea1c7fc 100644 Binary files a/docs/_shapes_8cpp__incl.png and b/docs/_shapes_8cpp__incl.png differ diff --git a/docs/_shapes_8cpp_source.html b/docs/_shapes_8cpp_source.html index f180c33c..1348d1f1 100644 --- a/docs/_shapes_8cpp_source.html +++ b/docs/_shapes_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,278 +109,288 @@
Shapes.cpp
-Go to the documentation of this file.
1 #include "Zenderer/Math/Shapes.hpp"
-
2 
-
3 using namespace zen;
-
4 using namespace math;
-
5 
-
6 bool aabb_t::collides(const aabb_t& b) const
-
7 {
-
8  return !(tl.x > b.br.x || br.x < b.tl.x ||
-
9  tl.y > b.br.y || br.y < b.tl.y);
-
10 }
-
11 
-
12 bool aabb_t::collides(const tri_t& tri) const
-
13 {
-
14  vector_t halfsize((br - tl) * 0.5);
-
15  vector_t center(tl + halfsize);
-
16 
-
17  vector_t verts[3] = {
-
18  tri[0] - center,
-
19  tri[1] - center,
-
20  tri[2] - center
-
21  };
-
22 
-
23  vector_t edges[3] = {
-
24  verts[1] - verts[0],
-
25  verts[2] - verts[1],
-
26  verts[0] - verts[2]
-
27  };
-
28 
-
29  /*
-
30  * Axis tests entail the following:
-
31  *
-
32  * determinant:
-
33  * | edge.y edge.x |
-
34  * | vert.y vert.x |
-
35  *
-
36  * radius check:
-
37  * <edge.y, edge.x> DOT halfsize
-
38  *
-
39  * determining min/max from determinant
-
40  *
-
41  * if min > radius or max < -radius there is no collision
-
42  */
-
43 
-
44  // First axis test
-
45 
-
46  real_t p1 = edges[0].y * verts[1].x - edges[0].x * verts[1].y;
-
47  real_t p2 = edges[0].y * verts[2].x - edges[0].x * verts[2].y;
-
48  real_t r = std::abs(edges[0].y) * halfsize.x +
-
49  std::abs(edges[0].x) * halfsize.y;
-
50 
-
51  real_t mn = 0.0, mx = 0.0;
-
52  if(p2 < p1) { mn = p2; mx = p1; }
-
53  else { mn = p1; mx = p2; }
-
54 
-
55  if(mn > r || mx < -r) return false;
-
56 
-
57  // Second axis test
-
58 
-
59  p1 = edges[1].y * verts[0].x - edges[1].x * verts[0].y;
-
60  p2 = edges[1].y * verts[1].x - edges[1].x * verts[1].y;
-
61  r = std::abs(edges[1].y) * halfsize.x +
-
62  std::abs(edges[1].x) * halfsize.y;
-
63 
-
64  if(p1 < p2) { mn = p1; mx = p2; }
-
65  else { mn = p2; mx = p1; }
-
66 
-
67  if(mn > r || mx < -r) return false;
-
68 
-
69  // Third axis test
-
70 
-
71  p1 = edges[2].y * verts[1].x - edges[2].x * verts[1].y;
-
72  p2 = edges[2].y * verts[2].x - edges[2].x * verts[2].y;
-
73  r = std::abs(edges[2].y) * halfsize.x +
-
74  std::abs(edges[2].x) * halfsize.y;
-
75 
-
76  if(p2 < p1) { mn = p2; mx = p1; }
-
77  else { mn = p1; mx = p2; }
-
78 
-
79  if(mn > r || mx < -r) return false;
-
80 
-
81  // min/max check
-
82 
-
83  mn = mx = verts[0].x;
-
84  mn = min<real_t>(min<real_t>(mn, verts[1].x), verts[2].x);
-
85  mx = max<real_t>(max<real_t>(mx, verts[1].x), verts[2].x);
-
86 
-
87  if(mn > halfsize.x || mx < -halfsize.x) return false;
-
88 
-
89  mn = mx = verts[0].y;
-
90  mn = min<real_t>(min<real_t>(mn, verts[1].y), verts[2].y);
-
91  mx = max<real_t>(max<real_t>(mx, verts[1].y), verts[2].y);
-
92 
-
93  if(mn > halfsize.y || mx < -halfsize.y) return false;
-
94 
-
95  return true;
-
96 }
-
97 
-
98 bool math::collides(const tri_t& A, const tri_t& B, vector_t* pt)
-
99 {
-
100  line_t aseg[3] = {
-
101  { A[0], A[1] },
-
102  { A[1], A[2] },
-
103  { A[0], A[2] }
-
104  };
-
105 
-
106  line_t bseg[3] = {
-
107  { B[0], B[1] },
-
108  { B[1], B[2] },
-
109  { B[0], B[2] }
-
110  };
-
111 
-
112  for(uint8_t i = 0; i < 3; ++i)
-
113  {
-
114  for(uint8_t j = 0; j < 3; ++j)
-
115  {
-
116  if(math::collides(aseg[i], bseg[j], pt)) return true;
-
117  }
-
118  }
-
119 
-
120  return false;
-
121 }
-
122 
-
123 bool math::collides(const line_t& a, const line_t& b, vector_t* pt)
-
124 {
-
125  // A = Q -> Q + S
-
126  // B = P -> P + R
-
127  vector_t r = b[1] - b[0];
-
128  vector_t s = a[1] - a[0];
-
129  vector_t z = a[0] - b[0];
-
130 
-
131  real_t zxr = z.Cross2D(r);
+Go to the documentation of this file.
1 #include <algorithm>
+
2 #include "Zenderer/Math/Shapes.hpp"
+
3 
+
4 using namespace zen;
+
5 using namespace math;
+
6 
+
7 bool aabb_t::collides(const aabb_t& b) const
+
8 {
+
9  return !(tl.x > b.br.x || br.x < b.tl.x ||
+
10  tl.y > b.br.y || br.y < b.tl.y);
+
11 }
+
12 
+
13 bool aabb_t::collides(const tri_t& tri) const
+
14 {
+
15  vector_t halfsize((br - tl) * 0.5);
+
16  vector_t center(tl + halfsize);
+
17 
+
18  vector_t verts[3] = {
+
19  tri[0] - center,
+
20  tri[1] - center,
+
21  tri[2] - center
+
22  };
+
23 
+
24  vector_t edges[3] = {
+
25  verts[1] - verts[0],
+
26  verts[2] - verts[1],
+
27  verts[0] - verts[2]
+
28  };
+
29 
+
30  /*
+
31  * Axis tests entail the following:
+
32  *
+
33  * determinant:
+
34  * | edge.y edge.x |
+
35  * | vert.y vert.x |
+
36  *
+
37  * radius check:
+
38  * <edge.y, edge.x> DOT halfsize
+
39  *
+
40  * determining min/max from determinant
+
41  *
+
42  * if min > radius or max < -radius there is no collision
+
43  */
+
44 
+
45  // First axis test
+
46 
+
47  real_t p1 = edges[0].y * verts[1].x - edges[0].x * verts[1].y;
+
48  real_t p2 = edges[0].y * verts[2].x - edges[0].x * verts[2].y;
+
49  real_t r = std::abs(edges[0].y) * halfsize.x +
+
50  std::abs(edges[0].x) * halfsize.y;
+
51 
+
52  real_t mn = 0.0, mx = 0.0;
+
53  if(p2 < p1) { mn = p2; mx = p1; }
+
54  else { mn = p1; mx = p2; }
+
55 
+
56  if(mn > r || mx < -r) return false;
+
57 
+
58  // Second axis test
+
59 
+
60  p1 = edges[1].y * verts[0].x - edges[1].x * verts[0].y;
+
61  p2 = edges[1].y * verts[1].x - edges[1].x * verts[1].y;
+
62  r = std::abs(edges[1].y) * halfsize.x +
+
63  std::abs(edges[1].x) * halfsize.y;
+
64 
+
65  if(p1 < p2) { mn = p1; mx = p2; }
+
66  else { mn = p2; mx = p1; }
+
67 
+
68  if(mn > r || mx < -r) return false;
+
69 
+
70  // Third axis test
+
71 
+
72  p1 = edges[2].y * verts[1].x - edges[2].x * verts[1].y;
+
73  p2 = edges[2].y * verts[2].x - edges[2].x * verts[2].y;
+
74  r = std::abs(edges[2].y) * halfsize.x +
+
75  std::abs(edges[2].x) * halfsize.y;
+
76 
+
77  if(p2 < p1) { mn = p2; mx = p1; }
+
78  else { mn = p1; mx = p2; }
+
79 
+
80  if(mn > r || mx < -r) return false;
+
81 
+
82  // min/max check
+
83 
+
84  mn = mx = verts[0].x;
+
85  mn = min<real_t>(min<real_t>(mn, verts[1].x), verts[2].x);
+
86  mx = max<real_t>(max<real_t>(mx, verts[1].x), verts[2].x);
+
87 
+
88  if(mn > halfsize.x || mx < -halfsize.x) return false;
+
89 
+
90  mn = mx = verts[0].y;
+
91  mn = min<real_t>(min<real_t>(mn, verts[1].y), verts[2].y);
+
92  mx = max<real_t>(max<real_t>(mx, verts[1].y), verts[2].y);
+
93 
+
94  if(mn > halfsize.y || mx < -halfsize.y) return false;
+
95 
+
96  return true;
+
97 }
+
98 
+
99 bool math::collides(const tri_t& A, const tri_t& B, cquery_t* q)
+
100 {
+
101  line_t aseg[3] = {
+
102  { A[0], A[1] },
+
103  { A[1], A[2] },
+
104  { A[0], A[2] }
+
105  };
+
106 
+
107  line_t bseg[3] = {
+
108  { B[0], B[1] },
+
109  { B[1], B[2] },
+
110  { B[0], B[2] }
+
111  };
+
112 
+
113  for(uint8_t i = 0; i < 3; ++i)
+
114  {
+
115  for(uint8_t j = 0; j < 3; ++j)
+
116  {
+
117  if(math::collides(aseg[i], bseg[j]))
+
118  {
+
119  if(q != nullptr)
+
120  {
+
121  q->line1 = std::move(aseg[i]);
+
122  q->line2 = std::move(bseg[j]);
+
123  }
+
124 
+
125  return true;
+
126  }
+
127  }
+
128  }
+
129 
+
130  return false;
+
131 }
132 
-
133  // Co-linear. Check for overlap.
-
134  if(compf(zxr, 0.0))
-
135  {
-
136  return ((b[0].x - a[0].x < 0 != b[0].x - a[1].x < 0) ||
-
137  (b[0].y - a[0].y < 0 != b[0].y - a[1].y < 0));
-
138  }
-
139 
-
140  real_t d = r.Cross2D(s);
-
141  if(compf(d, 0.0)) return false; // Parallel lines.
+
133 bool math::collides(const line_t& a, const line_t& b, cquery_t* q)
+
134 {
+
135  // A = Q -> Q + S
+
136  // B = P -> P + R
+
137  vector_t r = b[1] - b[0];
+
138  vector_t s = a[1] - a[0];
+
139  vector_t z = a[0] - b[0];
+
140 
+
141  real_t zxr = z.Cross2D(r);
142 
-
143  real_t t = z.Cross2D(s) / d;
-
144  real_t u = zxr / d;
-
145 
-
146  if(pt != nullptr) *pt = b[0] + (r * t);
-
147  return in_range<real_t>(t, 0, 1) && in_range<real_t>(u, 0, 1);
-
148 }
+
143  // Co-linear. Check for overlap.
+
144  if(compf(zxr, 0.0))
+
145  {
+
146  return ((b[0].x - a[0].x < 0 != b[0].x - a[1].x < 0) ||
+
147  (b[0].y - a[0].y < 0 != b[0].y - a[1].y < 0));
+
148  }
149 
-
150 bool math::orientation(const tri_t& Tri)
-
151 {
-
152  return (Tri[1].x - Tri[0].x) * (Tri[2].y - Tri[0].y) -
-
153  (Tri[2].x - Tri[0].x) * (Tri[1].y - Tri[0].y) > 0.0;
-
154 }
+
150  real_t d = r.Cross2D(s);
+
151  if(compf(d, 0.0)) return false; // Parallel lines.
+
152 
+
153  real_t t = z.Cross2D(s) / d;
+
154  real_t u = zxr / d;
155 
-
156 bool math::triangle_test(const vector_t& V, const tri_t& T)
-
157 {
-
158  real_t denom = (T[1].y - T[2].y) * (T[0].x - T[2].x)
-
159  + (T[2].x - T[1].x) * (T[0].y - T[2].y);
-
160 
-
161  // Avoid division by zero.
-
162  if(compf(denom, 0.0)) return true;
-
163  denom = 1.0 / denom;
-
164 
-
165  real_t alpha = denom * ((T[1].y - T[2].y) * (V.x - T[2].x) +
-
166  (T[2].x - T[1].x) * (V.y - T[2].y));
-
167  if(alpha < 0) return false;
-
168 
-
169  real_t beta = denom * ((T[2].y - T[0].y) * (V.x - T[2].x) +
-
170  (T[0].x - T[2].x) * (V.y - T[2].y));
-
171 
-
172  return (beta > 0 || alpha + beta >= 1);
-
173 }
+
156  if(q != nullptr) q->point = b[0] + (r * t);
+
157  return in_range<real_t>(t, 0, 1) && in_range<real_t>(u, 0, 1);
+
158 }
+
159 
+
160 bool math::orientation(const tri_t& Tri)
+
161 {
+
162  return (Tri[1].x - Tri[0].x) * (Tri[2].y - Tri[0].y) -
+
163  (Tri[2].x - Tri[0].x) * (Tri[1].y - Tri[0].y) > 0.0;
+
164 }
+
165 
+
166 bool math::triangle_test(const vector_t& V, const tri_t& T)
+
167 {
+
168  real_t denom = (T[1].y - T[2].y) * (T[0].x - T[2].x)
+
169  + (T[2].x - T[1].x) * (T[0].y - T[2].y);
+
170 
+
171  // Avoid division by zero.
+
172  if(compf(denom, 0.0)) return false;
+
173  denom = 1.0 / denom;
174 
-
175 std::vector<vector_t> math::triangulate(std::vector<vector_t> Polygon)
-
176 {
-
177  std::vector<uint16_t> reflex;
-
178  std::vector<vector_t> triangles;
-
179 
-
180  if(Polygon.size() <= 3) return Polygon;
+
175  real_t alpha = denom * ((T[1].y - T[2].y) * (V.x - T[2].x) +
+
176  (T[2].x - T[1].x) * (V.y - T[2].y));
+
177  if(alpha < 0) return false;
+
178 
+
179  real_t beta = denom * ((T[2].y - T[0].y) * (V.x - T[2].x) +
+
180  (T[0].x - T[2].x) * (V.y - T[2].y));
181 
-
182  // Determine polygon's orientation via top-left-most vertex.
-
183  vector_t left = Polygon[0];
-
184  size_t index = 0;
-
185  for(size_t i = 0; i < Polygon.size(); ++i)
-
186  {
-
187  if(Polygon[i].x < left.x ||
-
188  (compf(Polygon[i].x, left.x) && Polygon[i].y < left.y))
-
189  {
-
190  index = i;
-
191  left = Polygon[i];
-
192  }
-
193  }
-
194 
-
195  tri_t tri = {
-
196  Polygon[(index > 0) ? index - 1 : Polygon.size() - 1],
-
197  Polygon[index],
-
198  Polygon[(index + 1 < Polygon.size()) ? index + 1 : 0]
-
199  };
-
200 
-
201  bool ccw = orientation(tri);
-
202 
-
203  // We know there will be vertex_count - 2 triangles made.
-
204  triangles.reserve(Polygon.size() - 2);
-
205 
-
206  while(Polygon.size() >= 3)
-
207  {
-
208  reflex.clear();
-
209  int16_t eartip = -1, index = -1;
-
210  tri_t tri;
-
211 
-
212  for(auto& i : Polygon)
-
213  {
-
214  ++index;
-
215  if(eartip >= 0) break;
-
216 
-
217  uint16_t p = (index > 0) ? index - 1 : Polygon.size() - 1;
-
218  uint16_t n = (index + 1 < Polygon.size()) ? index + 1 : 0;
-
219 
-
220  tri[0] = Polygon[p]; tri[1] = i; tri[2] = Polygon[n];
+
182  return (beta > 0 && alpha + beta >= 1);
+
183 }
+
184 
+
185 std::vector<vector_t> math::triangulate(std::vector<vector_t> Polygon)
+
186 {
+
187  if(Polygon.size() <= 3) return Polygon;
+
188 
+
189  // Determine polygon's orientation via top-left-most vertex.
+
190  size_t index = 0;
+
191  vector_t left = Polygon[index];
+
192  for(size_t i = 0; i < Polygon.size(); ++i)
+
193  {
+
194  if(Polygon[i].x < left.x ||
+
195  (compf(Polygon[i].x, left.x) && Polygon[i].y < left.y))
+
196  {
+
197  index = i;
+
198  left = Polygon[i];
+
199  }
+
200  }
+
201 
+
202  tri_t tri = {
+
203  Polygon[(index > 0) ? index - 1 : Polygon.size() - 1],
+
204  Polygon[index],
+
205  Polygon[(index + 1 < Polygon.size()) ? index + 1 : 0]
+
206  };
+
207 
+
208  bool ccw = orientation(tri);
+
209 
+
210  std::vector<uint16_t> reflex;
+
211  std::vector<vector_t> triangles;
+
212 
+
213  // We know there will be vertex_count - 2 triangles made.
+
214  triangles.reserve(Polygon.size() - 2);
+
215 
+
216  while(Polygon.size() >= 3)
+
217  {
+
218  reflex.clear();
+
219  int16_t eartip = -1, index = -1;
+
220  tri_t tri;
221 
-
222  if(orientation(tri) != ccw)
-
223  {
-
224  reflex.emplace_back(index);
-
225  continue;
-
226  }
-
227 
-
228  bool ear = true;
-
229  for(auto& j : reflex)
-
230  {
-
231  if(j == p || j == n) continue;
-
232  if(triangle_test(Polygon[j], tri))
-
233  {
-
234  ear = false;
-
235  break;
-
236  }
-
237  }
-
238 
-
239  if(ear)
+
222  for(auto& i : Polygon)
+
223  {
+
224  ++index;
+
225  if(eartip >= 0) break;
+
226 
+
227  uint16_t p = (index > 0) ? index - 1 : Polygon.size() - 1;
+
228  uint16_t n = (index + 1 < Polygon.size()) ? index + 1 : 0;
+
229 
+
230  tri[0] = Polygon[p]; tri[1] = i; tri[2] = Polygon[n];
+
231 
+
232  if(orientation(tri) != ccw)
+
233  {
+
234  reflex.emplace_back(index);
+
235  continue;
+
236  }
+
237 
+
238  bool ear = true;
+
239  for(auto& j : reflex)
240  {
-
241  auto j = Polygon.begin() + index + 1,
-
242  k = Polygon.end();
-
243 
-
244  for( ; j != k; ++j)
-
245  {
-
246  auto& v = *j;
-
247  if(&v == &Polygon[p] ||
-
248  &v == &Polygon[n] ||
-
249  &v == &Polygon[index]) continue;
-
250 
-
251  if(triangle_test(v, tri))
-
252  {
-
253  ear = false;
-
254  break;
-
255  }
-
256  }
-
257  }
-
258 
-
259  if(ear) eartip = index;
-
260  }
-
261 
-
262  if(eartip < 0) break;
-
263 
-
264  // Create the triangulated piece.
-
265  for(const auto& i : tri) triangles.push_back(i);
-
266 
-
267  // Clip the ear from the polygon.
-
268  Polygon.erase(std::find(Polygon.begin(), Polygon.end(), tri[1]));
-
269  }
-
270 
-
271  return triangles;
-
272 }
+
241  if(j == p || j == n) continue;
+
242  if(triangle_test(Polygon[j], tri))
+
243  {
+
244  ear = false;
+
245  break;
+
246  }
+
247  }
+
248 
+
249  if(ear)
+
250  {
+
251  auto j = Polygon.begin() + index + 1,
+
252  k = Polygon.end();
+
253 
+
254  for( ; j != k; ++j)
+
255  {
+
256  auto& v = *j;
+
257  if(&v == &Polygon[p] ||
+
258  &v == &Polygon[n] ||
+
259  &v == &Polygon[index]) continue;
+
260 
+
261  if(triangle_test(v, tri))
+
262  {
+
263  ear = false;
+
264  break;
+
265  }
+
266  }
+
267  }
+
268 
+
269  if(ear) eartip = index;
+
270  }
+
271 
+
272  if(eartip < 0) break;
+
273 
+
274  // Create the triangulated piece.
+
275  for(const auto& i : tri) triangles.emplace_back(std::move(i));
+
276 
+
277  // Clip the ear from the polygon.
+
278  Polygon.erase(std::find(Polygon.begin(), Polygon.end(), tri[1]));
+
279  }
+
280 
+
281  return triangles;
+
282 }
diff --git a/docs/_shapes_8hpp.html b/docs/_shapes_8hpp.html index f31c8258..008c3fc4 100644 --- a/docs/_shapes_8hpp.html +++ b/docs/_shapes_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -136,7 +136,7 @@
- +

Go to the source code of this file.

@@ -152,6 +152,9 @@ struct  zen::math::aabb_t  Represents an axis-aligned bounding box. More...
  +struct  zen::math::cquery_t + A collision-quering structure. More...
+  @@ -181,12 +184,12 @@

Namespaces

- - - - - - + + + + + + diff --git a/docs/_shapes_8hpp.js b/docs/_shapes_8hpp.js index 1f0a0056..f308688b 100644 --- a/docs/_shapes_8hpp.js +++ b/docs/_shapes_8hpp.js @@ -3,10 +3,11 @@ var _shapes_8hpp = [ "rect_t", "structzen_1_1math_1_1rect__t.html", "structzen_1_1math_1_1rect__t" ], [ "circle_t", "structzen_1_1math_1_1circle__t.html", "structzen_1_1math_1_1circle__t" ], [ "aabb_t", "structzen_1_1math_1_1aabb__t.html", "structzen_1_1math_1_1aabb__t" ], + [ "cquery_t", "structzen_1_1math_1_1cquery__t.html", "structzen_1_1math_1_1cquery__t" ], [ "tri_t", "_shapes_8hpp.html#ad5c361b3d7be88928e486f6b04b37ec7", null ], [ "line_t", "_shapes_8hpp.html#abda8e557abe05d9768b9da6f8470ebe5", null ], - [ "collides", "_shapes_8hpp.html#ae3df27df54d004f888b10187fe1c3077", null ], - [ "collides", "_shapes_8hpp.html#a7c7f261f6eceee12104089778b1e342b", null ], + [ "collides", "_shapes_8hpp.html#a96d8397d0fc2cc7a832a4b1e2f427e41", null ], + [ "collides", "_shapes_8hpp.html#a36b4f55da484ea4e79631cc4bdd24cd2", null ], [ "orientation", "_shapes_8hpp.html#a64218c752dcff51bfa84fbe3d3b52d66", null ], [ "triangle_test", "_shapes_8hpp.html#a1d4ffb053acae9b90121f0d9658680f0", null ], [ "triangulate", "_shapes_8hpp.html#a4f3d40ee0b2ca5a5ea75006260d1dede", null ] diff --git a/docs/_shapes_8hpp__dep__incl.map b/docs/_shapes_8hpp__dep__incl.map index 8c8dc67f..773440c1 100644 --- a/docs/_shapes_8hpp__dep__incl.map +++ b/docs/_shapes_8hpp__dep__incl.map @@ -1,36 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_shapes_8hpp__dep__incl.png b/docs/_shapes_8hpp__dep__incl.png index 98e2446b..78b0bdd6 100644 Binary files a/docs/_shapes_8hpp__dep__incl.png and b/docs/_shapes_8hpp__dep__incl.png differ diff --git a/docs/_shapes_8hpp_source.html b/docs/_shapes_8hpp_source.html index d991bccc..c7593f69 100644 --- a/docs/_shapes_8hpp_source.html +++ b/docs/_shapes_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -164,28 +164,39 @@
77  aabb_t(const rect_t& Data) :
78  tl(Data.x, Data.y), br(Data.x + Data.w, Data.y + Data.h) {}
79 
-
81  bool collides(const aabb_t& b) const;
+
81  bool collides(const aabb_t& b) const;
82 
-
102  bool collides(const tri_t& tri) const;
+
102  bool collides(const tri_t& tri) const;
103 
104  vector_t tl;
105  vector_t br;
106  };
107 
-
115  bool collides(const tri_t& A, const tri_t& b, vector_t* pt = nullptr);
-
116 
-
121  bool collides(const line_t& a, const line_t& b, vector_t* pt = nullptr);
-
122 
-
128  bool orientation(const tri_t& Tri);
-
129 
-
141  bool triangle_test(const vector_t& V, const tri_t& T);
-
142 
-
157  std::vector<vector_t> triangulate(std::vector<vector_t> Polygon);
-
158 } // namespace math
-
159 } // namespace zen
-
160 
-
161 #endif // ZENDERER__MATH__SHAPES_HPP
-
162 
+
127  struct cquery_t
+
128  {
+
129  aabb_t box1, box2;
+
130  line_t line1, line2;
+
131  tri_t tri1, tri2;
+
132  vector_t point;
+
133  bool collision;
+
134 
+
135  cquery_t() : collision(false) {}
+
136  };
+
137 
+
145  bool collides(const tri_t& A, const tri_t& b, cquery_t* q = nullptr);
+
146 
+
151  bool collides(const line_t& a, const line_t& b, cquery_t* q = nullptr);
+
152 
+
158  bool orientation(const tri_t& Tri);
+
159 
+
171  bool triangle_test(const vector_t& V, const tri_t& T);
+
172 
+
187  std::vector<vector_t> triangulate(std::vector<vector_t> Polygon);
+
188 } // namespace math
+
189 } // namespace zen
+
190 
+
191 #endif // ZENDERER__MATH__SHAPES_HPP
+
192 
diff --git a/docs/_socket_8cpp.html b/docs/_socket_8cpp.html index 69c7bed9..2e6d5389 100644 --- a/docs/_socket_8cpp.html +++ b/docs/_socket_8cpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_socket_8cpp_source.html b/docs/_socket_8cpp_source.html index 95c5092e..cee1daff 100644 --- a/docs/_socket_8cpp_source.html +++ b/docs/_socket_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -160,7 +160,7 @@
49  {
50  if((m_socket = socket(result->ai_family,
51  result->ai_socktype,
-
52  result->ai_protocol)) == -1)
+
52  result->ai_protocol)) == INVALID_SOCKET)
53  {
54  continue;
55  }
@@ -175,24 +175,24 @@
64  }
65 
66  freeaddrinfo(tmp);
-
67  return m_socket != -1;
+
67  return m_socket != INVALID_SOCKET;
68 }
69 
70 bool zSocket::Destroy()
71 {
-
72  if(m_socket == -1) return false;
+
72  if(m_socket == INVALID_SOCKET) return false;
73 #ifdef _WIN32
74  closesocket(m_socket);
75 #else
76  close(m_socket);
77 #endif // _WIN32
-
78  return (m_socket = -1);
+
78  return (m_socket = INVALID_SOCKET);
79 }
80 
81 string_t zSocket::RecvFrom(const size_t size, string_t& address,
82  string_t& port)
83 {
-
84  if(m_socket <= 0) return "";
+
84  if(m_socket == INVALID_SOCKET) return "";
85 
86  address = "";
87  sockaddr_in addr;
@@ -228,7 +228,7 @@
117 int zSocket::SendTo(const string_t& addr, const string_t& port,
118  const string_t& data)
119 {
-
120  if(m_socket < 0 || m_Type == SocketType::TCP) return -1;
+
120  if(m_socket == INVALID_SOCKET || m_Type == SocketType::TCP) return -1;
121 
122 #ifdef ZEN_DEBUG_BUILD
123  zLog& Log = zLog::GetEngineLog();
@@ -277,7 +277,7 @@
166 
167 bool zSocket::SetNonblocking(const bool flag)
168 {
-
169  if(m_socket < 0) return false;
+
169  if(m_socket == INVALID_SOCKET) return false;
170 
171 #ifdef _WIN32
172  unsigned long set = flag ? 1 : 0;
diff --git a/docs/_socket_8hpp.html b/docs/_socket_8hpp.html index 2550e678..15609835 100644 --- a/docs/_socket_8hpp.html +++ b/docs/_socket_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,6 +109,7 @@ Data Structures | Namespaces | Constant Groups | +Typedefs | Enumerations
Socket.hpp File Reference
@@ -139,7 +140,7 @@
- +

Go to the source code of this file.

@@ -170,6 +171,11 @@

Functions

bool zen::math::collides (const tri_t &A, const tri_t &b, vector_t *pt=nullptr)
 Detects collision between two triangles. More...
 
bool zen::math::collides (const line_t &a, const line_t &b, vector_t *pt=nullptr)
 This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
 
bool zen::math::collides (const tri_t &A, const tri_t &b, cquery_t *q=nullptr)
 Detects collision between two triangles. More...
 
bool zen::math::collides (const line_t &a, const line_t &b, cquery_t *q=nullptr)
 This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
 
bool zen::math::orientation (const tri_t &Tri)
 Finds orientation of a given set of points. More...
 
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
 zen::net
 
+ + + +

+Typedefs

typedef unsigned int zen::net::socket_t
 

Enumerations

enum  zen::net::ICMPReply { zen::net::ICMP_ECHO_REPLY = 0, @@ -213,7 +219,7 @@
-

Definition at line 59 of file Socket.hpp.

+

Definition at line 61 of file Socket.hpp.

Data Fields
@@ -296,7 +302,7 @@
-

Definition at line 74 of file Socket.hpp.

+

Definition at line 76 of file Socket.hpp.

@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -118,114 +118,125 @@
34 #include "Zenderer/Utilities/Assert.hpp"
35 
36 #ifdef _WIN32
-
37  #include <thread>
-
38  #include <WinSock2.h>
-
39  #include <WS2TCPIP.h>
-
40  #pragma comment(lib, "ws2_32.lib")
-
41 #else
-
42  #include <unistd.h>
-
43  #include <errno.h>
-
44  #include <netdb.h>
-
45  #include <sys/types.h>
-
46  #include <sys/socket.h>
-
47  #include <netinet/in.h>
-
48  #include <arpa/inet.h>
-
49 #endif // _WIN32
-
50 
-
51 namespace zen
-
52 {
-
53 namespace net
+
37  #undef _WIN32_WINNT
+
38  #define _WIN32_WINNT 0x501
+
39  #include <thread>
+
40  #include <WinSock2.h>
+
41  #include <WS2TCPIP.h>
+
42  #pragma comment(lib, "ws2_32.lib")
+
43 #else
+
44  #include <unistd.h>
+
45  #include <errno.h>
+
46  #include <netdb.h>
+
47  #include <sys/types.h>
+
48  #include <sys/socket.h>
+
49  #include <netinet/in.h>
+
50  #include <arpa/inet.h>
+
51 #endif // _WIN32
+
52 
+
53 namespace zen
54 {
-
55 // Windows has a custom ICMP API that avoids the need
-
56 // for raw sockets and administrative rights.
-
57 #ifndef _WIN32
-
58 #pragma pack(1)
-
59  struct IPHeader
-
60  {
-
61  unsigned int h_len:4;
-
62  unsigned int version:4;
-
63  uint8_t tos;
-
64  uint16_t total_len;
-
65  uint16_t id;
-
66  uint16_t flags;
-
67  uint8_t ttl;
-
68  uint8_t proto;
-
69  uint16_t chk;
-
70  uint32_t source_ip;
-
71  uint32_t dest_ip;
-
72  };
-
73 
-
74  struct ICMPHeader
-
75  {
-
76  uint8_t type;
-
77  uint8_t code;
-
78  uint16_t chk;
-
79  uint16_t id;
-
80  uint16_t seq;
-
81  uint32_t time;
-
82  };
-
83 #pragma pack()
-
84 
-
85  enum ICMPReply
-
86  {
-
87  ICMP_ECHO_REPLY = 0,
-
88  ICMP_DEST_UNREACHABLE = 3,
-
89  ICMP_ECHO_REQUEST = 8
-
90  ICMP_TTL_EXPIRE = 11,
-
91  };
-
92 
-
93  enum class ICMPPacket
-
94  {
-
95  PACKET_SIZE = 8,
-
96  DEFAULT_SIZE = 32,
-
97  MAX_DATA_SIZE = 1024,
-
98  MAX_PACKET_SIZE = MAX_DATA_SIZE + sizeof(IPHeader);
-
99  };
-
100 #endif // _WIN32
-
101 
-
102  enum class SocketType { TCP, UDP, RAW };
-
103 
-
105  class ZEN_API zSocket
-
106  {
-
107  public:
-
108  zSocket(const SocketType& Type) : m_Type(Type),
-
109  m_socket(-1), m_Log(util::zLog::GetEngineLog()) {}
-
110 
-
111  virtual ~zSocket() { this->Destroy(); }
-
112 
-
113  static bool InitializeLibrary();
-
114 
-
115  bool Init(const string_t& host, const string_t& port);
-
116  bool Destroy();
-
117 
-
132  string_t RecvFrom(const size_t size, string_t& address, string_t& port);
-
133 
-
149  int SendTo(const string_t& addr, const string_t& port,
-
150  const string_t& data);
-
151 
-
152  int SendBroadcast(const string_t& message, const string_t& port = "");
-
153 
-
154  bool Ping();
-
155  bool SetSocketOption(const int type, const int option, const bool flag);
-
156 
-
168  bool SetNonblocking(const bool flag);
-
169 
-
180  int GetError() const;
-
181 
-
182  private:
-
183  static string_t GetAddress(sockaddr_in& addr);
-
184  static in_addr GetAddress(const string_t& ip);
-
185 
-
186  static bool s_init;
-
187  util::zLog& m_Log;
-
188  SocketType m_Type;
-
189  int m_socket;
-
190  };
-
191 }
-
192 }
-
193 
-
194 #endif // ZENDERER__NETWORK__SOCKET_HPP
-
195 
+
55 namespace net
+
56 {
+
57 // Windows has a custom ICMP API that avoids the need
+
58 // for raw sockets and administrative rights.
+
59 #ifndef _WIN32
+
60 #pragma pack(1)
+
61  struct IPHeader
+
62  {
+
63  unsigned int h_len:4;
+
64  unsigned int version:4;
+
65  uint8_t tos;
+
66  uint16_t total_len;
+
67  uint16_t id;
+
68  uint16_t flags;
+
69  uint8_t ttl;
+
70  uint8_t proto;
+
71  uint16_t chk;
+
72  uint32_t source_ip;
+
73  uint32_t dest_ip;
+
74  };
+
75 
+
76  struct ICMPHeader
+
77  {
+
78  uint8_t type;
+
79  uint8_t code;
+
80  uint16_t chk;
+
81  uint16_t id;
+
82  uint16_t seq;
+
83  uint32_t time;
+
84  };
+
85 #pragma pack()
+
86 
+
87  enum ICMPReply
+
88  {
+
89  ICMP_ECHO_REPLY = 0,
+
90  ICMP_DEST_UNREACHABLE = 3,
+
91  ICMP_ECHO_REQUEST = 8
+
92  ICMP_TTL_EXPIRE = 11,
+
93  };
+
94 
+
95  enum class ICMPPacket
+
96  {
+
97  PACKET_SIZE = 8,
+
98  DEFAULT_SIZE = 32,
+
99  MAX_DATA_SIZE = 1024,
+
100  MAX_PACKET_SIZE = MAX_DATA_SIZE + sizeof(IPHeader);
+
101  };
+
102 #endif // _WIN32
+
103 
+
104  typedef
+
105 #ifdef _WIN32
+
106  SOCKET
+
107 #else
+
108  unsigned int
+
109 #endif // _WIN32
+
110  socket_t;
+
111 
+
112  enum class SocketType { TCP, UDP, RAW };
+
113 
+
115  class ZEN_API zSocket
+
116  {
+
117  public:
+
118  zSocket(const SocketType& Type) :
+
119  m_Log(util::zLog::GetEngineLog()),
+
120  m_Type(Type), m_socket(INVALID_SOCKET) {}
+
121 
+
122  virtual ~zSocket() { this->Destroy(); }
+
123 
+
124  static bool InitializeLibrary();
+
125 
+
126  bool Init(const string_t& host, const string_t& port);
+
127  bool Destroy();
+
128 
+
143  string_t RecvFrom(const size_t size, string_t& address, string_t& port);
+
144 
+
160  int SendTo(const string_t& addr, const string_t& port,
+
161  const string_t& data);
+
162 
+
163  int SendBroadcast(const string_t& message, const string_t& port = "");
+
164 
+
165  bool Ping();
+
166  bool SetSocketOption(const int type, const int option, const bool flag);
+
167 
+
179  bool SetNonblocking(const bool flag);
+
180 
+
191  int GetError() const;
+
192 
+
193  private:
+
194  static string_t GetAddress(sockaddr_in& addr);
+
195  static in_addr GetAddress(const string_t& ip);
+
196 
+
197  static bool s_init;
+
198  util::zLog& m_Log;
+
199  SocketType m_Type;
+
200  socket_t m_socket;
+
201  };
+
202 }
+
203 }
+
204 
+
205 #endif // ZENDERER__NETWORK__SOCKET_HPP
+
206 
diff --git a/docs/_sockets-example.html b/docs/_sockets-example.html index d06bbbcb..53b14849 100644 --- a/docs/_sockets-example.html +++ b/docs/_sockets-example.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_sorter_8cpp.html b/docs/_sorter_8cpp.html index e0028eb2..4aa5aed6 100644 --- a/docs/_sorter_8cpp.html +++ b/docs/_sorter_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_sorter_8cpp__incl.map b/docs/_sorter_8cpp__incl.map index 30ad3f94..79d816fb 100644 --- a/docs/_sorter_8cpp__incl.map +++ b/docs/_sorter_8cpp__incl.map @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_sorter_8cpp__incl.png b/docs/_sorter_8cpp__incl.png index e0befbe0..d93eec14 100644 Binary files a/docs/_sorter_8cpp__incl.png and b/docs/_sorter_8cpp__incl.png differ diff --git a/docs/_sorter_8cpp_source.html b/docs/_sorter_8cpp_source.html index b229b6cd..e7c7d73e 100644 --- a/docs/_sorter_8cpp_source.html +++ b/docs/_sorter_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_sorter_8hpp.html b/docs/_sorter_8hpp.html index 1c094034..9d09d8f6 100644 --- a/docs/_sorter_8hpp.html +++ b/docs/_sorter_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -123,14 +123,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_sorter_8hpp__dep__incl.map b/docs/_sorter_8hpp__dep__incl.map index 6629dc82..de49b083 100644 --- a/docs/_sorter_8hpp__dep__incl.map +++ b/docs/_sorter_8hpp__dep__incl.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/_sorter_8hpp__dep__incl.png b/docs/_sorter_8hpp__dep__incl.png index 7277bc42..48ba160f 100644 Binary files a/docs/_sorter_8hpp__dep__incl.png and b/docs/_sorter_8hpp__dep__incl.png differ diff --git a/docs/_sorter_8hpp__incl.map b/docs/_sorter_8hpp__incl.map index 26bc2538..7f7baf53 100644 --- a/docs/_sorter_8hpp__incl.map +++ b/docs/_sorter_8hpp__incl.map @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_sorter_8hpp__incl.png b/docs/_sorter_8hpp__incl.png index 698a47ec..d71cf239 100644 Binary files a/docs/_sorter_8hpp__incl.png and b/docs/_sorter_8hpp__incl.png differ diff --git a/docs/_sorter_8hpp_source.html b/docs/_sorter_8hpp_source.html index 765028ec..23206bf6 100644 --- a/docs/_sorter_8hpp_source.html +++ b/docs/_sorter_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_sound2_d_8cpp.html b/docs/_sound2_d_8cpp.html index d68e5ea1..987e3da7 100644 --- a/docs/_sound2_d_8cpp.html +++ b/docs/_sound2_d_8cpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_sound2_d_8cpp_source.html b/docs/_sound2_d_8cpp_source.html index 368d9c12..def761e0 100644 --- a/docs/_sound2_d_8cpp_source.html +++ b/docs/_sound2_d_8cpp_source.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_sound2_d_8hpp.html b/docs/_sound2_d_8hpp.html index c669df36..8eac9964 100644 --- a/docs/_sound2_d_8hpp.html +++ b/docs/_sound2_d_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,7 +129,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_sound2_d_8hpp__dep__incl.map b/docs/_sound2_d_8hpp__dep__incl.map index 62ecbc5f..50000f04 100644 --- a/docs/_sound2_d_8hpp__dep__incl.map +++ b/docs/_sound2_d_8hpp__dep__incl.map @@ -1,8 +1,9 @@ - - + + - - + + + diff --git a/docs/_sound2_d_8hpp__dep__incl.png b/docs/_sound2_d_8hpp__dep__incl.png index 1bedd6c0..a7a450cc 100644 Binary files a/docs/_sound2_d_8hpp__dep__incl.png and b/docs/_sound2_d_8hpp__dep__incl.png differ diff --git a/docs/_sound2_d_8hpp_source.html b/docs/_sound2_d_8hpp_source.html index 9bdd4523..9d9b7064 100644 --- a/docs/_sound2_d_8hpp_source.html +++ b/docs/_sound2_d_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_string_8hpp.html b/docs/_string_8hpp.html deleted file mode 100644 index bf9de867..00000000 --- a/docs/_string_8hpp.html +++ /dev/null @@ -1,373 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Core/String.hpp File Reference - - - - - - - - - - - - - -
-
-
Data Fields
diff --git a/docs/_socket_8hpp.js b/docs/_socket_8hpp.js index 4c15ebc8..f0c6b279 100644 --- a/docs/_socket_8hpp.js +++ b/docs/_socket_8hpp.js @@ -21,6 +21,7 @@ var _socket_8hpp = [ "seq", "namespacezen_1_1net.html#affedb683eefdc0c6b52311d6b6717f94", null ], [ "time", "namespacezen_1_1net.html#a9b65aa8dff3f8ac633a4fe2f9f40c16f", null ] ] ], + [ "socket_t", "_socket_8hpp.html#a911b6c81a3eca360b97dac64e3ee7fb9", null ], [ "ICMPReply", "_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18", [ [ "ICMP_ECHO_REPLY", "_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18a5e4e888312c06d9457e6f40e9692453a", null ], [ "ICMP_DEST_UNREACHABLE", "_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18af1a3fd0f7869e515dd2903e3d528a73e", null ], diff --git a/docs/_socket_8hpp__dep__incl.map b/docs/_socket_8hpp__dep__incl.map index c4879238..d2fa0ee3 100644 --- a/docs/_socket_8hpp__dep__incl.map +++ b/docs/_socket_8hpp__dep__incl.map @@ -1,8 +1,9 @@ - - + + - - + + + diff --git a/docs/_socket_8hpp__dep__incl.png b/docs/_socket_8hpp__dep__incl.png index df508514..852175bb 100644 Binary files a/docs/_socket_8hpp__dep__incl.png and b/docs/_socket_8hpp__dep__incl.png differ diff --git a/docs/_socket_8hpp_source.html b/docs/_socket_8hpp_source.html index 7fe544bb..d900c006 100644 --- a/docs/_socket_8hpp_source.html +++ b/docs/_socket_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
- - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - - -
- -
-
-
- -
- - - - -
- -
- -
-
-Data Structures | -Macros | -Typedefs | -Functions | -Variables
-
-
String.hpp File Reference
-
-
-
#include <cstdlib>
-#include <cstring>
-#include <cassert>
-#include <string>
-#include <iostream>
-#include <sys/timeb.h>
-
-Include dependency graph for String.hpp:
-
-
- - -
-
-

Go to the source code of this file.

- - - - -

-Data Structures

class  CString
 
- - - -

-Macros

#define TIME_IT(name, expr)
 
- - - - - -

-Typedefs

typedef unsigned long long uint64_t
 
typedef CString string_t
 
- - - - - - - - - -

-Functions

uint32_t mangle (const char *const str)
 
uint8_t unmangle (char *buffer, uint32_t mangled)
 
uint64_t now ()
 
int main ()
 
- - - -

-Variables

static const uint8_t SSO_SIZE = 11
 
-

Macro Definition Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
#define TIME_IT( name,
 expr 
)
-
-Value:
std::cout << name << "... "; \
-
start = now(); \
-
for(size_t i = 0; i < BIG; ++i) \
-
{ \
-
expr; \
-
} \
-
std::cout << now() - start << "ms.\n";
-
-

Definition at line 10 of file String.hpp.

- -
-
-

Typedef Documentation

- -
-
- - - - -
typedef unsigned long long uint64_t
-
- -

Definition at line 400 of file String.hpp.

- -
-
- -
-
- - - - -
typedef CString string_t
-
- -

Definition at line 401 of file String.hpp.

- -
-
-

Function Documentation

- -
-
- - - - - -
- - - - - - - - -
uint32_t mangle (const char *const str)
- 		-inline
-
- -

Definition at line 21 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
uint8_t unmangle (char * buffer,
uint32_t mangled 
)
- 		-inline
-
- -

Definition at line 30 of file String.hpp.

- -
-
- -
-
- - - - - - - -
uint64_t now ()
-
- -

Definition at line 403 of file String.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
int main ()
-
- -

Definition at line 410 of file String.hpp.

- -
-
-

Variable Documentation

- -
-
- - - - - -
- - - - -
const uint8_t SSO_SIZE = 11
- 		-static
-
- -

Definition at line 19 of file String.hpp.

- -
-
-
-
- - - - diff --git a/docs/_string_8hpp.js b/docs/_string_8hpp.js deleted file mode 100644 index 0eff9f9f..00000000 --- a/docs/_string_8hpp.js +++ /dev/null @@ -1,12 +0,0 @@ -var _string_8hpp = -[ - [ "CString", "class_c_string.html", "class_c_string" ], - [ "TIME_IT", "_string_8hpp.html#af1d7120321614d4f728ceb227fcdb1ec", null ], - [ "uint64_t", "_string_8hpp.html#aaa5d1cd013383c889537491c3cfd9aad", null ], - [ "string_t", "_string_8hpp.html#a6a53ed918f712e7f9ce6ba4b0c9980a4", null ], - [ "mangle", "_string_8hpp.html#ab69ae5283e0162ebe344e15991369a18", null ], - [ "unmangle", "_string_8hpp.html#ae7fac23c915247a7d520a53b23fc7ef6", null ], - [ "now", "_string_8hpp.html#aebfbbb47ed51d343390f31b52fb4984f", null ], - [ "main", "_string_8hpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4", null ], - [ "SSO_SIZE", "_string_8hpp.html#ae65620b309a2337a2ded9572139cc584", null ] -]; \ No newline at end of file diff --git a/docs/_string_8hpp__incl.map b/docs/_string_8hpp__incl.map deleted file mode 100644 index c3900cd6..00000000 --- a/docs/_string_8hpp__incl.map +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/docs/_string_8hpp__incl.png b/docs/_string_8hpp__incl.png deleted file mode 100644 index 932a78d0..00000000 Binary files a/docs/_string_8hpp__incl.png and /dev/null differ diff --git a/docs/_string_8hpp_aebfbbb47ed51d343390f31b52fb4984f_icgraph.map b/docs/_string_8hpp_aebfbbb47ed51d343390f31b52fb4984f_icgraph.map deleted file mode 100644 index 4f8eb721..00000000 --- a/docs/_string_8hpp_aebfbbb47ed51d343390f31b52fb4984f_icgraph.map +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/docs/_string_8hpp_aebfbbb47ed51d343390f31b52fb4984f_icgraph.png b/docs/_string_8hpp_aebfbbb47ed51d343390f31b52fb4984f_icgraph.png deleted file mode 100644 index 5617f25c..00000000 Binary files a/docs/_string_8hpp_aebfbbb47ed51d343390f31b52fb4984f_icgraph.png and /dev/null differ diff --git a/docs/_string_8hpp_source.html b/docs/_string_8hpp_source.html deleted file mode 100644 index 03b4dd97..00000000 --- a/docs/_string_8hpp_source.html +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Core/String.hpp Source File - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
String.hpp
-
-
-Go to the documentation of this file.
1 #include <cstdlib>
-
2 #include <cstring>
-
3 #include <cassert>
-
4 
-
5 #include <string>
-
6 #include <iostream>
-
7 
-
8 #include <sys/timeb.h>
-
9 
-
10 #define TIME_IT(name, expr) \
-
11  std::cout << name << "... "; \
-
12  start = now(); \
-
13  for(size_t i = 0; i < BIG; ++i) \
-
14  { \
-
15  expr; \
-
16  } \
-
17  std::cout << now() - start << "ms.\n";
-
18 
-
19 static const uint8_t SSO_SIZE = 11;
-
20 
-
21 inline uint32_t mangle(const char* const str)
-
22 {
-
23  uint8_t l = strnlen(str, 4);
-
24  uint32_t m = 0;
-
25  for(uint8_t i = 1; i <= l; ++i)
-
26  m |= str[i-1] << (32 - 8 * i);
-
27  return m;
-
28 }
-
29 
-
30 inline uint8_t unmangle(char* buffer, uint32_t mangled)
-
31 {
-
32  uint8_t i = 0;
-
33  for( ; i <= 4; ++i)
-
34  {
-
35  uint8_t x = 32 - 8 * (i - 1);
-
36  char c = (mangled & (0xFF << x)) >> x;
-
37  if(c == '\0') break;
-
38  buffer[i] = c;
-
39  }
-
40 
-
41  return i;
-
42 }
-
43 
-
44 class CString
-
45 {
-
46 public:
-
47  CString() :
-
48  m_SSO(), m_string(nullptr), m_start(nullptr), m_end(nullptr),
-
49  m_sso_len(0), m_size(0), m_length(0) {}
-
50 
-
51  CString(const char* string) :
-
52  m_SSO(), m_string(nullptr), m_start(nullptr), m_end(nullptr),
-
53  m_sso_len(0), m_size(0), m_length(0)
-
54  {
-
55  // Calculate length and copy to SSO buffer, if possible.
-
56  // If we exceed the size, leave junk in buffer, but indicate
-
57  // that it's free, and continue.
-
58  size_t len = 0;
-
59  for( ; string[len] != '\0'; ++len)
-
60  {
-
61  if(len < SSO_SIZE)
-
62  {
-
63  m_SSO[len] = string[len];
-
64  m_sso_len = len;
-
65  }
-
66  else
-
67  {
-
68  m_sso_len = 0;
-
69  break;
-
70  }
-
71  }
-
72 
-
73  // If the SSO was too small, we need to copy it to a heap buffer.
-
74  if(m_sso_len == 0)
-
75  {
-
76  // Finish getting the length;
-
77  for( ; string[len] != '\0'; ++len);
-
78 
-
79  m_length = len;
-
80  m_size = m_length + 10;
-
81  m_string = new char[m_size];
-
82  memcpy(m_string, string, m_length * sizeof(char));
-
83  m_start = m_string;
-
84  m_end = m_string + m_length;
-
85  }
-
86 
-
87  // We had enough space in the SSO, so set up the pointers accordingly.
-
88  else
-
89  {
-
90  m_start = m_SSO;
-
91  m_end = m_SSO + m_sso_len;
-
92  }
-
93 
-
94  *(m_start + len) = '\0';
-
95  }
-
96 
-
97  CString(const std::string& string) :
-
98  m_SSO(), m_string(nullptr), m_start(nullptr), m_end(nullptr),
-
99  m_sso_len(0), m_size(0), m_length(0)
-
100  {
-
101  // Largely identical to the char* version.
-
102 
-
103  size_t len = string.length();
-
104  if(len < SSO_SIZE)
-
105  {
-
106  for(uint8_t i = 0; i < len; ++i)
-
107  m_SSO[i] = string[i];
-
108  m_sso_len = len;
-
109  m_start = m_SSO;
-
110  m_end = m_SSO + len;
-
111  }
-
112  else
-
113  {
-
114  m_length = len;
-
115  m_size = m_length + 10;
-
116  m_string = new char[m_size];
-
117  memcpy(m_string, string.c_str(), m_length * sizeof(char));
-
118  m_start = m_string;
-
119  m_end = m_string + m_length;
-
120  }
-
121  }
-
122 
-
123  CString(const CString& Other) :
-
124  m_SSO(), m_string(nullptr), m_start(nullptr), m_end(nullptr),
-
125  m_sso_len(0), m_size(0), m_length(0)
-
126  {
-
127  if(Other.m_sso_len)
-
128  {
-
129  for(size_t i = 0; i < Other.m_sso_len; ++i)
-
130  m_SSO[i] = Other.m_SSO[i];
-
131  m_sso_len = Other.m_sso_len;
-
132  }
-
133  else
-
134  {
-
135  m_length = Other.m_length;
-
136  m_size = m_length + 10;
-
137  m_string = new char[m_size];
-
138  memcpy(m_string, Other.m_string, m_length * sizeof(char));
-
139  m_start = m_string;
-
140  m_end = m_string + m_length;
-
141  }
-
142  }
-
143 
-
144  ~CString()
-
145  {
-
146  this->Clear();
-
147  }
-
148 
-
149  CString& operator=(const CString& Other) = delete;
-
150  CString& operator=(const std::string& Other);
-
151  CString& operator=(const char* string)
-
152  {
-
153  // Check to see if we are assigning to ourselves.
-
154  size_t len = 0;
-
155  if(m_start == nullptr) goto diff;
-
156  for( ; string[len] != '\0'; ++len)
-
157  {
-
158  if(m_start[len] != string[len])
-
159  {
-
160  goto diff;
-
161  }
-
162  }
-
163 
-
164  m_end = m_start + len;
-
165  return *this;
-
166 
-
167  diff:
-
168  size_t real_len = len;
-
169  for( ; string[real_len] != '\0'; ++real_len);
-
170 
-
171  // Fits in the SSO.
-
172  if(real_len < SSO_SIZE)
-
173  {
-
174  // We rely on "len" here because the previous loop
-
175  // left "len" at the index of the first incompatible
-
176  // character pointed to by "m_start".
-
177  // Thus, if we are using SSO, m_start points to the SSO
-
178  // buffer anyway, and we can start copying to the
-
179  // SSO directly after the "len" index, since all previous
-
180  // ones are already the same.
-
181  for( ; len < real_len; ++len)
-
182  {
-
183  m_SSO[len] = string[len];
-
184  }
-
185 
-
186  m_start = m_SSO;
-
187  m_end = m_SSO + len;
-
188  m_sso_len = len;
-
189  return *this;
-
190  }
-
191 
-
192  // No SSO, but no re-alloc needed.
-
193  else if(real_len < m_size)
-
194  {
-
195  for( ; len < real_len; ++len)
-
196  {
-
197  m_string[len] = string[len];
-
198  }
-
199 
-
200  m_start = m_string;
-
201  m_end = m_string + len;
-
202  m_sso_len = 0;
-
203  return *this;
-
204  }
-
205 
-
206  // We need to re-allocate completely.
-
207  delete[] m_string;
-
208  m_sso_len = 0;
-
209  m_length = real_len;
-
210  m_size = m_length + 10;
-
211  m_string = new char[m_size];
-
212  memcpy(m_string, string, m_length * sizeof(char));
-
213  m_start = m_string;
-
214  m_end = m_string + m_length;
-
215  return *this;
-
216  }
-
217 
-
218  CString& operator+=(const CString& Other)
-
219  {
-
220  return this->Append(Other);
-
221  }
-
222 
-
223  CString& Append(const CString& Other)
-
224  {
-
225  size_t ol = Other.GetLength(); // Other length
-
226  size_t ul = this->GetLength(); // Us length
-
227 
-
228  ul *= sizeof(char);
-
229  ol *= sizeof(char);
-
230 
-
231  if(ul + ol >= m_size || m_sso_len)
-
232  {
-
233  // Copy old contents to new, larger buffer.
-
234  char* tmp = new char[m_length + ol];
-
235  memcpy(tmp, m_start, ul);
-
236  delete[] m_string;
-
237 
-
238  // Copy new contents to end of new buffer, after
-
239  // old contents.
-
240  memcpy(tmp + ul, Other.m_start, ol);
-
241 
-
242  // Set up iterators.
-
243  m_start = m_string = tmp;
-
244  m_end = m_start + (ol + ul);
-
245  m_sso_len = 0;
-
246  }
-
247  else
-
248  {
-
249  memcpy(m_string + ul, Other.m_start, ol);
-
250  m_end = m_start + (ul + ol);
-
251  }
-
252 
-
253  return *this;
-
254  }
-
255 
-
256  void push_back(const char c)
-
257  {
-
258  if(m_sso_len)
-
259  {
-
260  if(m_sso_len < SSO_SIZE - 1)
-
261  m_SSO[m_sso_len++] = c;
-
262  else
-
263  {
-
264  m_length = m_sso_len + 1;
-
265  m_size = m_length + 10;
-
266  m_string = new char[m_size];
-
267  memcpy(m_string, m_SSO, m_sso_len * sizeof(char));
-
268  m_string[m_sso_len] = c;
-
269  m_sso_len = 0;
-
270  m_start = m_string;
-
271  m_end = m_start + m_length;
-
272  }
-
273  }
-
274  else if(m_length < m_size)
-
275  {
-
276  m_string[m_length++] = c;
-
277  }
-
278  else
-
279  {
-
280  m_size += 10;
-
281  char* tmp = new char[m_size];
-
282  memcpy(tmp, m_string, m_length * sizeof(char));
-
283  delete[] m_string;
-
284  tmp[m_length++] = c;
-
285  m_start = m_string = tmp;
-
286  m_end = m_string + m_length * sizeof(char);
-
287  }
-
288  }
-
289 
-
290  char operator[](const size_t index) const
-
291  {
-
292  return m_start[index];
-
293  }
-
294 
-
295  operator std::string() const { return std::string(m_start, m_end); }
-
296  operator char*() const { return m_start; }
-
297 
-
298  char* begin() { return m_start; }
-
299  char* end() { return m_end; }
-
300  char front() const { return *m_start; }
-
301  char back() const { return *m_end; }
-
302 
-
303  const char* c_str() const
-
304  {
-
305  if(m_start == nullptr) return "";
-
306  *(m_end) = '\0';
-
307  return m_start;
-
308  }
-
309 
-
310  void Resize(const size_t size)
-
311  {
-
312  // If we are using the SSO buffer and the user
-
313  // wants to expand past it, we need to copy SSO
-
314  // contents to the heap buffer and use that instead.
-
315  if(size >= SSO_SIZE && m_sso_len)
-
316  {
-
317  if(m_size < size)
-
318  {
-
319  char* tmp = new char[m_size = size];
-
320  memcpy(tmp, m_SSO, m_sso_len * sizeof(char));
-
321  delete[] m_string;
-
322  m_string = tmp;
-
323  }
-
324  else
-
325  {
-
326  for(size_t i = 0; i < m_sso_len; ++i)
-
327  m_string[i] = m_SSO[i];
-
328  }
-
329 
-
330  m_sso_len = 0;
-
331  m_length = m_sso_len;
-
332  m_start = m_string;
-
333  m_end = m_string + m_length;
-
334  }
-
335 
-
336  m_end = m_start + size;
-
337  }
-
338 
-
339  void Reserve(const size_t size)
-
340  {
-
341  if(size < SSO_SIZE || m_size > size) return;
-
342 
-
343  m_size = size + 1;
-
344  char* contents = new char[m_size];
-
345  memcpy(contents, m_string, m_length * sizeof(char));
-
346  delete[] m_string;
-
347  m_string = contents;
-
348  if(!m_sso_len)
-
349  {
-
350  m_start = m_string;
-
351  m_end = m_start + m_length;
-
352  }
-
353  }
-
354 
-
355  void Clear()
-
356  {
-
357  m_length = m_sso_len = 0;
-
358  m_start = m_end = nullptr;
-
359  }
-
360 
-
361  void Shrink()
-
362  {
-
363  if(m_sso_len)
-
364  {
-
365  delete[] m_string;
-
366  m_string = nullptr;
-
367  }
-
368  else if(m_size != m_length)
-
369  {
-
370  char* tmp = new char[m_length + 1];
-
371  memcpy(tmp, m_string, m_length * sizeof(char));
-
372  delete[] m_string;
-
373  m_start = m_string = tmp;
-
374  m_end = m_start + m_length;
-
375  m_size = m_length;
-
376  }
-
377  }
-
378 
-
379  inline size_t GetLength() const
-
380  { return m_sso_len > 0 ? m_sso_len : m_length; }
-
381 
-
382  inline bool Empty() const
-
383  { return this->GetLength() == 0; }
-
384 
-
385  friend std::ostream& operator<<(std::ostream& o, const CString& str)
-
386  {
-
387  return o << str.c_str();
-
388  }
-
389 
-
390 private:
-
391  char m_SSO[SSO_SIZE];
-
392  char* m_string;
-
393  char* m_start;
-
394  char* m_end;
-
395 
-
396  uint8_t m_sso_len;
-
397  size_t m_size, m_length;
-
398 };
-
399 
-
400 typedef unsigned long long uint64_t;
-
401 typedef CString string_t;
-
402 
-
403 uint64_t now()
-
404 {
-
405  timeb t;
-
406  ftime(&t);
-
407  return t.millitm + t.time * 1000;
-
408 }
-
409 
-
410 int main()
-
411 {
-
412  static_assert(sizeof(char) == 1);
-
413  srand(time(nullptr));
-
414 
-
415  const unsigned int BIG = 4000000;
-
416  const char* STR1 = " this is a string ";
-
417  const char* STR2 = "abcdefghijklmnopqrstuvwxyz";
-
418  uint64_t start = 0;
-
419 
-
420  std::cout << "Starting std::string vs. zen::string_t comparison.\n";
-
421 
-
422  std::string tmp1(STR1), tmp4(STR2);
-
423  string_t tmp2(STR1), tmp3(STR2);
-
424 
-
425  TIME_IT("Me -- noop", string_t a());
-
426  TIME_IT("STL -- noop", std::string a());
-
427 
-
428  TIME_IT("Me -- ctor SSO", string_t a("short"));
-
429  TIME_IT("STL -- ctor SSO", std::string a("short"));
-
430  /*
-
431  TIME_IT("Me -- ctor", string_t a(STR1));
-
432  TIME_IT("STL -- ctor", std::string a(STR1));
-
433 
-
434  TIME_IT("Me -- STL ctor", string_t a(tmp1));
-
435  TIME_IT("STL -- STL ctor", std::string a(tmp1));
-
436 
-
437  TIME_IT("Me -- copy ctor", string_t a(tmp2));
-
438  TIME_IT("STL -- copy ctor", std::string a(tmp1));
-
439 
-
440  TIME_IT("Me -- op= same", tmp2 = STR1);
-
441  TIME_IT("STL -- op= same", tmp1 = STR1);
-
442 
-
443  TIME_IT("Me -- op[]", tmp2[rand() % tmp2.GetLength() - 1]);
-
444  TIME_IT("STL -- op[]", tmp1[rand() % tmp1.length() - 1]);
-
445 
-
446  TIME_IT("Me -- reserve", tmp2.Reserve(300); tmp2.Clear());
-
447  TIME_IT("STL -- reserve", tmp1.reserve(300); tmp1.clear());
-
448 
-
449  TIME_IT("Me -- iter", for(auto& i : tmp2) i = 'A';);
-
450  TIME_IT("STL -- iter", for(auto& i : tmp1) i = 'A';);
-
451 
-
452  TIME_IT("Me -- shrink", tmp2.Shrink());
-
453  TIME_IT("STL -- shrink", tmp1.shrink_to_fit());
-
454 
-
455  TIME_IT("Me -- op= diff", tmp2 = STR2; tmp2 = STR1);
-
456  TIME_IT("STL -- op= diff", tmp1 = STR2; tmp1 = STR1);
-
457 
-
458  TIME_IT("Me -- size", tmp2.GetLength());
-
459  TIME_IT("STL -- size", tmp1.length());
-
460 
-
461  printf("Adding '%s' to '%s'.\n", tmp3.c_str(), tmp2.c_str());
-
462  TIME_IT("Me -- op+=", tmp2 += tmp3; tmp2.Clear(); tmp2.Shrink());
-
463  TIME_IT("STL -- op+=", tmp1 += tmp4; tmp1.clear(); tmp1.shrink_to_fit());
-
464  */
-
465 
-
466  tmp2 = STR1; tmp2 += tmp3;
-
467  tmp1 = STR1; tmp1 += tmp4;
-
468 
-
469  TIME_IT("Me -- push", tmp2.push_back('A'); if(i % 100 == 0) tmp2.Clear());
-
470  TIME_IT("STL -- push", tmp1.push_back('A'); if(i % 100 == 0) tmp1.clear());
-
471 
-
472  printf("'%s' =?= '%s'\n", tmp1.c_str(), tmp2.c_str());
-
473  std::cout << "sizeof(std::string) == " << sizeof(std::string) << std::endl
-
474  << "sizeof(string_t) == " << sizeof(string_t) << std::endl;
-
475  return 0;
-
476 }
-
-
- - - - diff --git a/docs/_subsystem-example.html b/docs/_subsystem-example.html index d8d8ee8d..9926c0ba 100644 --- a/docs/_subsystem-example.html +++ b/docs/_subsystem-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_subsystem_8cpp.html b/docs/_subsystem_8cpp.html index 77166a04..782ee8f0 100644 --- a/docs/_subsystem_8cpp.html +++ b/docs/_subsystem_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,13 +109,14 @@
Subsystem.cpp File Reference
-
#include "Zenderer/Core/Subsystem.hpp"
+
#include <algorithm>
+#include "Zenderer/Core/Subsystem.hpp"
Include dependency graph for Subsystem.cpp:
- +

Go to the source code of this file.

diff --git a/docs/_subsystem_8cpp__incl.map b/docs/_subsystem_8cpp__incl.map index 608ee162..b5a42d18 100644 --- a/docs/_subsystem_8cpp__incl.map +++ b/docs/_subsystem_8cpp__incl.map @@ -1,7 +1,7 @@ - - - - - + + + + + diff --git a/docs/_subsystem_8cpp__incl.png b/docs/_subsystem_8cpp__incl.png index 743f61ae..3cc0dc4c 100644 Binary files a/docs/_subsystem_8cpp__incl.png and b/docs/_subsystem_8cpp__incl.png differ diff --git a/docs/_subsystem_8cpp_source.html b/docs/_subsystem_8cpp_source.html index e128fcc5..e3b0a224 100644 --- a/docs/_subsystem_8cpp_source.html +++ b/docs/_subsystem_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -109,34 +109,39 @@
Subsystem.cpp
-Go to the documentation of this file.
1 #include "Zenderer/Core/Subsystem.hpp"
-
2 
-
3 using namespace zen;
-
4 
-
5 using util::zLog;
-
6 using util::LogMode;
-
7 
-
8 std::vector<zSubsystem*> zSubsystem::sp_allSystems;
-
9 
-
10 zSubsystem::zSubsystem(const string_t name) :
-
11  m_Log(zLog::GetEngineLog()),
-
12  m_name(name), m_init(false)
-
13 {
-
14  m_Log << m_Log.SetMode(LogMode::ZEN_INFO) << m_Log.SetSystem(name)
-
15  << "Created component." << zLog::endl;
-
16 
-
17  sp_allSystems.push_back(this);
-
18 }
-
19 
-
20 zSubsystem::~zSubsystem()
-
21 {
-
22  // Use log since it's destroyed last.
-
23  m_Log << m_Log.SetMode(LogMode::ZEN_INFO)
-
24  << m_Log.SetSystem(this->GetName())
-
25  << "Destroyed component." << zLog::endl;
-
26 
-
27  m_init = false;
-
28 }
+Go to the documentation of this file.
1 #include <algorithm>
+
2 #include "Zenderer/Core/Subsystem.hpp"
+
3 
+
4 using namespace zen;
+
5 
+
6 using util::zLog;
+
7 using util::LogMode;
+
8 
+
9 std::vector<zSubsystem*> zSubsystem::sp_allSystems;
+
10 
+
11 zSubsystem::zSubsystem(const string_t name) :
+
12  m_Log(zLog::GetEngineLog()),
+
13  m_name(name), m_init(false)
+
14 {
+
15  m_Log << m_Log.SetMode(LogMode::ZEN_INFO) << m_Log.SetSystem(name)
+
16  << "Created component." << zLog::endl;
+
17 
+
18  sp_allSystems.push_back(this);
+
19 }
+
20 
+
21 zSubsystem::~zSubsystem()
+
22 {
+
23  // Use log since it's destroyed last.
+
24  m_Log << m_Log.SetMode(LogMode::ZEN_INFO)
+
25  << m_Log.SetSystem(this->GetName())
+
26  << "Destroyed component." << zLog::endl;
+
27 
+
28  m_init = false;
+
29 
+
30  sp_allSystems.erase(
+
31  std::find(sp_allSystems.begin(), sp_allSystems.end(), this)
+
32  );
+
33 }
diff --git a/docs/_subsystem_8hpp.html b/docs/_subsystem_8hpp.html index 0a9c7449..69e6f397 100644 --- a/docs/_subsystem_8hpp.html +++ b/docs/_subsystem_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -131,7 +131,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_subsystem_8hpp__dep__incl.map b/docs/_subsystem_8hpp__dep__incl.map index 6ac84991..fe7af34f 100644 --- a/docs/_subsystem_8hpp__dep__incl.map +++ b/docs/_subsystem_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_subsystem_8hpp__dep__incl.png b/docs/_subsystem_8hpp__dep__incl.png index d540c83a..33175e19 100644 Binary files a/docs/_subsystem_8hpp__dep__incl.png and b/docs/_subsystem_8hpp__dep__incl.png differ diff --git a/docs/_subsystem_8hpp_source.html b/docs/_subsystem_8hpp_source.html index 54285a1f..48f71d1a 100644 --- a/docs/_subsystem_8hpp_source.html +++ b/docs/_subsystem_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_texture_8cpp.html b/docs/_texture_8cpp.html index 52976e21..1baaf803 100644 --- a/docs/_texture_8cpp.html +++ b/docs/_texture_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_texture_8cpp__incl.map b/docs/_texture_8cpp__incl.map index 7d7a1ab4..dd8ce7e3 100644 --- a/docs/_texture_8cpp__incl.map +++ b/docs/_texture_8cpp__incl.map @@ -1,16 +1,19 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/docs/_texture_8cpp__incl.png b/docs/_texture_8cpp__incl.png index e86b8174..4c187b61 100644 Binary files a/docs/_texture_8cpp__incl.png and b/docs/_texture_8cpp__incl.png differ diff --git a/docs/_texture_8cpp_source.html b/docs/_texture_8cpp_source.html index aa04aad0..50cbda8f 100644 --- a/docs/_texture_8cpp_source.html +++ b/docs/_texture_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -145,12 +145,12 @@
34  if(comp != 4 && comp != 3)
35  {
36  m_error_str = "Invalid number of components. "
-
37  "Textures must be 24-bit (RGB) or 32-bit (RGBA) files.";
+
37  "Textures must be 24-bit (RGB) or 32-bit (RGBA) files.";
38 
39  m_Log << m_Log.SetMode(util::LogMode::ZEN_ERROR)
-
40  << m_Log.SetSystem("Texture") << m_error_str
-
41  << zLog::endl;
-
42 
+
40  << m_Log.SetSystem("Texture") << m_error_str << zLog::endl;
+
41 
+
42  stbi_image_free(raw);
43  return (m_loaded = false);
44  }
45 
@@ -158,147 +158,148 @@
47 
48  m_TextureID = s_ID++;
49 
-
50  ZEN_ASSERTM(s_ID < (1 << 10), "too many textures, material ID can't be unique");
-
51 
-
52  stbi_image_free(raw);
-
53  this->SetFilename(filename);
-
54  return (m_loaded = true);
-
55 }
-
56 
-
57 bool zTexture::LoadFromExisting(const zAsset* const pCopy)
-
58 {
-
59  if(pCopy == nullptr || !pCopy->IsLoaded() || this == pCopy) return false;
-
60  if(m_loaded) this->Destroy();
-
61 
-
62  const unsigned char* raw =
-
63  static_cast<const unsigned char*>(pCopy->GetData());
-
64 
-
65  const zTexture* const pCopyTexture =
-
66  static_cast<const zTexture* const>(pCopy);
-
67 
-
68  bool ret = this->LoadFromRaw(GL_RGBA8, GL_RGBA,
-
69  pCopyTexture->m_width, pCopyTexture->m_height, raw);
-
70 
-
71  // new[] occured in GetData() so we are responsible for cleanup.
-
72  delete[] raw;
-
73 
-
74  m_width = pCopyTexture->m_width;
-
75  m_height= pCopyTexture->m_height;
-
76  m_TextureID = pCopyTexture->m_TextureID;
-
77  this->SetFilename(pCopyTexture->GetFilename());
-
78 
-
79  return (m_loaded = ret);
-
80 }
-
81 
-
82 bool zTexture::LoadFromExisting(const GLuint handle)
-
83 {
-
84  GLint w, h;
-
85  GL(glBindTexture(GL_TEXTURE_2D, handle));
-
86  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w));
-
87  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h));
-
88  GL(glBindTexture(GL_TEXTURE_2D, 0));
-
89 
-
90  if(w <= 0 || h <= 0) return false;
-
91  m_width = w; m_height = h;
-
92  std::stringstream ss;
-
93  ss << "Texture handle " << handle;
-
94  this->SetFilename(ss.str());
-
95  return m_loaded = ((m_texture = handle) != 0);
-
96 }
-
97 
-
98 bool zTexture::CopyFromExisting(const GLuint handle)
-
99 {
-
100  if(handle == 0) return false;
-
101 
-
102  GLint w, h;
-
103  GL(glBindTexture(GL_TEXTURE_2D, handle));
-
104  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w));
-
105  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h));
-
106 
-
107  unsigned char* raw = new unsigned char[w * h * 4];
-
108 
-
109  GL(glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, raw));
-
110  GL(glBindTexture(GL_TEXTURE_2D, 0));
-
111 
-
112  return this->LoadFromRaw(GL_RGBA8, GL_RGBA, w, h, raw);
-
113 }
-
114 
-
115 bool zTexture::LoadFromRaw(const GLenum iformat, const GLenum format,
-
116  const uint16_t w, const uint16_t h,
-
117  const unsigned char* data)
-
118 {
-
119  if(m_loaded) this->Destroy();
-
120 
-
121  GL(glGenTextures(1, &m_texture));
-
122  GL(glBindTexture(GL_TEXTURE_2D, m_texture));
-
123 
-
124  GL(glTexImage2D(GL_TEXTURE_2D, 0, iformat, w, h, 0, format,
-
125  GL_UNSIGNED_BYTE, data));
-
126 
-
127  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
-
128  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
-
129  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT));
-
130  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT));
-
131 
-
132  GL(glBindTexture(GL_TEXTURE_2D, 0));
-
133 
-
134  m_width = w;
-
135  m_height = h;
-
136 
-
137  std::stringstream ss;
-
138  ss << "Raw texture data " << ((void*)data);
-
139  this->SetFilename(ss.str());
-
140 
-
141  return (m_loaded = true);
-
142 }
-
143 
-
144 const void* const zTexture::GetData() const
-
145 {
-
146  this->Bind();
-
147 
-
148  // Size is width * height * bits per component
-
149  // Since we force RBGA format, use 4.
-
150  unsigned char* raw = new unsigned char[m_width * m_height * 4];
-
151 
-
152  GL(glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, raw));
-
153  return static_cast<const void* const>(raw);
-
154 }
-
155 
-
156 bool zTexture::Bind() const
-
157 {
-
158  if(!m_loaded) return false;
-
159  GL(glBindTexture(GL_TEXTURE_2D, m_texture));
-
160  return true;
-
161 }
-
162 
-
163 bool zTexture::Unbind() const
-
164 {
-
165  if(!m_loaded) return false;
-
166  GL(glBindTexture(GL_TEXTURE_2D, 0));
-
167  return true;
-
168 }
-
169 
-
170 zTexture& zTexture::GetDefaultTexture()
-
171 {
-
172  if(s_DefaultTexture.IsLoaded()) return s_DefaultTexture;
-
173 
-
174  // Load the default texture (1x1 white pixel).
-
175  static const unsigned char white[] = {'\xff', '\xff', '\xff', '\xff'};
-
176  s_DefaultTexture.LoadFromRaw(GL_RGBA8, GL_RGBA, 1, 1, white);
-
177  s_DefaultTexture.SetFilename("Zenderer white texture");
-
178  return s_DefaultTexture;
-
179 }
-
180 
-
181 bool zTexture::Destroy()
-
182 {
-
183  if(m_loaded)
-
184  {
-
185  glDeleteTextures(1, &m_texture);
-
186  m_width = m_height = m_texture = 0;
-
187  }
-
188 
-
189  return !(m_loaded = false);
-
190 }
+
50  ZEN_ASSERTM(s_ID < (1 << 10),
+
51  "too many textures, material ID can't be unique");
+
52 
+
53  stbi_image_free(raw);
+
54  this->SetFilename(filename);
+
55  return ret && (m_loaded = true);
+
56 }
+
57 
+
58 bool zTexture::LoadFromExisting(const zAsset* const pCopy)
+
59 {
+
60  if(pCopy == nullptr || !pCopy->IsLoaded() || this == pCopy) return false;
+
61  if(m_loaded) this->Destroy();
+
62 
+
63  const unsigned char* raw =
+
64  static_cast<const unsigned char*>(pCopy->GetData());
+
65 
+
66  const zTexture* const pCopyTexture =
+
67  static_cast<const zTexture* const>(pCopy);
+
68 
+
69  bool ret = this->LoadFromRaw(GL_RGBA8, GL_RGBA,
+
70  pCopyTexture->m_width, pCopyTexture->m_height, raw);
+
71 
+
72  // new[] occured in GetData() so we are responsible for cleanup.
+
73  delete[] raw;
+
74 
+
75  m_width = pCopyTexture->m_width;
+
76  m_height= pCopyTexture->m_height;
+
77  m_TextureID = pCopyTexture->m_TextureID;
+
78  this->SetFilename(pCopyTexture->GetFilename());
+
79 
+
80  return (m_loaded = ret);
+
81 }
+
82 
+
83 bool zTexture::LoadFromExisting(const GLuint handle)
+
84 {
+
85  GLint w, h;
+
86  GL(glBindTexture(GL_TEXTURE_2D, handle));
+
87  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w));
+
88  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h));
+
89  GL(glBindTexture(GL_TEXTURE_2D, 0));
+
90 
+
91  if(w <= 0 || h <= 0) return false;
+
92  m_width = w; m_height = h;
+
93  std::stringstream ss;
+
94  ss << "Texture handle " << handle;
+
95  this->SetFilename(ss.str());
+
96  return m_loaded = ((m_texture = handle) != 0);
+
97 }
+
98 
+
99 bool zTexture::CopyFromExisting(const GLuint handle)
+
100 {
+
101  if(handle == 0) return false;
+
102 
+
103  GLint w, h;
+
104  GL(glBindTexture(GL_TEXTURE_2D, handle));
+
105  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w));
+
106  GL(glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h));
+
107 
+
108  unsigned char* raw = new unsigned char[w * h * 4];
+
109 
+
110  GL(glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, raw));
+
111  GL(glBindTexture(GL_TEXTURE_2D, 0));
+
112 
+
113  return this->LoadFromRaw(GL_RGBA8, GL_RGBA, w, h, raw);
+
114 }
+
115 
+
116 bool zTexture::LoadFromRaw(const GLenum iformat, const GLenum format,
+
117  const uint16_t w, const uint16_t h,
+
118  const unsigned char* data)
+
119 {
+
120  if(m_loaded) this->Destroy();
+
121 
+
122  GL(glGenTextures(1, &m_texture));
+
123  GL(glBindTexture(GL_TEXTURE_2D, m_texture));
+
124 
+
125  GL(glTexImage2D(GL_TEXTURE_2D, 0, iformat, w, h, 0, format,
+
126  GL_UNSIGNED_BYTE, data));
+
127 
+
128  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
+
129  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
+
130  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT));
+
131  GL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT));
+
132 
+
133  GL(glBindTexture(GL_TEXTURE_2D, 0));
+
134 
+
135  m_width = w;
+
136  m_height = h;
+
137 
+
138  std::stringstream ss;
+
139  ss << "Raw texture data " << ((void*)data);
+
140  this->SetFilename(ss.str());
+
141 
+
142  return (m_loaded = true);
+
143 }
+
144 
+
145 const void* const zTexture::GetData() const
+
146 {
+
147  this->Bind();
+
148 
+
149  // Size is width * height * bits per component
+
150  // Since we force RBGA format, use 4.
+
151  unsigned char* raw = new unsigned char[m_width * m_height * 4];
+
152 
+
153  GL(glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, raw));
+
154  return static_cast<const void* const>(raw);
+
155 }
+
156 
+
157 bool zTexture::Bind() const
+
158 {
+
159  if(!m_loaded) return false;
+
160  GL(glBindTexture(GL_TEXTURE_2D, m_texture));
+
161  return true;
+
162 }
+
163 
+
164 bool zTexture::Unbind() const
+
165 {
+
166  if(!m_loaded) return false;
+
167  GL(glBindTexture(GL_TEXTURE_2D, 0));
+
168  return true;
+
169 }
+
170 
+
171 zTexture& zTexture::GetDefaultTexture()
+
172 {
+
173  if(s_DefaultTexture.IsLoaded()) return s_DefaultTexture;
+
174 
+
175  // Load the default texture (1x1 white pixel).
+
176  static const unsigned char white[] = {'\xff', '\xff', '\xff', '\xff'};
+
177  s_DefaultTexture.LoadFromRaw(GL_RGBA8, GL_RGBA, 1, 1, white);
+
178  s_DefaultTexture.SetFilename("Zenderer white texture");
+
179  return s_DefaultTexture;
+
180 }
+
181 
+
182 bool zTexture::Destroy()
+
183 {
+
184  if(m_loaded)
+
185  {
+
186  glDeleteTextures(1, &m_texture);
+
187  m_width = m_height = m_texture = 0;
+
188  }
+
189 
+
190  return !(m_loaded = false);
+
191 }
diff --git a/docs/_texture_8hpp.html b/docs/_texture_8hpp.html index c1e1f514..c1564630 100644 --- a/docs/_texture_8hpp.html +++ b/docs/_texture_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -119,6 +119,7 @@ More...

#include <sstream>
#include "stb_image.h"
+#include "Zenderer/Assets/AssetManager.hpp"
#include "Zenderer/Assets/Asset.hpp"
#include "Zenderer/Utilities/Log.hpp"
#include "OpenGL.hpp"
@@ -127,14 +128,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_texture_8hpp__dep__incl.map b/docs/_texture_8hpp__dep__incl.map index c239ed54..530bc79d 100644 --- a/docs/_texture_8hpp__dep__incl.map +++ b/docs/_texture_8hpp__dep__incl.map @@ -1,43 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_texture_8hpp__dep__incl.png b/docs/_texture_8hpp__dep__incl.png index 68faae9d..178bff7a 100644 Binary files a/docs/_texture_8hpp__dep__incl.png and b/docs/_texture_8hpp__dep__incl.png differ diff --git a/docs/_texture_8hpp__incl.map b/docs/_texture_8hpp__incl.map index 3361d879..7705f3a3 100644 --- a/docs/_texture_8hpp__incl.map +++ b/docs/_texture_8hpp__incl.map @@ -1,15 +1,18 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/_texture_8hpp__incl.png b/docs/_texture_8hpp__incl.png index a798f732..485a0b5c 100644 Binary files a/docs/_texture_8hpp__incl.png and b/docs/_texture_8hpp__incl.png differ diff --git a/docs/_texture_8hpp_source.html b/docs/_texture_8hpp_source.html index ac598f40..8ad78554 100644 --- a/docs/_texture_8hpp_source.html +++ b/docs/_texture_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -117,59 +117,60 @@
27 
28 #include "stb_image.h"
29 
-
30 #include "Zenderer/Assets/Asset.hpp"
-
31 #include "Zenderer/Utilities/Log.hpp"
-
32 #include "OpenGL.hpp"
-
33 
-
35 #define ZENDERER_TEXTURE_PATH "Zenderer/textures/"
-
36 
-
37 namespace zen
-
38 {
-
39 namespace gfxcore
-
40 {
-
42  class ZEN_API zTexture : public asset::zAsset
-
43  {
-
44  public:
-
45  ~zTexture();
-
46 
-
47  bool LoadFromFile(const string_t& filename);
-
48  bool LoadFromExisting(const zAsset* const pCopy);
-
49  bool LoadFromExisting(const GLuint handle);
-
50  bool CopyFromExisting(const GLuint handle);
-
51  bool LoadFromRaw(const GLenum iformat, const GLenum format,
-
52  const uint16_t w, const uint16_t h,
-
53  const unsigned char* data);
-
54 
-
55  const void* const GetData() const;
-
56 
-
57  bool Bind() const;
-
58  bool Unbind() const;
-
59 
-
60  uint16_t GetWidth() const { return m_width; }
-
61  uint16_t GetHeight() const { return m_height; }
-
62 
-
64  uint16_t GetID() const { return m_TextureID; }
-
65 
-
66  static zTexture& GetDefaultTexture();
-
67 
-
68  friend class ZEN_API asset::zAssetManager;
-
69 
-
70  private:
-
71  zTexture(const void* const owner = nullptr);
-
72  bool Destroy();
-
73 
-
74  static zTexture s_DefaultTexture;
-
75  static uint16_t s_ID;
-
76 
-
77  GLuint m_texture;
-
78  GLuint m_width, m_height;
-
79  uint16_t m_TextureID;
-
80  };
-
81 } // namespace gfxcore
-
82 } // namespace zen
-
83 
-
84 #endif // ZENDERER__CORE_GRAPHICS__TEXTURE_HPP
-
85 
+
30 #include "Zenderer/Assets/AssetManager.hpp"
+
31 #include "Zenderer/Assets/Asset.hpp"
+
32 #include "Zenderer/Utilities/Log.hpp"
+
33 #include "OpenGL.hpp"
+
34 
+
36 #define ZENDERER_TEXTURE_PATH "Zenderer/textures/"
+
37 
+
38 namespace zen
+
39 {
+
40 namespace gfxcore
+
41 {
+
43  class ZEN_API zTexture : public asset::zAsset
+
44  {
+
45  public:
+
46  ~zTexture();
+
47 
+
48  bool LoadFromFile(const string_t& filename);
+
49  bool LoadFromExisting(const zAsset* const pCopy);
+
50  bool LoadFromExisting(const GLuint handle);
+
51  bool CopyFromExisting(const GLuint handle);
+
52  bool LoadFromRaw(const GLenum iformat, const GLenum format,
+
53  const uint16_t w, const uint16_t h,
+
54  const unsigned char* data);
+
55 
+
56  const void* const GetData() const;
+
57 
+
58  bool Bind() const;
+
59  bool Unbind() const;
+
60 
+
61  uint16_t GetWidth() const { return m_width; }
+
62  uint16_t GetHeight() const { return m_height; }
+
63 
+
65  uint16_t GetID() const { return m_TextureID; }
+
66 
+
67  static zTexture& GetDefaultTexture();
+
68 
+
69  friend class ZEN_API asset::zAssetManager;
+
70 
+
71  private:
+
72  zTexture(const void* const owner = nullptr);
+
73  bool Destroy();
+
74 
+
75  static zTexture s_DefaultTexture;
+
76  static uint16_t s_ID;
+
77 
+
78  GLuint m_texture;
+
79  GLuint m_width, m_height;
+
80  uint16_t m_TextureID;
+
81  };
+
82 } // namespace gfxcore
+
83 } // namespace zen
+
84 
+
85 #endif // ZENDERER__CORE_GRAPHICS__TEXTURE_HPP
+
86 
diff --git a/docs/_timer_8cpp.html b/docs/_timer_8cpp.html index fe989288..d0b68758 100644 --- a/docs/_timer_8cpp.html +++ b/docs/_timer_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_timer_8cpp_source.html b/docs/_timer_8cpp_source.html index 9a3afa76..82d641f5 100644 --- a/docs/_timer_8cpp_source.html +++ b/docs/_timer_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -143,42 +143,54 @@
32 
34 void zTimer::Sleep(const util::time_t ticks)
35 {
-
36  std::this_thread::sleep_for(precision_t(ticks));
-
37 }
-
38 
-
39 util::time_t zTimer::Delay()
-
40 {
-
41  // Convert the time difference to milliseconds.
-
42  time_t ms = duration_cast<precision_t>(clock_t::now() - m_start).count();
-
43 
-
44  if(ms < m_delta)
-
45  {
-
46  precision_t pause(time_t(m_delta - ms));
-
47  std::this_thread::sleep_for(pause);
-
48 
-
49 #if defined(ZEN_SHOW_DELAY) && defined(ZEN_DEBUG_BUILD)
-
50  zLog& L = zLog::GetEngineLog();
-
51  L << L.SetMode(LogMode::ZEN_DEBUG) << L.SetSystem("Timer")
-
52  << "Delaying for " << pause.count() << "ms." << zLog::endl;
-
53 #endif // ZEN_SHOW_DELAY
-
54  }
-
55 
-
56  return ms;
-
57 }
-
58 
-
59 util::time_t zTimer::GetTime() const
-
60 {
-
61  return duration_cast<precision_t>(
-
62  clock_t::now().time_since_epoch()).count();
-
63 }
-
64 
-
65 void zTimer::SetFrameRate(const uint16_t fps)
-
66 {
-
67  m_fps = fps;
-
68 
-
69  // This relies on precision_t to be a millisecond.
-
70  m_delta = 1000.0 / m_fps;
-
71 }
+
36 #ifndef __GNUC__
+
37  std::this_thread::sleep_for(precision_t(ticks));
+
38 #else
+
39  precision_t ms(ticks);
+
40  uint64_t diff = 0;
+
41  timeb start, t;
+
42  ftime(&start);
+
43  do
+
44  {
+
45  ftime(&t);
+
46  diff = (t.time * 1000 + t.millitm) -
+
47  (start.time * 1000 + start.millitm);
+
48  } while(precision_t(diff) < ms);
+
49 #endif // __GNUC__
+
50 }
+
51 
+
52 util::time_t zTimer::Delay()
+
53 {
+
54  // Convert the time difference to milliseconds.
+
55  time_t ms = duration_cast<precision_t>(clock_t::now() - m_start).count();
+
56 
+
57  if(ms < m_delta)
+
58  {
+
59  this->Sleep(time_t(m_delta - ms));
+
60 
+
61 #if defined(ZEN_SHOW_DELAY) && defined(ZEN_DEBUG_BUILD)
+
62  zLog& L = zLog::GetEngineLog();
+
63  L << L.SetMode(LogMode::ZEN_DEBUG) << L.SetSystem("Timer")
+
64  << "Delaying for " << pause.count() << "ms." << zLog::endl;
+
65 #endif // ZEN_SHOW_DELAY
+
66  }
+
67 
+
68  return ms;
+
69 }
+
70 
+
71 util::time_t zTimer::GetTime() const
+
72 {
+
73  return duration_cast<precision_t>(
+
74  clock_t::now().time_since_epoch()).count();
+
75 }
+
76 
+
77 void zTimer::SetFrameRate(const uint16_t fps)
+
78 {
+
79  m_fps = fps;
+
80 
+
81  // This relies on precision_t to be a millisecond.
+
82  m_delta = 1000.0 / m_fps;
+
83 }
diff --git a/docs/_timer_8hpp.html b/docs/_timer_8hpp.html index e6b858fc..ec67bc83 100644 --- a/docs/_timer_8hpp.html +++ b/docs/_timer_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -133,7 +133,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_timer_8hpp__dep__incl.map b/docs/_timer_8hpp__dep__incl.map index 142167bd..6c769ca9 100644 --- a/docs/_timer_8hpp__dep__incl.map +++ b/docs/_timer_8hpp__dep__incl.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/_timer_8hpp__dep__incl.png b/docs/_timer_8hpp__dep__incl.png index 5518dfa5..95142e3e 100644 Binary files a/docs/_timer_8hpp__dep__incl.png and b/docs/_timer_8hpp__dep__incl.png differ diff --git a/docs/_timer_8hpp_source.html b/docs/_timer_8hpp_source.html index 732bb77f..9580bf7d 100644 --- a/docs/_timer_8hpp_source.html +++ b/docs/_timer_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -119,49 +119,54 @@
29 #include <thread>
30 #include <chrono>
31 
-
32 #include "Zenderer/Core/Types.hpp"
-
33 #include "Log.hpp"
-
34 
-
35 namespace zen
-
36 {
-
37 namespace util
-
38 {
-
39  typedef uint32_t time_t;
-
40 
-
42  class ZEN_API zTimer
-
43  {
-
44  public:
-
46  typedef std::chrono::high_resolution_clock clock_t;
-
47 
-
49  typedef clock_t::time_point timepoint_t;
-
50 
-
52  typedef std::chrono::milliseconds precision_t;
-
53 
-
55  zTimer(const uint16_t frames = 60);
-
56  virtual ~zTimer();
-
57 
-
58  virtual time_t Start();
-
59  virtual time_t Finish();
-
60  virtual time_t Elapsed();
-
61 
-
63  void Sleep(const time_t ticks);
-
64 
-
95  virtual time_t Delay();
-
96 
-
98  virtual time_t GetTime() const;
-
99 
-
101  void SetFrameRate(const uint16_t fps);
-
102 
-
103  private:
-
104  timepoint_t m_start, m_end;
-
105  uint16_t m_fps;
-
106  real_t m_delta;
-
107  };
-
108 }
-
109 }
-
110 
-
111 #endif // ZENDERER__UTILITIES__TIMER_HPP
-
112 
+
32 // GCC (or at least the MinGW port) doesn't supply "std::this_thread."
+
33 #ifdef __GNUC__
+
34  #include <sys/timeb.h>
+
35 #endif // __GNUC__
+
36 
+
37 #include "Zenderer/Core/Types.hpp"
+
38 #include "Log.hpp"
+
39 
+
40 namespace zen
+
41 {
+
42 namespace util
+
43 {
+
44  typedef uint32_t time_t;
+
45 
+
47  class ZEN_API zTimer
+
48  {
+
49  public:
+
51  typedef std::chrono::high_resolution_clock clock_t;
+
52 
+
54  typedef clock_t::time_point timepoint_t;
+
55 
+
57  typedef std::chrono::milliseconds precision_t;
+
58 
+
60  zTimer(const uint16_t frames = 60);
+
61  virtual ~zTimer();
+
62 
+
63  virtual time_t Start();
+
64  virtual time_t Finish();
+
65  virtual time_t Elapsed();
+
66 
+
68  void Sleep(const time_t ticks);
+
69 
+
100  virtual time_t Delay();
+
101 
+
103  virtual time_t GetTime() const;
+
104 
+
106  void SetFrameRate(const uint16_t fps);
+
107 
+
108  private:
+
109  timepoint_t m_start, m_end;
+
110  uint16_t m_fps;
+
111  real_t m_delta;
+
112  };
+
113 }
+
114 }
+
115 
+
116 #endif // ZENDERER__UTILITIES__TIMER_HPP
+
117 
diff --git a/docs/_triangle_8hpp.html b/docs/_triangle_8hpp.html deleted file mode 100644 index d5c6f565..00000000 --- a/docs/_triangle_8hpp.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Graphics/Triangle.hpp File Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Data Structures | -Namespaces | -Constant Groups
-
-
Triangle.hpp File Reference
-
-
- -

Zenderer/Graphics/Triangle.hpp - A drawable primitive with 3 vertices. -More...

-
#include <array>
-#include "Zenderer/Math/Shapes.hpp"
-#include "Zenderer/CoreGraphics/Drawable.hpp"
-
-Include dependency graph for Triangle.hpp:
-
-
- - -
-
-

Go to the source code of this file.

- - - - - -

-Data Structures

class  zen::gfx::CTriangleQuad
 A basic three-vertex primitive. More...
 
- - - - - - - -

-Namespaces

 zen
 An all-encompassing namespace for any and all components of Zenderer.
 
 zen::gfx
 Encompasses all user-level graphics APIs.
 
- - - - - - - -

-Constant Groups

 zen
 An all-encompassing namespace for any and all components of Zenderer.
 
 zen::gfx
 Encompasses all user-level graphics APIs.
 
-

Detailed Description

-
Author
George Kudrayvtsev (halcyon)
-
Version
1.0
-
Copyright
Apache License v2.0 Licensed under the Apache License, Version 2.0 (the "License").
- You may not use this file except in compliance with the License.
- You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -

Definition in file Triangle.hpp.

-
-
- - - - diff --git a/docs/_triangle_8hpp__incl.map b/docs/_triangle_8hpp__incl.map deleted file mode 100644 index 99e08c24..00000000 --- a/docs/_triangle_8hpp__incl.map +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/_triangle_8hpp__incl.png b/docs/_triangle_8hpp__incl.png deleted file mode 100644 index 5538a3cb..00000000 Binary files a/docs/_triangle_8hpp__incl.png and /dev/null differ diff --git a/docs/_triangle_8hpp_source.html b/docs/_triangle_8hpp_source.html deleted file mode 100644 index 5cf77d4d..00000000 --- a/docs/_triangle_8hpp_source.html +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Graphics/Triangle.hpp Source File - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
Triangle.hpp
-
-
-Go to the documentation of this file.
1 
-
22 #ifndef ZENDERER__GRAPHICS__TRIANGLE_HPP
-
23 #define ZENDERER__GRAPHICS__TRIANGLE_HPP
-
24 
-
25 #include <array>
-
26 
-
27 #include "Zenderer/Math/Shapes.hpp"
-
28 #include "Zenderer/CoreGraphics/Drawable.hpp"
-
29 
-
30 namespace zen
-
31 {
-
32 namespace gfx
-
33 {
-
35  class ZEN_API CTriangleQuad : public gfxcore::CDrawable
-
36  {
-
37  public:
-
38  CTriangle(asset::CAssetManager& Mgr,
-
39  const math::vector_t& A,
-
40  const math::vector_t& B,
-
41  const math::vector_t& C) :
-
42  CDrawable(Mgr) /*, m_Verts({ A, B, C })*/
-
43  {
-
44  m_Verts[0] = A;
-
45  m_Verts[1] = B;
-
46  m_Verts[2] = C;
-
47 
-
48  this->LoadSize();
-
49  }
-
50 
-
51  CTriangle(const CTriangle& Copy)
-
52  {
-
53  this->operator=(Copy);
-
54  }
-
55 
-
56  CTriangle& operator=(const CTriangle& Copy)
-
57  {
-
58  std::copy(Copy.m_Verts.begin(), Copy.m_Verts.end(), m_Verts.begin());
-
59  this->LoadSize();
-
60  return *this;
-
61  }
-
62 
-
63  ~CTriangle() {}
-
64 
-
65  virtual CDrawable& Create()
-
66  {
-
67  if(m_DrawData.Vertices == nullptr)
-
68  {
-
69  m_DrawData.Vertices = new gfxcore::vertex_t[3];
-
70  m_DrawData.vcount = 3;
-
71  }
-
72 
-
73  this->LoadVertexData();
-
74 
-
75  if(m_DrawData.Indices == nullptr)
-
76  {
-
77  m_DrawData.Indices = new gfxcore::index_t[3];
-
78  m_DrawData.icount = 3;
-
79  }
-
80 
-
81  m_DrawData.Indices[0] = 0;
-
82  m_DrawData.Indices[1] = 1;
-
83  m_DrawData.Indices[2] = 2;
-
84 
-
85  return (*this);
-
86  }
-
87 
-
88  inline uint16_t GetW() const { return m_Size.x; }
-
89  inline uint16_t GetH() const { return m_Size.y; }
-
90 
-
91  private:
-
92  void LoadVertexData()
-
93  {
-
94  for(uint8_t i = 0; i < m_DrawData.vcount; ++i)
-
95  {
-
96  m_DrawData.Vertices[i].position = m_Verts[i];
-
97  }
-
98  }
-
99 
-
100  void LoadSize()
-
101  {
-
102  // Find left-most vertex.
-
103  real_t l = math::min(math::min(m_Verts[0].x, m_Verts[1].x),
-
104  m_Verts[2].x);
-
105 
-
106  // Find right-most vertex.
-
107  real_t r = math::max(math::max(m_Verts[0].x, m_Verts[1].x),
-
108  m_Verts[2].x);
-
109 
-
110  // Find bottom-most vertex.
-
111  real_t b = math::min(math::min(m_Verts[0].y, m_Verts[1].y),
-
112  m_Verts[2].y);
-
113 
-
114  // Find top-most vertex.
-
115  real_t t = math::max(math::max(m_Verts[0].y, m_Verts[1].y),
-
116  m_Verts[2].y);
-
117 
-
118  m_Size.x = r - l;
-
119  m_Size.y = b - t;
-
120  }
-
121 
-
122  std::array<math::vector_t, 3> m_Verts;
-
123  math::Vector<uint16_t> m_Size;
-
124  };
-
125 } // namespace gfx
-
126 } // namespace zen
-
127 
-
128 #endif // ZENDERER__GRAPHICS__TRIANGLE_HPP
-
129 
-
-
- - - - diff --git a/docs/_types_8hpp.html b/docs/_types_8hpp.html index 8b9cf98d..d74c4fc7 100644 --- a/docs/_types_8hpp.html +++ b/docs/_types_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -133,7 +133,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_types_8hpp__dep__incl.map b/docs/_types_8hpp__dep__incl.map index 27eab6b1..90a54939 100644 --- a/docs/_types_8hpp__dep__incl.map +++ b/docs/_types_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_types_8hpp__dep__incl.png b/docs/_types_8hpp__dep__incl.png index 62bf3720..a547d0e8 100644 Binary files a/docs/_types_8hpp__dep__incl.png and b/docs/_types_8hpp__dep__incl.png differ diff --git a/docs/_types_8hpp_source.html b/docs/_types_8hpp_source.html index 60c054f6..3430c7a1 100644 --- a/docs/_types_8hpp_source.html +++ b/docs/_types_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -116,82 +116,113 @@
28 #include <cstdint>
29 #include <string>
30 
-
31 // Attempt to detect debug or release build.
-
32 #ifndef ZEN_DEBUG_BUILD
-
33  #if defined(_DEBUG) || defined(DEBUG)
-
34  #pragma message("Compiling in debug mode...")
-
35  #define ZEN_DEBUG_BUILD
-
36  #else
-
37  #pragma message("Compiling in release mode...")
-
38  #endif // defined(_DEBUG)
-
39 #endif // ZEN_DEBUG_BUILD
-
40 
-
42 #ifndef ZEN_DLL
-
43  #if defined(ZENDERER_EXPORTS) && defined(_WIN32)
-
44  #define ZEN_DLL 1
-
45  #else
-
46  #define ZEN_DLL 0
-
47  #endif // ZENDERER_EXPORTS
-
48 #endif // ZEN_DLL
-
49 
-
51 #if ZEN_DLL
-
52  #define ZEN_API __declspec(dllexport)
-
53 #else
-
54  #if defined(ZEN_DEBUG_BUILD) && !ZEN_DLL
-
55  #define ZEN_API
-
56  #elif ZEN_DLL
-
57  #define ZEN_API __declspec(dllimport)
-
58  #else
-
59  #define ZEN_API
-
60  #endif // ZEN_DEBUG_BUILD
-
61 #endif // ZENDERER_EXPORTS
-
62 
-
64 namespace zen
-
65 {
-
70  typedef
-
71 #ifdef ZEN_DOUBLE_PRECISION
-
72  double
-
73 #else
-
74  float
-
75 #endif // ZEN_DOUBLE_PRECISION
-
76  real_t;
-
77 
-
84  typedef std::string string_t;
-
85 
-
93  template<typename T>
-
94  ZEN_API void clamp(T& val, const T& minimum, const T& maximum)
-
95  {
-
96  if(val < minimum) val = minimum;
-
97  else if(val > maximum) val = maximum;
-
98  }
-
99 
-
104  struct ZEN_API color4f_t
-
105  {
-
106  real_t r,
-
107  g,
-
108  b,
-
109  a;
-
110 
-
111  color4f_t(const real_t r = 1.f,
-
112  const real_t g = 1.f,
-
113  const real_t b = 1.f,
-
114  const real_t a = 1.f) : r(r), g(g), b(b), a(a) {}
-
115  };
+
31 #ifdef __GNUC__
+
32 
+
33 // For whatever reason, even with -std=c++11,
+
34 // or -std=c++0x, or -std=gnu++11 enabled,
+
35 // these functions aren't found.
+
36 
+
37 #include <sstream>
+
38 #include <cstdlib>
+
39 
+
40 namespace std
+
41 {
+
42  template<typename T>
+
43  static inline std::string to_string(const T& t)
+
44  {
+
45  std::stringstream ss;
+
46  ss << t;
+
47  return ss.str();
+
48  }
+
49 
+
50  static inline int stoi(const std::string& s)
+
51  {
+
52  return std::atoi(s.c_str());
+
53  }
+
54 
+
55  static inline double stod(const std::string& s)
+
56  {
+
57  return std::atof(s.c_str());
+
58  }
+
59 }
+
60 #endif // __GNUC__
+
61 
+
62 // Attempt to detect debug or release build.
+
63 #ifndef ZEN_DEBUG_BUILD
+
64  #if defined(_DEBUG) || defined(DEBUG)
+
65  #pragma message("Compiling in debug mode...")
+
66  #define ZEN_DEBUG_BUILD
+
67  #else
+
68  #pragma message("Compiling in release mode...")
+
69  #endif // defined(_DEBUG)
+
70 #endif // ZEN_DEBUG_BUILD
+
71 
+
73 #ifndef ZEN_DLL
+
74  #if defined(ZENDERER_EXPORTS) && defined(_WIN32)
+
75  #define ZEN_DLL 1
+
76  #else
+
77  #define ZEN_DLL 0
+
78  #endif // ZENDERER_EXPORTS
+
79 #endif // ZEN_DLL
+
80 
+
82 #if ZEN_DLL
+
83  #define ZEN_API __declspec(dllexport)
+
84 #else
+
85  #if defined(ZEN_DEBUG_BUILD) && !ZEN_DLL
+
86  #define ZEN_API
+
87  #elif ZEN_DLL
+
88  #define ZEN_API __declspec(dllimport)
+
89  #else
+
90  #define ZEN_API
+
91  #endif // ZEN_DEBUG_BUILD
+
92 #endif // ZENDERER_EXPORTS
+
93 
+
95 namespace zen
+
96 {
+
101  typedef
+
102 #ifdef ZEN_DOUBLE_PRECISION
+
103  double
+
104 #else
+
105  float
+
106 #endif // ZEN_DOUBLE_PRECISION
+
107  real_t;
+
108 
+
115  typedef std::string string_t;
116 
-
121  struct ZEN_API color3f_t
-
122  {
-
123  real_t r,
-
124  g,
-
125  b;
-
126 
-
127  color3f_t(const real_t r = 1.0,
-
128  const real_t g = 1.0,
-
129  const real_t b = 1.0) : r(r), g(g), b(b) {}
-
130  };
-
131 }
-
132 
-
133 #endif // ZENDERER__CORE__TYPES_HPP
-
134 
+
124  template<typename T>
+
125  ZEN_API void clamp(T& val, const T& minimum, const T& maximum)
+
126  {
+
127  if(val < minimum) val = minimum;
+
128  else if(val > maximum) val = maximum;
+
129  }
+
130 
+
135  struct ZEN_API color4f_t
+
136  {
+
137  real_t r,
+
138  g,
+
139  b,
+
140  a;
+
141 
+
142  color4f_t(const real_t r = 1.f,
+
143  const real_t g = 1.f,
+
144  const real_t b = 1.f,
+
145  const real_t a = 1.f) : r(r), g(g), b(b), a(a) {}
+
146  };
+
147 
+
152  struct ZEN_API color3f_t
+
153  {
+
154  real_t r,
+
155  g,
+
156  b;
+
157 
+
158  color3f_t(const real_t r = 1.0,
+
159  const real_t g = 1.0,
+
160  const real_t b = 1.0) : r(r), g(g), b(b) {}
+
161  };
+
162 }
+
163 
+
164 #endif // ZENDERER__CORE__TYPES_HPP
+
165 
diff --git a/docs/_utilities-example.html b/docs/_utilities-example.html index 249b43ec..6132d934 100644 --- a/docs/_utilities-example.html +++ b/docs/_utilities-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_utilities_8hpp.html b/docs/_utilities_8hpp.html index 29605a06..5e9623cd 100644 --- a/docs/_utilities_8hpp.html +++ b/docs/_utilities_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,14 +129,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_utilities_8hpp__dep__incl.map b/docs/_utilities_8hpp__dep__incl.map index 63e150ae..489002ca 100644 --- a/docs/_utilities_8hpp__dep__incl.map +++ b/docs/_utilities_8hpp__dep__incl.map @@ -1,14 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/_utilities_8hpp__dep__incl.png b/docs/_utilities_8hpp__dep__incl.png index bbb9a7bb..07545194 100644 Binary files a/docs/_utilities_8hpp__dep__incl.png and b/docs/_utilities_8hpp__dep__incl.png differ diff --git a/docs/_utilities_8hpp__incl.map b/docs/_utilities_8hpp__incl.map index 1d162759..e4f6d5f8 100644 --- a/docs/_utilities_8hpp__incl.map +++ b/docs/_utilities_8hpp__incl.map @@ -1,16 +1,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_utilities_8hpp__incl.png b/docs/_utilities_8hpp__incl.png index 1ca98757..7604624f 100644 Binary files a/docs/_utilities_8hpp__incl.png and b/docs/_utilities_8hpp__incl.png differ diff --git a/docs/_utilities_8hpp_source.html b/docs/_utilities_8hpp_source.html index 0d1955df..bfcd085d 100644 --- a/docs/_utilities_8hpp_source.html +++ b/docs/_utilities_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_vector_8hpp.html b/docs/_vector_8hpp.html index 0da11aa5..c958b37b 100644 --- a/docs/_vector_8hpp.html +++ b/docs/_vector_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -136,7 +136,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_vector_8hpp__dep__incl.map b/docs/_vector_8hpp__dep__incl.map index a4680b49..17042dfb 100644 --- a/docs/_vector_8hpp__dep__incl.map +++ b/docs/_vector_8hpp__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_vector_8hpp__dep__incl.png b/docs/_vector_8hpp__dep__incl.png index ef3daf5d..1378e99f 100644 Binary files a/docs/_vector_8hpp__dep__incl.png and b/docs/_vector_8hpp__dep__incl.png differ diff --git a/docs/_vector_8hpp_source.html b/docs/_vector_8hpp_source.html index 1d13aff5..1a33ad24 100644 --- a/docs/_vector_8hpp_source.html +++ b/docs/_vector_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -183,8 +183,8 @@
210  std::ostream& operator<<(std::ostream& out,
211  const zVector<U>& Other);
212 
-
218  template<typename T, typename U> static
-
219  real_t distance(const zVector<T>& A, const zVector<U>& B,
+
218  template<typename R, typename S> static
+
219  real_t distance(const zVector<R>& A, const zVector<S>& B,
220  const bool do_sqrt = false);
221  };
222 
diff --git a/docs/_vector_8inl.html b/docs/_vector_8inl.html index 2e353dbd..a1be56e5 100644 --- a/docs/_vector_8inl.html +++ b/docs/_vector_8inl.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -116,7 +116,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_vector_8inl__dep__incl.map b/docs/_vector_8inl__dep__incl.map index 21e8965b..bb168045 100644 --- a/docs/_vector_8inl__dep__incl.map +++ b/docs/_vector_8inl__dep__incl.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_vector_8inl__dep__incl.png b/docs/_vector_8inl__dep__incl.png index 9ffa067d..489ea78d 100644 Binary files a/docs/_vector_8inl__dep__incl.png and b/docs/_vector_8inl__dep__incl.png differ diff --git a/docs/_vector_8inl_af237dc75dfd57eab5beffdbeab04bbde_icgraph.map b/docs/_vector_8inl_af237dc75dfd57eab5beffdbeab04bbde_icgraph.map deleted file mode 100644 index cc755b07..00000000 --- a/docs/_vector_8inl_af237dc75dfd57eab5beffdbeab04bbde_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/_vector_8inl_af237dc75dfd57eab5beffdbeab04bbde_icgraph.png b/docs/_vector_8inl_af237dc75dfd57eab5beffdbeab04bbde_icgraph.png deleted file mode 100644 index f0acef28..00000000 Binary files a/docs/_vector_8inl_af237dc75dfd57eab5beffdbeab04bbde_icgraph.png and /dev/null differ diff --git a/docs/_vector_8inl_source.html b/docs/_vector_8inl_source.html index b5c78bc1..25f7d88a 100644 --- a/docs/_vector_8inl_source.html +++ b/docs/_vector_8inl_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_vertex_array-example.html b/docs/_vertex_array-example.html index d41c63e5..76094aa9 100644 --- a/docs/_vertex_array-example.html +++ b/docs/_vertex_array-example.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_vertex_array_8cpp.html b/docs/_vertex_array_8cpp.html index 8779ef71..0030ab8c 100644 --- a/docs/_vertex_array_8cpp.html +++ b/docs/_vertex_array_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_vertex_array_8cpp_source.html b/docs/_vertex_array_8cpp_source.html index 8f646965..957add30 100644 --- a/docs/_vertex_array_8cpp_source.html +++ b/docs/_vertex_array_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -212,141 +212,126 @@
102  {
103  // Copy existing buffer data from GPU to local buffer.
104  const vertex_t* const data = this->GetVerticesFromGPU();
-
105  vertex_t* tmp = new vertex_t[bsize / sizeof(vertex_t)];
-
106  memcpy(tmp, data, bsize);
-
107  GL(glUnmapBuffer(GL_ARRAY_BUFFER));
-
108 
-
109  // Allocate enough GPU space for all vertex data, new and old.
-
110  // Pass the old data directly to it.
-
111  GL(glBufferData(GL_ARRAY_BUFFER,
-
112  bsize + (sizeof(vertex_t) * m_vaoVertices.size()),
-
113  tmp, m_type));
+
105  const size_t size = bsize / sizeof(vertex_t);
+
106 
+
107  m_vaoVertices.reserve(m_vaoVertices.size() + size);
+
108  for(int i = size - 1; i >= 0; --i)
+
109  m_vaoVertices.insert(m_vaoVertices.begin(), data[i]);
+
110 
+
111  m_vcount = 0;
+
112  GL(glUnmapBuffer(GL_ARRAY_BUFFER));
+
113  }
114 
-
115  // Pass the latest vertex data at the end of the existing data.
-
116  GL(glBufferSubData(GL_ARRAY_BUFFER, bsize,
-
117  sizeof(vertex_t) * m_vaoVertices.size(),
-
118  &m_vaoVertices[0]));
-
119  }
-
120  // No existing buffer or vertices.
-
121  else
-
122  {
-
123  // Allocate enough space for all vertices on GPU.
-
124  GL(glBufferData(GL_ARRAY_BUFFER,
-
125  sizeof(vertex_t) * m_vaoVertices.size(),
-
126  &m_vaoVertices[0], m_type));
-
127  }
-
128 
-
129  // Repeat process for index buffer.
-
130  bsize = 0;
-
131  GL(glGetBufferParameteriv(GL_ELEMENT_ARRAY_BUFFER, GL_BUFFER_SIZE, &bsize));
-
132 
-
133  if(bsize > 0)
-
134  {
-
135  // Copy from GPU to local buffer.
-
136  const index_t* const data = this->GetIndicesFromGPU();
-
137  index_t* tmp = new index_t[bsize / sizeof(index_t)];
-
138  memcpy(tmp, data, bsize);
-
139  GL(glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER));
-
140 
-
141  // Allocate enough GPU space for all vertex data, new and old.
-
142  // Pass the old data directly to it.
-
143  GL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, // IBO
-
144  bsize + (sizeof(index_t) * m_vaoIndices.size()),// Size
-
145  tmp, // Initial data
-
146  m_type)); // Access type
-
147 
-
148  // Pass the latest vertex data at the end of the existing data.
-
149  GL(glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, bsize,
-
150  sizeof(index_t) * m_vaoIndices.size(),
-
151  &m_vaoIndices[0]));
-
152  }
-
153  else
-
154  {
-
155  // No existing data, so we just write new stuff to the buffer.
-
156  GL(glBufferData(GL_ELEMENT_ARRAY_BUFFER,
-
157  sizeof(index_t) * m_vaoIndices.size(),
-
158  &m_vaoIndices[0], m_type));
-
159  }
-
160 
-
161  // Vertices are arranged in memory like so:
-
162  //
-
163  // [ x, y, z, t, s, r, r, g, b, a ]
-
164  //
-
165  // (see the definition of vertex_t in Zenderer/CoreGraphics/OpenGL.hpp)
-
166  //
-
167  // Specify vertex position arrangement.
-
168  // According to the diagram shown above, the vertex position
-
169  // would start at index 0.
-
170  GL(glVertexAttribPointer(0, /* Attribute index */
-
171  3, /* Number of values */
-
172  GL_FLOAT, /* Type of value */
-
173  GL_FALSE, /* Normalized? */
-
174  sizeof(vertex_t), /* Size of field */
-
175  VBO_OFFSET(0, vertex_t, position))); /* Size of offset */
-
176 
-
177  // Enable shader attribute 0 (position)
-
178  GL(glEnableVertexAttribArray(0));
-
179 
-
180  // Specify texture coordinate position arrangement.
-
181  // According to the diagram, texture coordinates start at index 3.
-
182  GL(glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(vertex_t),
-
183  VBO_OFFSET(0, vertex_t, tc)));
-
184  GL(glEnableVertexAttribArray(1));
-
185 
-
186  // Specify the color arrangement, starting at index 4.
-
187  GL(glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(vertex_t),
-
188  VBO_OFFSET(0, vertex_t, color)));
-
189  GL(glEnableVertexAttribArray(2));
-
190 
-
191  // We do not unbind our buffers as they stay attached to the VAO.
-
192 
-
193  // We're done, clean up buffers.
-
194  m_vcount += m_vaoVertices.size();
-
195  m_icount += m_vaoIndices.size();
-
196 
-
197  m_vaoVertices.clear();
-
198  m_vaoIndices.clear();
-
199 
-
200  return this->Unbind();
-
201 }
-
202 
-
203 bool zVertexArray::Clear()
-
204 {
-
205  if(!this->Bind()) return false;
-
206  GL(glBufferData(GL_ARRAY_BUFFER, 0, nullptr, GL_STATIC_DRAW));
-
207  GL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, 0, nullptr, GL_STATIC_DRAW));
-
208 
-
209  m_icount = m_vcount = 0;
-
210  m_vaoIndices.clear();
-
211  m_vaoVertices.clear();
-
212 
-
213  return this->Unbind();
+
115  // Allocate enough GPU space for all vertex data, new and old, and pass
+
116  // all of the data directly to it.
+
117  GL(glBufferData(GL_ARRAY_BUFFER,
+
118  sizeof(vertex_t) * m_vaoVertices.size(),
+
119  &m_vaoVertices[0], m_type));
+
120 
+
121  // Repeat process for index buffer.
+
122  bsize = 0;
+
123  GL(glGetBufferParameteriv(GL_ELEMENT_ARRAY_BUFFER, GL_BUFFER_SIZE, &bsize));
+
124 
+
125  if(bsize > 0)
+
126  {
+
127  // Copy from GPU to local buffer.
+
128  const index_t* const data = this->GetIndicesFromGPU();
+
129  const size_t size = bsize / sizeof(index_t);
+
130 
+
131  m_vaoIndices.reserve(m_vaoIndices.size() + size);
+
132  for(int i = size - 1; i >= 0; --i)
+
133  m_vaoIndices.insert(m_vaoIndices.begin(), data[i]);
+
134 
+
135  m_icount = 0;
+
136  GL(glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER));
+
137  }
+
138 
+
139  // Allocate enough GPU space for all index data, new and old, and pass
+
140  // all of the data directly to it.
+
141  GL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, // IBO
+
142  sizeof(index_t) * m_vaoIndices.size(), // Size
+
143  &m_vaoIndices[0], // Initial data
+
144  m_type)); // Access type
+
145 
+
146  // Vertices are arranged in memory like so:
+
147  //
+
148  // [ x, y, z, t, s, r, r, g, b, a ]
+
149  //
+
150  // (see the definition of vertex_t in Zenderer/CoreGraphics/OpenGL.hpp)
+
151  //
+
152  // Specify vertex position arrangement.
+
153  // According to the diagram shown above, the vertex position
+
154  // would start at index 0.
+
155  GL(glVertexAttribPointer(0, /* Attribute index */
+
156  3, /* Number of values */
+
157  GL_FLOAT, /* Type of value */
+
158  GL_FALSE, /* Normalized? */
+
159  sizeof(vertex_t), /* Size of field */
+
160  VBO_OFFSET(0, vertex_t, position))); /* Size of offset */
+
161 
+
162  // Enable shader attribute 0 (position)
+
163  GL(glEnableVertexAttribArray(0));
+
164 
+
165  // Specify texture coordinate position arrangement.
+
166  // According to the diagram, texture coordinates start at index 3.
+
167  GL(glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(vertex_t),
+
168  VBO_OFFSET(0, vertex_t, tc)));
+
169  GL(glEnableVertexAttribArray(1));
+
170 
+
171  // Specify the color arrangement, starting at index 4.
+
172  GL(glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(vertex_t),
+
173  VBO_OFFSET(0, vertex_t, color)));
+
174  GL(glEnableVertexAttribArray(2));
+
175 
+
176  // We do not unbind our buffers as they stay attached to the VAO.
+
177 
+
178  // We're done, clean up buffers.
+
179  m_vcount += m_vaoVertices.size();
+
180  m_icount += m_vaoIndices.size();
+
181 
+
182  m_vaoVertices.clear();
+
183  m_vaoIndices.clear();
+
184 
+
185  return this->Unbind();
+
186 }
+
187 
+
188 bool zVertexArray::Clear()
+
189 {
+
190  if(!this->Bind()) return false;
+
191  GL(glBufferData(GL_ARRAY_BUFFER, 0, nullptr, GL_STATIC_DRAW));
+
192  GL(glBufferData(GL_ELEMENT_ARRAY_BUFFER, 0, nullptr, GL_STATIC_DRAW));
+
193 
+
194  m_icount = m_vcount = 0;
+
195  m_vaoIndices.clear();
+
196  m_vaoVertices.clear();
+
197 
+
198  return this->Unbind();
+
199 }
+
200 
+
201 const vertex_t* const zVertexArray::GetVerticesFromGPU() const
+
202 {
+
203  return (vertex_t*)GL(glMapBuffer(GL_ARRAY_BUFFER, GL_READ_ONLY));
+
204 }
+
205 
+
206 const index_t* const zVertexArray::GetIndicesFromGPU() const
+
207 {
+
208  return (index_t*)GL(glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_ONLY));
+
209 }
+
210 
+
211 size_t zVertexArray::GetVertexCount() const
+
212 {
+
213  return m_vcount;
214 }
215 
-
216 const vertex_t* const zVertexArray::GetVerticesFromGPU() const
+
216 size_t zVertexArray::GetIndexCount() const
217 {
-
218  return (vertex_t*)GL(glMapBuffer(GL_ARRAY_BUFFER, GL_READ_ONLY));
+
218  return m_icount;
219 }
220 
-
221 const index_t* const zVertexArray::GetIndicesFromGPU() const
+
221 bool zVertexArray::Offloaded() const
222 {
-
223  return (index_t*)GL(glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_ONLY));
+
223  return (m_vaoIndices.empty() && m_vaoVertices.empty());
224 }
-
225 
-
226 size_t zVertexArray::GetVertexCount() const
-
227 {
-
228  return m_vcount;
-
229 }
-
230 
-
231 size_t zVertexArray::GetIndexCount() const
-
232 {
-
233  return m_icount;
-
234 }
-
235 
-
236 bool zVertexArray::Offloaded() const
-
237 {
-
238  return (m_vaoIndices.empty() && m_vaoVertices.empty());
-
239 }
diff --git a/docs/_vertex_array_8hpp.html b/docs/_vertex_array_8hpp.html index a45e87dd..6d0d7dbf 100644 --- a/docs/_vertex_array_8hpp.html +++ b/docs/_vertex_array_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -135,7 +135,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_vertex_array_8hpp__dep__incl.map b/docs/_vertex_array_8hpp__dep__incl.map index 61db2340..0ec728f2 100644 --- a/docs/_vertex_array_8hpp__dep__incl.map +++ b/docs/_vertex_array_8hpp__dep__incl.map @@ -1,40 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_vertex_array_8hpp__dep__incl.png b/docs/_vertex_array_8hpp__dep__incl.png index 86bfdedf..59398578 100644 Binary files a/docs/_vertex_array_8hpp__dep__incl.png and b/docs/_vertex_array_8hpp__dep__incl.png differ diff --git a/docs/_vertex_array_8hpp_source.html b/docs/_vertex_array_8hpp_source.html index 8f320674..851e62e1 100644 --- a/docs/_vertex_array_8hpp_source.html +++ b/docs/_vertex_array_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_window_8cpp.html b/docs/_window_8cpp.html index c3e5c6b8..5de01ba6 100644 --- a/docs/_window_8cpp.html +++ b/docs/_window_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -118,7 +118,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_window_8cpp__incl.map b/docs/_window_8cpp__incl.map index b8e54c26..ba6cb308 100644 --- a/docs/_window_8cpp__incl.map +++ b/docs/_window_8cpp__incl.map @@ -1,36 +1,36 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_window_8cpp__incl.png b/docs/_window_8cpp__incl.png index d0052e92..1f138642 100644 Binary files a/docs/_window_8cpp__incl.png and b/docs/_window_8cpp__incl.png differ diff --git a/docs/_window_8cpp_source.html b/docs/_window_8cpp_source.html index 8cb99c75..a1bcd2bb 100644 --- a/docs/_window_8cpp_source.html +++ b/docs/_window_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_window_8hpp.html b/docs/_window_8hpp.html index 12ddc48c..94ede48e 100644 --- a/docs/_window_8hpp.html +++ b/docs/_window_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,14 +132,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_window_8hpp__dep__incl.map b/docs/_window_8hpp__dep__incl.map index 92252812..f3f5a935 100644 --- a/docs/_window_8hpp__dep__incl.map +++ b/docs/_window_8hpp__dep__incl.map @@ -1,26 +1,27 @@ - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/_window_8hpp__dep__incl.png b/docs/_window_8hpp__dep__incl.png index 5b2799ce..91eb8c7c 100644 Binary files a/docs/_window_8hpp__dep__incl.png and b/docs/_window_8hpp__dep__incl.png differ diff --git a/docs/_window_8hpp__incl.map b/docs/_window_8hpp__incl.map index eec2c02b..5fca733c 100644 --- a/docs/_window_8hpp__incl.map +++ b/docs/_window_8hpp__incl.map @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_window_8hpp__incl.png b/docs/_window_8hpp__incl.png index c84a7ca6..8c64910b 100644 Binary files a/docs/_window_8hpp__incl.png and b/docs/_window_8hpp__incl.png differ diff --git a/docs/_window_8hpp_source.html b/docs/_window_8hpp_source.html index eb876be8..2b55e19e 100644 --- a/docs/_window_8hpp_source.html +++ b/docs/_window_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_x_m_l_parser_8cpp.html b/docs/_x_m_l_parser_8cpp.html index d38c2cdc..f7c0d529 100644 --- a/docs/_x_m_l_parser_8cpp.html +++ b/docs/_x_m_l_parser_8cpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_x_m_l_parser_8cpp__incl.map b/docs/_x_m_l_parser_8cpp__incl.map index fd268187..f56cebd9 100644 --- a/docs/_x_m_l_parser_8cpp__incl.map +++ b/docs/_x_m_l_parser_8cpp__incl.map @@ -1,9 +1,16 @@ - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/_x_m_l_parser_8cpp__incl.png b/docs/_x_m_l_parser_8cpp__incl.png index edd53fba..e2a709ec 100644 Binary files a/docs/_x_m_l_parser_8cpp__incl.png and b/docs/_x_m_l_parser_8cpp__incl.png differ diff --git a/docs/_x_m_l_parser_8cpp_source.html b/docs/_x_m_l_parser_8cpp_source.html index ae1b41f0..c9b3fb17 100644 --- a/docs/_x_m_l_parser_8cpp_source.html +++ b/docs/_x_m_l_parser_8cpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -311,7 +311,7 @@
201  return -1;
202  }
203 
-
204  pNode->name = line.substr(index + 1, min(end, end2) - 1);
+
204  pNode->name = line.substr(index + 1, math::min<size_t>(end, end2)-1);
205 
206  util::stripl(pNode->name);
207  util::stript(pNode->name);
diff --git a/docs/_x_m_l_parser_8hpp.html b/docs/_x_m_l_parser_8hpp.html index 3625ef20..1a8be7c7 100644 --- a/docs/_x_m_l_parser_8hpp.html +++ b/docs/_x_m_l_parser_8hpp.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -119,6 +119,7 @@

Zenderer/Utilities/XMLParser.hpp - A minimalistic XML parsing utility. More...

#include "Zenderer/Core/Types.hpp"
+#include "Zenderer/Math/Math.hpp"
#include "Log.hpp"
#include "Assert.hpp"
#include "Helpers.hpp"
@@ -131,14 +132,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

@@ -231,7 +232,7 @@ name "body" -

Definition at line 72 of file XMLParser.hpp.

+

Definition at line 73 of file XMLParser.hpp.

@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -111,100 +111,101 @@
Go to the documentation of this file.
1 
22 #include "Zenderer/Core/Types.hpp"
-
23 
-
24 #include "Log.hpp"
-
25 #include "Assert.hpp"
-
26 #include "Helpers.hpp"
-
27 
-
28 // Necessary include files
-
29 #include <vector>
-
30 #include <map>
-
31 #include <fstream>
-
32 #include <functional>
-
33 
-
34 // Declare namespaces if we're a part of Zenderer.
-
35 namespace zen
-
36 {
-
37 namespace util
-
38 {
-
39  // Forward declaration.
-
40  struct ZEN_API XMLNode;
-
41 
-
43  typedef std::vector<XMLNode*> XMLList_t;
-
44 
-
46  typedef std::map<string_t, string_t> XMLOptions_t;
-
47 
-
72  struct ZEN_API XMLNode
-
73  {
-
74  XMLNode* parent;
-
75  XMLList_t children;
-
76  XMLOptions_t options;
-
77  string_t content;
-
78  string_t name;
-
79  };
-
80 
-
83  class ZEN_API zXMLParser
-
84  {
-
85  public:
-
87  zXMLParser();
-
88 
-
90  ~zXMLParser();
-
91 
-
93  bool LoadFromFile(const string_t& filename);
-
94 
-
96  bool LoadFromString(const char** str);
-
97 
-
99  const XMLNode* const FindNode(const string_t& name) const;
-
100 
-
102  XMLNode* FindNode(const string_t& name);
-
103 
-
105  void ClearTree();
-
106 
-
108  inline XMLList_t::iterator begin();
-
109  inline const XMLList_t::const_iterator cbegin() const;
-
110 
-
112  inline XMLList_t::iterator end();
-
113  inline const XMLList_t::const_iterator cend() const;
-
114 
-
127  static void ShowXMLError(const uint32_t line_no,
-
128  const string_t& line,
-
129  const string_t& reason);
-
130 
-
131  private:
-
133  int ParseTree(const char** str, const int index, XMLNode* parent);
-
134  int ParseTree(std::ifstream& f, const int index, XMLNode* parent);
-
135 
-
136  int CreateNode(const string_t& line, XMLNode* parent, int i,
-
137  std::function<int(const size_t, XMLNode*)> callback);
-
138 
-
139  XMLList_t m_XMLTree;
-
140  zLog& m_Log;
-
141  };
-
142 
-
143  XMLList_t::iterator zXMLParser::begin()
-
144  {
-
145  return m_XMLTree.begin();
-
146  }
-
147 
-
148  const XMLList_t::const_iterator zXMLParser::cbegin() const
-
149  {
-
150  return m_XMLTree.cbegin();
-
151  }
-
152 
-
153  XMLList_t::iterator zXMLParser::end()
-
154  {
-
155  return m_XMLTree.end();
-
156  }
-
157 
-
158  const XMLList_t::const_iterator zXMLParser::cend() const
-
159  {
-
160  return m_XMLTree.cend();
-
161  }
-
162 } // namespace util
-
163 } // namespace zen
-
164 
-
165 // Detailed Doxygen documentation.
-
166 
+
23 #include "Zenderer/Math/Math.hpp"
+
24 
+
25 #include "Log.hpp"
+
26 #include "Assert.hpp"
+
27 #include "Helpers.hpp"
+
28 
+
29 // Necessary include files
+
30 #include <vector>
+
31 #include <map>
+
32 #include <fstream>
+
33 #include <functional>
+
34 
+
35 // Declare namespaces if we're a part of Zenderer.
+
36 namespace zen
+
37 {
+
38 namespace util
+
39 {
+
40  // Forward declaration.
+
41  struct ZEN_API XMLNode;
+
42 
+
44  typedef std::vector<XMLNode*> XMLList_t;
+
45 
+
47  typedef std::map<string_t, string_t> XMLOptions_t;
+
48 
+
73  struct ZEN_API XMLNode
+
74  {
+
75  XMLNode* parent;
+
76  XMLList_t children;
+
77  XMLOptions_t options;
+
78  string_t content;
+
79  string_t name;
+
80  };
+
81 
+
84  class ZEN_API zXMLParser
+
85  {
+
86  public:
+
88  zXMLParser();
+
89 
+
91  ~zXMLParser();
+
92 
+
94  bool LoadFromFile(const string_t& filename);
+
95 
+
97  bool LoadFromString(const char** str);
+
98 
+
100  const XMLNode* const FindNode(const string_t& name) const;
+
101 
+
103  XMLNode* FindNode(const string_t& name);
+
104 
+
106  void ClearTree();
+
107 
+
109  inline XMLList_t::iterator begin();
+
110  inline const XMLList_t::const_iterator cbegin() const;
+
111 
+
113  inline XMLList_t::iterator end();
+
114  inline const XMLList_t::const_iterator cend() const;
+
115 
+
128  static void ShowXMLError(const uint32_t line_no,
+
129  const string_t& line,
+
130  const string_t& reason);
+
131 
+
132  private:
+
134  int ParseTree(const char** str, const int index, XMLNode* parent);
+
135  int ParseTree(std::ifstream& f, const int index, XMLNode* parent);
+
136 
+
137  int CreateNode(const string_t& line, XMLNode* parent, int i,
+
138  std::function<int(const size_t, XMLNode*)> callback);
+
139 
+
140  XMLList_t m_XMLTree;
+
141  zLog& m_Log;
+
142  };
+
143 
+
144  XMLList_t::iterator zXMLParser::begin()
+
145  {
+
146  return m_XMLTree.begin();
+
147  }
+
148 
+
149  const XMLList_t::const_iterator zXMLParser::cbegin() const
+
150  {
+
151  return m_XMLTree.cbegin();
+
152  }
+
153 
+
154  XMLList_t::iterator zXMLParser::end()
+
155  {
+
156  return m_XMLTree.end();
+
157  }
+
158 
+
159  const XMLList_t::const_iterator zXMLParser::cend() const
+
160  {
+
161  return m_XMLTree.cend();
+
162  }
+
163 } // namespace util
+
164 } // namespace zen
+
165 
+
166 // Detailed Doxygen documentation.
+
167 
diff --git a/docs/_zenderer_8cpp.html b/docs/_zenderer_8cpp.html index 3d927765..7bd90ea5 100644 --- a/docs/_zenderer_8cpp.html +++ b/docs/_zenderer_8cpp.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,7 +115,7 @@
- +

Go to the source code of this file.

diff --git a/docs/_zenderer_8cpp__incl.map b/docs/_zenderer_8cpp__incl.map index 4a718515..d906f3c0 100644 --- a/docs/_zenderer_8cpp__incl.map +++ b/docs/_zenderer_8cpp__incl.map @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_zenderer_8cpp__incl.png b/docs/_zenderer_8cpp__incl.png index 92af6e59..f7423933 100644 Binary files a/docs/_zenderer_8cpp__incl.png and b/docs/_zenderer_8cpp__incl.png differ diff --git a/docs/_zenderer_8cpp_source.html b/docs/_zenderer_8cpp_source.html index 8cd2dfad..3566d85d 100644 --- a/docs/_zenderer_8cpp_source.html +++ b/docs/_zenderer_8cpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/_zenderer_8hpp.html b/docs/_zenderer_8hpp.html index 84102363..db20740b 100644 --- a/docs/_zenderer_8hpp.html +++ b/docs/_zenderer_8hpp.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -127,6 +127,7 @@ #include "GUI/Menu.hpp"
#include "Objects/Entity.hpp"
#include "Objects/Animation.hpp"
+#include "Graphics/ConcavePolygon.hpp"
#include "Graphics/Quad.hpp"
#include "Audio/AudioManager.hpp"
#include "Audio/Music2D.hpp"
@@ -139,14 +140,14 @@
- +
This graph shows which files directly or indirectly include this file:
- +

Go to the source code of this file.

diff --git a/docs/_zenderer_8hpp__dep__incl.map b/docs/_zenderer_8hpp__dep__incl.map index 6c2a4c19..727ffd06 100644 --- a/docs/_zenderer_8hpp__dep__incl.map +++ b/docs/_zenderer_8hpp__dep__incl.map @@ -1,6 +1,7 @@ - - + + + diff --git a/docs/_zenderer_8hpp__dep__incl.png b/docs/_zenderer_8hpp__dep__incl.png index 638a3842..a487ec33 100644 Binary files a/docs/_zenderer_8hpp__dep__incl.png and b/docs/_zenderer_8hpp__dep__incl.png differ diff --git a/docs/_zenderer_8hpp__incl.map b/docs/_zenderer_8hpp__incl.map index a68a62bc..0e848b40 100644 --- a/docs/_zenderer_8hpp__incl.map +++ b/docs/_zenderer_8hpp__incl.map @@ -1,44 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/_zenderer_8hpp__incl.png b/docs/_zenderer_8hpp__incl.png index acafcb71..9cad03ed 100644 Binary files a/docs/_zenderer_8hpp__incl.png and b/docs/_zenderer_8hpp__incl.png differ diff --git a/docs/_zenderer_8hpp_source.html b/docs/_zenderer_8hpp_source.html index 838d9244..9ee691d7 100644 --- a/docs/_zenderer_8hpp_source.html +++ b/docs/_zenderer_8hpp_source.html @@ -30,9 +30,9 @@ @@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -134,7 +134,7 @@
44 #if defined(__GNUC__) || \
45  defined(__MINGW32__) || \
46  defined(__MINGW64__)
-
47  #error "Zenderer must be compiled with C++11 regex support."
+
47  #warning "Non-regex string parsing has not been tested thoroughly..."
48 #elif \
49  !( \
50  defined(WIN32) || \
@@ -142,7 +142,7 @@
52  defined(__WIN32__) || \
53  defined(__WINDOWS__) \
54  )
-
55  #warning "Zenderer has only been tested on Windows using Visual Studio..."
+
55  #warning "Zenderer has only been tested on Windows using MinGW and Visual Studio..."
56 #else
57  #ifndef _WIN32
59  #define _WIN32
@@ -166,36 +166,37 @@
77 // Object API
78 #include "Objects/Entity.hpp"
79 #include "Objects/Animation.hpp"
-
80 #include "Graphics/Quad.hpp"
-
81 
-
82 // Audio API
-
83 #include "Audio/AudioManager.hpp"
-
84 #include "Audio/Music2D.hpp"
-
85 #include "Audio/Sound2D.hpp"
-
86 
-
87 // Networking API.
-
88 #include "Network/Socket.hpp"
-
89 
-
90 // Misc. APIs
-
91 #include "Events/EventHandler.hpp"
-
92 #include "Levels/LevelLoader.hpp"
-
93 
-
94 // Link debug-specific libraries.
-
95 #ifdef ZEN_DEBUG_BUILD
-
96  #pragma comment(lib, "GLFW3_DBG.lib")
-
97 #else
-
98  #pragma comment(lib, "GLFW3.lib")
-
99 #endif // _DEBUG
-
100 
-
101 namespace zen
-
102 {
-
104  ZEN_API bool Init();
-
105 
-
107  ZEN_API void Quit();
-
108 }
-
109 
-
110 #endif // ZENDERER__ZENDERER_HPP
-
111 
+
80 #include "Graphics/ConcavePolygon.hpp"
+
81 #include "Graphics/Quad.hpp"
+
82 
+
83 // Audio API
+
84 #include "Audio/AudioManager.hpp"
+
85 #include "Audio/Music2D.hpp"
+
86 #include "Audio/Sound2D.hpp"
+
87 
+
88 // Networking API.
+
89 #include "Network/Socket.hpp"
+
90 
+
91 // Misc. APIs
+
92 #include "Events/EventHandler.hpp"
+
93 #include "Levels/LevelLoader.hpp"
+
94 
+
95 // Link debug-specific libraries.
+
96 #ifdef ZEN_DEBUG_BUILD
+
97  #pragma comment(lib, "GLFW3_DBG.lib")
+
98 #else
+
99  #pragma comment(lib, "GLFW3.lib")
+
100 #endif // _DEBUG
+
101 
+
102 namespace zen
+
103 {
+
105  ZEN_API bool Init();
+
106 
+
108  ZEN_API void Quit();
+
109 }
+
110 
+
111 #endif // ZENDERER__ZENDERER_HPP
+
112 
diff --git a/docs/annotated.html b/docs/annotated.html index 68ecd147..df2db580 100644 --- a/docs/annotated.html +++ b/docs/annotated.html @@ -30,9 +30,9 @@ @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -131,7 +131,7 @@
- + @@ -150,7 +150,7 @@ - + @@ -172,30 +172,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
Data Fields
diff --git a/docs/_x_m_l_parser_8hpp__dep__incl.map b/docs/_x_m_l_parser_8hpp__dep__incl.map index 9bdabfaa..effc7ae3 100644 --- a/docs/_x_m_l_parser_8hpp__dep__incl.map +++ b/docs/_x_m_l_parser_8hpp__dep__incl.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/_x_m_l_parser_8hpp__dep__incl.png b/docs/_x_m_l_parser_8hpp__dep__incl.png index 3b060117..266302c2 100644 Binary files a/docs/_x_m_l_parser_8hpp__dep__incl.png and b/docs/_x_m_l_parser_8hpp__dep__incl.png differ diff --git a/docs/_x_m_l_parser_8hpp__incl.map b/docs/_x_m_l_parser_8hpp__incl.map index 3d2acf40..5b0eac9f 100644 --- a/docs/_x_m_l_parser_8hpp__incl.map +++ b/docs/_x_m_l_parser_8hpp__incl.map @@ -1,8 +1,15 @@ - - - - - - + + + + + + + + + + + + + diff --git a/docs/_x_m_l_parser_8hpp__incl.png b/docs/_x_m_l_parser_8hpp__incl.png index 97949a3a..5f6857e0 100644 Binary files a/docs/_x_m_l_parser_8hpp__incl.png and b/docs/_x_m_l_parser_8hpp__incl.png differ diff --git a/docs/_x_m_l_parser_8hpp_source.html b/docs/_x_m_l_parser_8hpp_source.html index 0a41667b..1fe17b6f 100644 --- a/docs/_x_m_l_parser_8hpp_source.html +++ b/docs/_x_m_l_parser_8hpp_source.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
||oCzPolygonAn arbitrary n-vertex convex polygon
||oCzQuadA four-sided quadrilateral primitive
||oCzRenderTargetCreates a target for all subsequent rendering operations
||oCzScene
||oCzSceneA high-level rendering wrapper allowing for special effects and lighting
||oCzWindowCreates a renderable OpenGL context
||\CzFont
|oNgfxcoreLow level graphics layer
||oCkey_tKeyboard event structure
||\Cmouse_tMouse event structure
|oNobjA group of sprite-like objects that operate at a high level of abstraction
||oCzAnimation
||oCzAnimationAn animated in-game object
||oCzEntityA base class for all "in-game" objects
||oCbbox_tAn axis-aligned bounding box (AABB) representation
||oCcircle_tA representation of a circle to provide an alternative collision in Zenderer for objects or sprites that don't play nicely with quads
||oCrect_tRepresents a rectangle with position and dimensions
||oCcircle_tRepresents a circle with position and radius
||oCaabb_tRepresents an axis-aligned bounding box
||oCzVectorRepresents a point in 3D rectangular-coordinate space
||\Cvector_t
|oNnet
||oCIPHeader
||oCICMPHeader
||\CzSocketA low-level socket wrapper
|oNluaAn abstraction layer over raw embedding of the Lua scripting environment
||\CzLuaWrapper for the core Lua interpreter
|oNutilContains various utilities that can help with loading, rendering, logging, and debugging
||oCzFileParserZenderer-specific file format parser
||oCzParserParses files based on key=value1,...,valueN pairs, like in .ini files
||oCzLogCreates a special file stream to store logging information
||oCzRandomFacilitates simplification of random number generation
||oCzOptionUsed internally by zSettings to manage options of all types
||oCzSettingsAn array-like wrapper for various settings
||oCzTimerA high-precision timer class for controlling frame rates
||oCXMLNodeA single XML node
||\CzXMLParserA minimalistic XML parser that expects near-perfection from the user
|oCzAllocatorAn optional custom allocator for high-speed memory requests
|oCzSubsystemAn abstract base class for all engine subsystems
|oCcolor4f_tA 32-bit floating point color component (RGBA)
|oCcolor3f_tA 24-bit floating point color component (RGB)
|\Cglyph_t
\CPongPacket
||oCcquery_tA collision-quering structure
||oCzVectorRepresents a point in 3D rectangular-coordinate space
||\Cvector_t
|oNnet
||oCIPHeader
||oCICMPHeader
||\CzSocketA low-level socket wrapper
|oNluaAn abstraction layer over raw embedding of the Lua scripting environment
||\CzLuaWrapper for the core Lua interpreter
|oNutilContains various utilities that can help with loading, rendering, logging, and debugging
||oCzFileParserZenderer-specific file format parser
||oCzParserParses files based on key=value1,...,valueN pairs, like in .ini files
||oCzLogCreates a special file stream to store logging information
||oCzRandomFacilitates simplification of random number generation
||oCzOptionUsed internally by zSettings to manage options of all types
||oCzSettingsAn array-like wrapper for various settings
||oCzTimerA high-precision timer class for controlling frame rates
||oCXMLNodeA single XML node
||\CzXMLParserA minimalistic XML parser that expects near-perfection from the user
|oCzAllocatorAn optional custom allocator for high-speed memory requests
|oCzSubsystemAn abstract base class for all engine subsystems
|oCcolor4f_tA 32-bit floating point color component (RGBA)
|oCcolor3f_tA 24-bit floating point color component (RGB)
|\Cglyph_t
oCgBullet
oCgWorld
\CPongPacket
diff --git a/docs/annotated.js b/docs/annotated.js index a55c2efc..feecbe10 100644 --- a/docs/annotated.js +++ b/docs/annotated.js @@ -1,5 +1,7 @@ var annotated = [ [ "zen", "namespacezen.html", "namespacezen" ], + [ "gBullet", "classg_bullet.html", "classg_bullet" ], + [ "gWorld", "classg_world.html", "classg_world" ], [ "PongPacket", "_pong_8cpp.html#struct_pong_packet", "_pong_8cpp" ] ]; \ No newline at end of file diff --git a/docs/bug.html b/docs/bug.html deleted file mode 100644 index d6223379..00000000 --- a/docs/bug.html +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - -Zenderer Engine: Bug List - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-
Bug List
-
-
-
-
Global zen::gfx::zScene::Destroy ()
-
A crash occurs deleting entities.
-
-
-
- - - - diff --git a/docs/class_c_string.html b/docs/class_c_string.html deleted file mode 100644 index 16c39a98..00000000 --- a/docs/class_c_string.html +++ /dev/null @@ -1,906 +0,0 @@ - - - - - - -Zenderer Engine: CString Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Friends
-
-
CString Class Reference
-
-
- -

#include "String.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CString ()
 
 CString (const char *string)
 
 CString (const std::string &string)
 
 CString (const CString &Other)
 
 ~CString ()
 
CString & operator= (const CString &Other)=delete
 
CString & operator= (const std::string &Other)
 
CString & operator= (const char *string)
 
CString & operator+= (const CString &Other)
 
CString & Append (const CString &Other)
 
void push_back (const char c)
 
char operator[] (const size_t index) const
 
 operator std::string () const
 
 operator char * () const
 
char * begin ()
 
char * end ()
 
char front () const
 
char back () const
 
const char * c_str () const
 
void Resize (const size_t size)
 
void Reserve (const size_t size)
 
void Clear ()
 
void Shrink ()
 
size_t GetLength () const
 
bool Empty () const
 
- - - -

-Friends

std::ostream & operator<< (std::ostream &o, const CString &str)
 
-

Detailed Description

-
Examples:
Logging.
-
-

Definition at line 44 of file String.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - -
CString::CString ()
- 		-inline
-
- -

Definition at line 47 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CString::CString (const char * string)
- 		-inline
-
- -

Definition at line 51 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CString::CString (const std::string & string)
- 		-inline
-
- -

Definition at line 97 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CString::CString (const CString & Other)
- 		-inline
-
- -

Definition at line 123 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CString::~CString ()
- 		-inline
-
- -

Definition at line 144 of file String.hpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
CString& CString::operator= (const CString & Other)
- 		-delete
-
- -
-
- -
-
- - - - - - - - -
CString& CString::operator= (const std::string & Other)
-
- -
-
- -
-
- - - - - -
- - - - - - - - -
CString& CString::operator= (const char * string)
- 		-inline
-
- -

Definition at line 151 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CString& CString::operator+= (const CString & Other)
- 		-inline
-
- -

Definition at line 218 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CString& CString::Append (const CString & Other)
- 		-inline
-
- -

Definition at line 223 of file String.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CString::push_back (const char c)
- 		-inline
-
- -

Definition at line 256 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
char CString::operator[] (const size_t index) const
- 		-inline
-
- -

Definition at line 290 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CString::operator std::string () const
- 		-inline
-
- -

Definition at line 295 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CString::operator char * () const
- 		-inline
-
- -

Definition at line 296 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
char* CString::begin ()
- 		-inline
-
- -

Definition at line 298 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
char* CString::end ()
- 		-inline
-
- -

Definition at line 299 of file String.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
char CString::front () const
- 		-inline
-
- -

Definition at line 300 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
char CString::back () const
- 		-inline
-
- -

Definition at line 301 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const char* CString::c_str () const
- 		-inline
-
- -

Definition at line 303 of file String.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CString::Resize (const size_t size)
- 		-inline
-
- -

Definition at line 310 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CString::Reserve (const size_t size)
- 		-inline
-
- -

Definition at line 339 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void CString::Clear ()
- 		-inline
-
- -

Definition at line 355 of file String.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
void CString::Shrink ()
- 		-inline
-
- -

Definition at line 361 of file String.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
size_t CString::GetLength () const
- 		-inline
-
- -

Definition at line 379 of file String.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CString::Empty () const
- 		-inline
-
- -

Definition at line 382 of file String.hpp.

- -
-
-

Friends And Related Function Documentation

- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
std::ostream& operator<< (std::ostream & o,
const CString & str 
)
- 		-friend
-
- -

Definition at line 385 of file String.hpp.

- -
-
-
The documentation for this class was generated from the following file: -
-
- - - - diff --git a/docs/class_c_string.js b/docs/class_c_string.js deleted file mode 100644 index 888dd484..00000000 --- a/docs/class_c_string.js +++ /dev/null @@ -1,29 +0,0 @@ -var class_c_string = -[ - [ "CString", "class_c_string.html#af1bdfb660b31a19c86a0ddb4c0827937", null ], - [ "CString", "class_c_string.html#aa31e013065e47636195e612468e65e8f", null ], - [ "CString", "class_c_string.html#aa7618964bae25da13f64f59c26fbaeb4", null ], - [ "CString", "class_c_string.html#a2941f9a8771b8ba1c7267b2aeb2e08c0", null ], - [ "~CString", "class_c_string.html#a6c71f771ccdbdbed1d711788355aeea5", null ], - [ "operator=", "class_c_string.html#a43dfac98a4a1df40e61dc059e8d760e4", null ], - [ "operator=", "class_c_string.html#a6471e69fb7147a22b9be076d1707385f", null ], - [ "operator=", "class_c_string.html#a081287daabecf296d3b80ecba3a01eed", null ], - [ "operator+=", "class_c_string.html#a1074f54e4404fdff086bd02ff032d9cf", null ], - [ "Append", "class_c_string.html#a4db00b72b1e40120c4ca303b85d598e5", null ], - [ "push_back", "class_c_string.html#a83e44acea16ece67e4b8aae623d618a5", null ], - [ "operator[]", "class_c_string.html#aa34584a1c45447dee1a79fbc24418678", null ], - [ "operator std::string", "class_c_string.html#aa084deb0ded7b19c5c25b9a8b1af3b05", null ], - [ "operator char *", "class_c_string.html#a934c59c59cc0ef57b876798c1c564a5c", null ], - [ "begin", "class_c_string.html#ab5a1fd3418f458cede99c9631e74fb4e", null ], - [ "end", "class_c_string.html#a9e38a71f19e8837cf370534a5454789e", null ], - [ "front", "class_c_string.html#a45c2be61775b7b022ebcff899d81b3f0", null ], - [ "back", "class_c_string.html#aa40235f47b43c384919ea9107f1a1ef6", null ], - [ "c_str", "class_c_string.html#a9e03007e643391b723caa2ea86f7b39a", null ], - [ "Resize", "class_c_string.html#afbe538ef151ef2f4c83bd39535c423eb", null ], - [ "Reserve", "class_c_string.html#a9a23734e8711a58bf4652f0216492df0", null ], - [ "Clear", "class_c_string.html#a8576722a26c9eaeff83b5a6e8c268a50", null ], - [ "Shrink", "class_c_string.html#aed062b91c9b0c582ce53cc01ae6fb266", null ], - [ "GetLength", "class_c_string.html#a3c92dc869375582d8a8a3a2b92969eec", null ], - [ "Empty", "class_c_string.html#af0a4e030c1b5164421ce5fccdf4db3b4", null ], - [ "operator<<", "class_c_string.html#a70a27f3b6aa93d601aa8e0fb53f4fbad", null ] -]; \ No newline at end of file diff --git a/docs/class_c_string_a3c92dc869375582d8a8a3a2b92969eec_icgraph.map b/docs/class_c_string_a3c92dc869375582d8a8a3a2b92969eec_icgraph.map deleted file mode 100644 index dac488ff..00000000 --- a/docs/class_c_string_a3c92dc869375582d8a8a3a2b92969eec_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/class_c_string_a3c92dc869375582d8a8a3a2b92969eec_icgraph.png b/docs/class_c_string_a3c92dc869375582d8a8a3a2b92969eec_icgraph.png deleted file mode 100644 index 681cbc09..00000000 Binary files a/docs/class_c_string_a3c92dc869375582d8a8a3a2b92969eec_icgraph.png and /dev/null differ diff --git a/docs/class_c_string_a4db00b72b1e40120c4ca303b85d598e5_icgraph.map b/docs/class_c_string_a4db00b72b1e40120c4ca303b85d598e5_icgraph.map deleted file mode 100644 index 96c4b811..00000000 --- a/docs/class_c_string_a4db00b72b1e40120c4ca303b85d598e5_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/class_c_string_a4db00b72b1e40120c4ca303b85d598e5_icgraph.png b/docs/class_c_string_a4db00b72b1e40120c4ca303b85d598e5_icgraph.png deleted file mode 100644 index 16ed8cd6..00000000 Binary files a/docs/class_c_string_a4db00b72b1e40120c4ca303b85d598e5_icgraph.png and /dev/null differ diff --git a/docs/class_c_string_a8576722a26c9eaeff83b5a6e8c268a50_icgraph.map b/docs/class_c_string_a8576722a26c9eaeff83b5a6e8c268a50_icgraph.map deleted file mode 100644 index 0d7fc0f8..00000000 --- a/docs/class_c_string_a8576722a26c9eaeff83b5a6e8c268a50_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/class_c_string_a8576722a26c9eaeff83b5a6e8c268a50_icgraph.png b/docs/class_c_string_a8576722a26c9eaeff83b5a6e8c268a50_icgraph.png deleted file mode 100644 index f94111aa..00000000 Binary files a/docs/class_c_string_a8576722a26c9eaeff83b5a6e8c268a50_icgraph.png and /dev/null differ diff --git a/docs/class_c_string_a9e03007e643391b723caa2ea86f7b39a_icgraph.map b/docs/class_c_string_a9e03007e643391b723caa2ea86f7b39a_icgraph.map deleted file mode 100644 index 2a9496b0..00000000 --- a/docs/class_c_string_a9e03007e643391b723caa2ea86f7b39a_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/class_c_string_a9e03007e643391b723caa2ea86f7b39a_icgraph.png b/docs/class_c_string_a9e03007e643391b723caa2ea86f7b39a_icgraph.png deleted file mode 100644 index 2e8d647e..00000000 Binary files a/docs/class_c_string_a9e03007e643391b723caa2ea86f7b39a_icgraph.png and /dev/null differ diff --git a/docs/class_c_string_a9e38a71f19e8837cf370534a5454789e_icgraph.map b/docs/class_c_string_a9e38a71f19e8837cf370534a5454789e_icgraph.map deleted file mode 100644 index 61328cab..00000000 --- a/docs/class_c_string_a9e38a71f19e8837cf370534a5454789e_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/class_c_string_a9e38a71f19e8837cf370534a5454789e_icgraph.png b/docs/class_c_string_a9e38a71f19e8837cf370534a5454789e_icgraph.png deleted file mode 100644 index 6e327362..00000000 Binary files a/docs/class_c_string_a9e38a71f19e8837cf370534a5454789e_icgraph.png and /dev/null differ diff --git a/docs/classes.html b/docs/classes.html index 54fa31c4..f6d7113d 100644 --- a/docs/classes.html +++ b/docs/classes.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -115,43 +115,42 @@ - - - + + + + - - + + + - - - + + + + + + + - - - - + - - + + + - - - - + + +
  A  
  G  
-
  R  
-		zButton (zen::gui)   zRandom (zen::util)   
zConcavePolygon (zen::gfx)   zRenderer (zen::gfxcore)   
aabb_t (zen::math)   glyph_t (zen::gui)   rect_t (zen::math)   zEffect (zen::gfx)   zRenderTarget (zen::gfx)   
zAudio2D::ALData (zen::sfx)   glyph_t (zen)   
  S  
-		zEntity (zen::obj)   zScene (zen::gfx)   
mouse_t (zen::evt)   zAsset (zen::asset)   zOption (zen::util)   
  P  
+		zAssetManager (zen::asset)   zParser (zen::util)   
aabb_t (zen::math)   gBullet   zAudio2D (zen::sfx)   zPolygon (zen::gfx)   
zAudio2D::ALData (zen::sfx)   glyph_t (zen::gui)   PongPacket   zAudioManager (zen::sfx)   zQuad (zen::gfx)   
  B  
-
  I  
-		zEventHandler (zen::evt)   zSettings (zen::util)   
spawn_t (zen::lvl)   zFileParser (zen::util)   zShader (zen::gfxcore)   
bbox_t (zen::obj)   ICMPHeader (zen::net)   
  V  
-		zFont (zen::gui)   zShaderSet (zen::gfxcore)   
glyph_t (zen)   
  R  
+		zButton (zen::gui)   zRandom (zen::util)   
gWorld   zConcavePolygon (zen::gfx)   zRenderer (zen::gfxcore)   
bbox_t (zen::obj)   
  I  
+		rect_t (zen::math)   zEffect (zen::gfx)   zRenderTarget (zen::gfx)   
  C  
-		IPHeader (zen::net)   zFont (zen::gfx)   zSocket (zen::net)   
  K  
-		vector_t (zen::math)   zFontLibrary (zen::gui)   zSorter (zen::gfxcore)   
CFontAtlas (zen::gui)   vertex_t (zen::gfxcore)   zGLSubsystem (zen::gfxcore)   zSubsystem (zen)   
circle_t (zen::obj)   key_t (zen::evt)   
  X  
+
  S  
+		zEntity (zen::obj)   zScene (zen::gfx)   
ICMPHeader (zen::net)   zEventHandler (zen::evt)   zSettings (zen::util)   
CFontAtlas (zen::gui)   IPHeader (zen::net)   spawn_t (zen::lvl)   zFileParser (zen::util)   zShader (zen::gfxcore)   
circle_t (zen::obj)   
  K  
+
  V  
+		zFont (zen::gfx)   zShaderSet (zen::gfxcore)   
circle_t (zen::math)   zFont (zen::gui)   zSocket (zen::net)   
color3f_t (zen)   key_t (zen::evt)   vector_t (zen::math)   zFontLibrary (zen::gui)   zSorter (zen::gfxcore)   
color4f_t (zen)   
  L  
+		vertex_t (zen::gfxcore)   zGLSubsystem (zen::gfxcore)   zSubsystem (zen)   
cquery_t (zen::math)   
  X  
zLevelLoader (zen::lvl)   zTexture (zen::gfxcore)   
circle_t (zen::math)   
  L  
-		zLight (zen::gfx)   zTimer (zen::util)   
color3f_t (zen)   XMLNode (zen::util)   zLog (zen::util)   zVector (zen::math)   
color4f_t (zen)   level_t (zen::lvl)   
  Z  
-		zLua (zen::lua)   zVertexArray (zen::gfxcore)   
CSound2D (zen::sfx)   
  M  
-		zMaterial (zen::gfx)   zWindow (zen::gfx)   
CSound2D (zen::sfx)   level_t (zen::lvl)   zLight (zen::gfx)   zTimer (zen::util)   
  D  
-		zAllocator (zen)   zMenu (zen::gui)   zXMLParser (zen::util)   
material_t (zen::obj)   zAnimation (zen::obj)   zMusic2D (zen::sfx)   
DrawBatch (zen::gfxcore)   matrix4x4_t (zen::math)   zAsset (zen::asset)   zOption (zen::util)   
  M  
+		XMLNode (zen::util)   zLog (zen::util)   zVector (zen::math)   
  Z  
+		zLua (zen::lua)   zVertexArray (zen::gfxcore)   
DrawBatch (zen::gfxcore)   material_t (zen::obj)   zMaterial (zen::gfx)   zWindow (zen::gfx)   
  E  
-		metalevel_t (zen::lvl)   zAssetManager (zen::asset)   zParser (zen::util)   
mouse_t (zen::evt)   zAudio2D (zen::sfx)   zPolygon (zen::gfx)   
event_t (zen::evt)   
  P  
-		zAudioManager (zen::sfx)   zQuad (zen::gfx)   
PongPacket   
matrix4x4_t (zen::math)   zAllocator (zen)   zMenu (zen::gui)   zXMLParser (zen::util)   
metalevel_t (zen::lvl)   zAnimation (zen::obj)   zMusic2D (zen::sfx)   
event_t (zen::evt)   
A | B | C | D | E | G | I | K | L | M | P | R | S | V | X | Z
diff --git a/docs/classg_bullet.html b/docs/classg_bullet.html new file mode 100644 index 00000000..0b06f90a --- /dev/null +++ b/docs/classg_bullet.html @@ -0,0 +1,416 @@ + + + + + + +Zenderer Engine: gBullet Class Reference + + + + + + + + + + + + + +
+
+ + + + + + +
+
Zenderer Engine +  5.0.0-alpha +
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
+
+
+ + + + + +
+
+ +
+
+
+ +
+ + + + +
+ +
+ +
+
+Public Member Functions
+
+
gBullet Class Reference
+
+
+ + + + + + + + + + + + + + + + + + + +

+Public Member Functions

 gBullet (gfx::zScene &Scene, asset::zAssetManager &Assets, const real_t startx, const real_t starty, const real_t endx, const real_t endy)
 
 ~gBullet ()
 
void Update ()
 
void SetRate (const real_t dx, const real_t dy)
 
const math::vector_t & GetRate () const
 
real_t GetX () const
 
real_t GetY () const
 
template<typename T >
bool Collides (const T &t, math::cquery_t *poi=nullptr) const
 
+

Detailed Description

+
+

Definition at line 15 of file LevelTest.cpp.

+

Constructor & Destructor Documentation

+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
gBullet::gBullet (gfx::zScene & Scene,
asset::zAssetManager & Assets,
const real_t startx,
const real_t starty,
const real_t endx,
const real_t endy 
)
+ 		+inline
+
+ +

Definition at line 18 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
gBullet::~gBullet ()
+ 		+inline
+
+ +

Definition at line 31 of file LevelTest.cpp.

+ +
+
+

Member Function Documentation

+ +
+
+ + + + + +
+ + + + + + + +
void gBullet::Update ()
+ 		+inline
+
+ +

Definition at line 36 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
void gBullet::SetRate (const real_t dx,
const real_t dy 
)
+ 		+inline
+
+ +

Definition at line 41 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
const math::vector_t& gBullet::GetRate () const
+ 		+inline
+
+ +

Definition at line 47 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
real_t gBullet::GetX () const
+ 		+inline
+
+ +

Definition at line 52 of file LevelTest.cpp.

+ +
+
+ +
+
+ + + + + +
+ + + + + + + +
real_t gBullet::GetY () const
+ 		+inline
+
+ +

Definition at line 53 of file LevelTest.cpp.

+ +
+
+ +
+
+
+template<typename T >
+ + + + + +
+ + + + + + + + + + + + + + + + + + +
bool gBullet::Collides (const T & t,
math::cquery_t * poi = nullptr 
) const
+ 		+inline
+
+ +

Definition at line 56 of file LevelTest.cpp.

+ +
+
+
The documentation for this class was generated from the following file: +
+
+ + + + diff --git a/docs/classg_bullet.js b/docs/classg_bullet.js new file mode 100644 index 00000000..8d7535a3 --- /dev/null +++ b/docs/classg_bullet.js @@ -0,0 +1,11 @@ +var classg_bullet = +[ + [ "gBullet", "classg_bullet.html#ace82350a968fa10022480fd362599f19", null ], + [ "~gBullet", "classg_bullet.html#a42a81cc48419d52e17d3a7b68ebc3f6a", null ], + [ "Update", "classg_bullet.html#a99b2ce1395234c6d9b8b0c979d541084", null ], + [ "SetRate", "classg_bullet.html#ab1c1f6e32fc563c7fd13497387da1b6d", null ], + [ "GetRate", "classg_bullet.html#a910af94772488e88054a93143aaccdb8", null ], + [ "GetX", "classg_bullet.html#a494c1047a643846d40f577bccb7bf773", null ], + [ "GetY", "classg_bullet.html#a40c02599fddd70e6a7589275bd044e6a", null ], + [ "Collides", "classg_bullet.html#a635a3488c596cf55141d416491fa44c4", null ] +]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_triangle_quad.html b/docs/classg_world.html similarity index 55% rename from docs/classzen_1_1gfx_1_1_c_triangle_quad.html rename to docs/classg_world.html index 311a57cb..7e01b2f5 100644 --- a/docs/classzen_1_1gfx_1_1_c_triangle_quad.html +++ b/docs/classg_world.html @@ -4,7 +4,7 @@ -Zenderer Engine: zen::gfx::CTriangleQuad Class Reference +Zenderer Engine: gWorld Class Reference @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@
@@ -108,39 +108,33 @@
+Data Structures | Public Member Functions
-
zen::gfx::CTriangleQuad Class Reference
+
gWorld Class Reference
- -

A basic three-vertex primitive. -

- -

#include "Triangle.hpp"

- - - - - - - - - - - - - - + + + + + + + + + + + +

Public Member Functions

 CTriangle (asset::CAssetManager &Mgr, const math::vector_t &A, const math::vector_t &B, const math::vector_t &C)
 
 CTriangle (const CTriangle &Copy)
 
CTriangle & operator= (const CTriangle &Copy)
 
 ~CTriangle ()
 
virtual CDrawable & Create ()
 
uint16_t GetW () const
 
uint16_t GetH () const
 
 gWorld (const gfx::zWindow &W, asset::zAssetManager &Assets, gfx::zScene &Scene)
 
 ~gWorld ()
 
bool LoadLevel (lvl::level_t level)
 
void Update ()
 
void Render ()
 
void HandleEvent (const evt::event_t &Evt)
 

Detailed Description

-

Definition at line 35 of file Triangle.hpp.

+

Definition at line 65 of file LevelTest.cpp.

Constructor & Destructor Documentation

- +
@@ -148,54 +142,22 @@ - - -
- + - - - -
zen::gfx::CTriangleQuad::~CTriangle gWorld::gWorld ()
- 		-inline
-
- -

Definition at line 63 of file Triangle.hpp.

- -
-
-

Member Function Documentation

- -
-
- - - @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -242,7 +242,7 @@
- - - - - - + + - - + + - - - - - - - - + + @@ -210,11 +172,11 @@

Member Function Documentation

zen::gfx::CTriangleQuad::CTriangle (asset::CAssetManager & Mgr, const gfx::zWindow & W,
const math::vector_t & A, asset::zAssetManager & Assets,
const math::vector_t & B,
const math::vector_t & C gfx::zScene & Scene 
-

Definition at line 38 of file Triangle.hpp.

+

Definition at line 82 of file LevelTest.cpp.

- +
@@ -222,10 +184,9 @@

Member Function Documentation

- + - - +
zen::gfx::CTriangleQuad::CTriangle gWorld::~gWorld (const CTriangle & Copy))
@@ -236,11 +197,12 @@

Member Function Documentation

-

Definition at line 51 of file Triangle.hpp.

+

Definition at line 119 of file LevelTest.cpp.

- +

Member Function Documentation

+
@@ -248,10 +210,10 @@

Member Function Documentation

- + - - + +
CTriangle& zen::gfx::CTriangleQuad::operator= bool gWorld::LoadLevel (const CTriangle & Copy)lvl::level_t level)
@@ -262,11 +224,11 @@

Member Function Documentation

-

Definition at line 56 of file Triangle.hpp.

+

Definition at line 121 of file LevelTest.cpp.

- +
@@ -274,7 +236,7 @@

Member Function Documentation

+inline
- + @@ -282,16 +244,16 @@

Member Function Documentation

virtual CDrawable& zen::gfx::CTriangleQuad::Create void gWorld::Update ( )
-inlinevirtual
-

Definition at line 65 of file Triangle.hpp.

+

Definition at line 140 of file LevelTest.cpp.

- +
@@ -299,10 +261,10 @@

Member Function Documentation

@@ -312,11 +274,11 @@

Member Function Documentation

- + - +
uint16_t zen::gfx::CTriangleQuad::GetW void gWorld::Render ( ) const
-

Definition at line 88 of file Triangle.hpp.

+

Definition at line 242 of file LevelTest.cpp.

- +
@@ -324,10 +286,11 @@

Member Function Documentation

@@ -337,19 +300,19 @@

Member Function Documentation

- + - - + + +
uint16_t zen::gfx::CTriangleQuad::GetH void gWorld::HandleEvent () constconst evt::event_t & Evt)
-

Definition at line 89 of file Triangle.hpp.

+

Definition at line 294 of file LevelTest.cpp.

The documentation for this class was generated from the following file:
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
-

Definition at line 18 of file Asset.cpp.

+

Definition at line 19 of file Asset.cpp.

@@ -338,7 +338,7 @@

Member Function Documentation

Reimplemented in zen::gui::zFont.

-

Definition at line 20 of file Asset.cpp.

+

Definition at line 21 of file Asset.cpp.

@@ -449,7 +449,7 @@

Member Function Documentation

- +

@@ -508,7 +508,7 @@

Member Function Documentation

- +

@@ -567,7 +567,7 @@

Member Function Documentation

- +

@@ -628,7 +628,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.map index 4f257567..0067874a 100644 --- a/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.map @@ -1,21 +1,22 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.png index a027d7c5..2f0c1810 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_a23948cdca1812c8fc2bed8a5bf3067e2_icgraph.png differ diff --git a/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.map index 0e329943..9cc59d55 100644 --- a/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.map @@ -1,32 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.png index 95d8df5a..9fdb0084 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_a272c6b1163fad9b7aa5df9192ab862dc_icgraph.png differ diff --git a/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.map index 0f10dafd..cd657aff 100644 --- a/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.map @@ -1,31 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.png index 1c85915e..fe3a91a6 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_aa5ad61f44c4b01ed925ae0a1b3ada59d_icgraph.png differ diff --git a/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.map index a095f594..a69056aa 100644 --- a/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.map @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.png index 0b65d4a4..6c80310c 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_aed9c3604b827aa73ad9421bf64ece2dc_icgraph.png differ diff --git a/docs/classzen_1_1asset_1_1z_asset_manager.html b/docs/classzen_1_1asset_1_1z_asset_manager.html index 2f347ab5..3c8d0a1e 100644 --- a/docs/classzen_1_1asset_1_1z_asset_manager.html +++ b/docs/classzen_1_1asset_1_1z_asset_manager.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -299,7 +299,7 @@

Member Function Documentation

- +

@@ -389,7 +389,7 @@

Member Function Documentation

- +

@@ -535,7 +535,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.map index 2977d52f..d5caa513 100644 --- a/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.png index c0ba0d29..9243db57 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_manager_a83227603026afec3fc44725a4ca51d2c_icgraph.png differ diff --git a/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.map index 44060e44..77b478cc 100644 --- a/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.map @@ -1,32 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.png index cdc57a6e..8cc6c07d 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_manager_a913db0d2386a2a6d70ac7f14bc87d350_icgraph.png differ diff --git a/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.map b/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.map index 3a7fcabc..fae5bd4d 100644 --- a/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.map +++ b/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.png b/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.png index a190834e..9c92978e 100644 Binary files a/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.png and b/docs/classzen_1_1asset_1_1z_asset_manager_ad791ccc91a922bd82bf6a011feee3ed7_icgraph.png differ diff --git a/docs/classzen_1_1evt_1_1_c_event_handler.html b/docs/classzen_1_1evt_1_1_c_event_handler.html deleted file mode 100644 index 081c9052..00000000 --- a/docs/classzen_1_1evt_1_1_c_event_handler.html +++ /dev/null @@ -1,476 +0,0 @@ - - - - - - -Zenderer Engine: zen::evt::CEventHandler Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::evt::CEventHandler Class Reference
Events
-
-
- -

#include "EventHandler.hpp"

- - - - - - - -

-Public Member Functions

 ~CEventHandler ()
 
bool PopEvent (event_t &Evt)
 Removes the latest event from the stack and stores it in the parameter. More...
 
- - - - - - - - - - - - - - - - - - - -

-Static Public Member Functions

static bool PollEvents ()
 Registers all pending events into the interal stack. More...
 
static CEventHandler & GetInstance ()
 Retrieves the singleton instance of the event handler. More...
 
static void CharacterCallback (GLFWwindow *, unsigned int c)
 OS-callback for printable characters. More...
 
static void KeyboardCallback (GLFWwindow *, int key, int scancode, int action, int mods)
 OS-callback for any keyboard events. More...
 
static void MouseMotionCallback (GLFWwindow *, double x, double y)
 OS-callback for mouse movements. More...
 
static void MouseCallback (GLFWwindow *, int button, int action, int mods)
 OS-callback for mouse-click events. More...
 
-

Detailed Description

-

This singleton class instance handles system-wide event occurences during the application's run-time. It does not do anything with these events, merely providing the user with an interface to poll them and handle them as they see fit.

-
Todo:
Window events / callback.
-
Examples:
Events.
-
-

Definition at line 41 of file EventHandler.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
CEventHandler::~CEventHandler ()
-
- -

Definition at line 8 of file EventHandler.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CEventHandler::PollEvents ()
- 		-static
-
-
Examples:
Events.
-
-

Definition at line 13 of file EventHandler.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CEventHandler::PopEvent (event_t & Evt)
-
-

This will pop an event from the internal event stack and store it in the parameter that you passed, tossing out any existing event data that may have been stored in it.

-
Parameters
- - -
EvtEvent structure to store latest even in
-
-
-
Returns
true if an event was loaded, false if there are none remaining.
-
Examples:
Events.
-
-

Definition at line 19 of file EventHandler.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
CEventHandler & CEventHandler::GetInstance ()
- 		-static
-
-
Examples:
Events.
-
-

Definition at line 28 of file EventHandler.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
void CEventHandler::CharacterCallback (GLFWwindow * ,
unsigned int c 
)
- 		-static
-
- -

Definition at line 76 of file EventHandler.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CEventHandler::KeyboardCallback (GLFWwindow * ,
int key,
int scancode,
int action,
int mods 
)
- 		-static
-
- -

Definition at line 34 of file EventHandler.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
void CEventHandler::MouseMotionCallback (GLFWwindow * ,
double x,
double y 
)
- 		-static
-
- -

Definition at line 49 of file EventHandler.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void CEventHandler::MouseCallback (GLFWwindow * ,
int button,
int action,
int mods 
)
- 		-static
-
- -

Definition at line 60 of file EventHandler.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1evt_1_1_c_event_handler.js b/docs/classzen_1_1evt_1_1_c_event_handler.js deleted file mode 100644 index 07a39137..00000000 --- a/docs/classzen_1_1evt_1_1_c_event_handler.js +++ /dev/null @@ -1,11 +0,0 @@ -var classzen_1_1evt_1_1_c_event_handler = -[ - [ "~CEventHandler", "classzen_1_1evt_1_1_c_event_handler.html#a41b6924a33472d04cee2fe3e90cc6acc", null ], - [ "PollEvents", "classzen_1_1evt_1_1_c_event_handler.html#aedcb2bd358877b73cc570b152dda9ff3", null ], - [ "PopEvent", "classzen_1_1evt_1_1_c_event_handler.html#a0f768c22198232baecef88d67fc67380", null ], - [ "GetInstance", "classzen_1_1evt_1_1_c_event_handler.html#a604fccd27dc61f6071d4099547fbe680", null ], - [ "CharacterCallback", "classzen_1_1evt_1_1_c_event_handler.html#a25909c31ff2622cfdc20c1d9ea329794", null ], - [ "KeyboardCallback", "classzen_1_1evt_1_1_c_event_handler.html#a3e0b4a53daf0295d96be1437df1cb0c9", null ], - [ "MouseMotionCallback", "classzen_1_1evt_1_1_c_event_handler.html#a4557e6aab25904ba47f68c6ff0d5e52c", null ], - [ "MouseCallback", "classzen_1_1evt_1_1_c_event_handler.html#a39bd2b465b55b1aa00a268285e5d4d24", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1evt_1_1_c_event_handler_a0f768c22198232baecef88d67fc67380_icgraph.map b/docs/classzen_1_1evt_1_1_c_event_handler_a0f768c22198232baecef88d67fc67380_icgraph.map deleted file mode 100644 index 33bc493f..00000000 --- a/docs/classzen_1_1evt_1_1_c_event_handler_a0f768c22198232baecef88d67fc67380_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1evt_1_1_c_event_handler_a0f768c22198232baecef88d67fc67380_icgraph.png b/docs/classzen_1_1evt_1_1_c_event_handler_a0f768c22198232baecef88d67fc67380_icgraph.png deleted file mode 100644 index 1a4dba4a..00000000 Binary files a/docs/classzen_1_1evt_1_1_c_event_handler_a0f768c22198232baecef88d67fc67380_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1evt_1_1_c_event_handler_a604fccd27dc61f6071d4099547fbe680_icgraph.map b/docs/classzen_1_1evt_1_1_c_event_handler_a604fccd27dc61f6071d4099547fbe680_icgraph.map deleted file mode 100644 index 502bc6d4..00000000 --- a/docs/classzen_1_1evt_1_1_c_event_handler_a604fccd27dc61f6071d4099547fbe680_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1evt_1_1_c_event_handler_a604fccd27dc61f6071d4099547fbe680_icgraph.png b/docs/classzen_1_1evt_1_1_c_event_handler_a604fccd27dc61f6071d4099547fbe680_icgraph.png deleted file mode 100644 index a8b5990d..00000000 Binary files a/docs/classzen_1_1evt_1_1_c_event_handler_a604fccd27dc61f6071d4099547fbe680_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1evt_1_1_c_event_handler_aedcb2bd358877b73cc570b152dda9ff3_icgraph.map b/docs/classzen_1_1evt_1_1_c_event_handler_aedcb2bd358877b73cc570b152dda9ff3_icgraph.map deleted file mode 100644 index 42da211c..00000000 --- a/docs/classzen_1_1evt_1_1_c_event_handler_aedcb2bd358877b73cc570b152dda9ff3_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1evt_1_1_c_event_handler_aedcb2bd358877b73cc570b152dda9ff3_icgraph.png b/docs/classzen_1_1evt_1_1_c_event_handler_aedcb2bd358877b73cc570b152dda9ff3_icgraph.png deleted file mode 100644 index 2d09b37c..00000000 Binary files a/docs/classzen_1_1evt_1_1_c_event_handler_aedcb2bd358877b73cc570b152dda9ff3_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1evt_1_1z_event_handler.html b/docs/classzen_1_1evt_1_1z_event_handler.html index ee34c813..ceacbefc 100644 --- a/docs/classzen_1_1evt_1_1z_event_handler.html +++ b/docs/classzen_1_1evt_1_1z_event_handler.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -203,7 +203,7 @@

Member Function Documentation

- +

@@ -239,7 +239,7 @@

Member Function Documentation

- +

@@ -274,7 +274,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.map b/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.map index 0a65ab70..9bd9381c 100644 --- a/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.map +++ b/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.png b/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.png index 2d8a1d7d..c6c30c59 100644 Binary files a/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.png and b/docs/classzen_1_1evt_1_1z_event_handler_a40db94c470b9c7408345cf68c3f5103d_icgraph.png differ diff --git a/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.map b/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.map index 03b978fc..e690a165 100644 --- a/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.map +++ b/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.png b/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.png index 34d1c8ef..504e8883 100644 Binary files a/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.png and b/docs/classzen_1_1evt_1_1z_event_handler_a4cf62909dfc2748816282abde1e4486a_icgraph.png differ diff --git a/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.map b/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.map index 524bb26e..3e682c66 100644 --- a/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.map +++ b/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.png b/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.png index 86a3abf9..1b230f1f 100644 Binary files a/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.png and b/docs/classzen_1_1evt_1_1z_event_handler_aa31fa6c30c9b57a2ac6ab1606ca02797_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect.html b/docs/classzen_1_1gfx_1_1_c_effect.html deleted file mode 100644 index 1d7cdbb4..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect.html +++ /dev/null @@ -1,865 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CEffect Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Friends
-
-
zen::gfx::CEffect Class Reference
Graphics
-
-
- -

A high-level shader wrapper. - More...

- -

#include "Effect.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CEffect (const EffectType Type, asset::CAssetManager &Assets)
 
 ~CEffect ()
 
 CEffect (const CEffect &Copy)
 Shallow-copy the shader references and other metadata. More...
 
CEffect & operator= (const CEffect &Copy)
 
bool Init ()
 
bool Destroy ()
 
bool SetParameter (const string_t &name, const real_t *pValues, const size_t count=1)
 Modifies the effect based on a certain parameter. More...
 
bool SetParameter (const string_t &name, const int *pValues, const size_t count=1)
 
bool SetParameter (const string_t &name, const math::matrix4x4_t &Matrix)
 Modifies a matrix parameter in the effect. More...
 
bool Enable () const
 A more user-friendly alias for binding. More...
 
bool Disable () const
 A more user-friendly alias for unbinding. More...
 
GLuint GetObjectHandle () const
 
const string_t & GetError () const
 
EffectType GetType () const
 
uint16_t GetID () const
 
void SetType (const EffectType Type)
 
- Public Member Functions inherited from zen::gfxcore::CGLSubsystem
 CGLSubsystem (const string_t name="OpenGL")
 
virtual ~CGLSubsystem ()
 
bool IsInit ()
 
virtual const string_t & GetName () const
 
- - - -

-Friends

class ZEN_API CMaterial
 
- - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::gfxcore::CGLSubsystem
bool m_init
 
-

Detailed Description

-

This class is very similar to the gfxcore::CShaderSet class, but creates a more user-friendly interface

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EnumerationShadersDescriptionParameters
NO_EFFECT
Default.vs
Default.fs
Default rendering shader
GAUSSIAN_BLUR_H
GaussianBlur.vs
GaussianBlurH.fs
 - Vertical Gaussian blur effect
This should be used in a multi-pass - combination with
GAUSSIAN_BLUR_V for optimal output - 		- - - - - -
radiusThe blur radius,
between [0.0, 1.0]
- 
GAUSSIAN_BLUR_H
GaussianBlur.vs
GaussianBlurV.fs
 - Horizontal Gaussian blur effect
This should be used in a - multi-pass with
GAUSSIAN_BLUR_H for optimal output - 		- - - - - -
radiusThe blur radius,
between [0.0, 1.0]
- 
GRAYSCALE
Default.vs
Grayscale.fs
 - Converts all colors to grayscale using NTSC weights
- They are (0.299, 0.587, 0.114) - 		n/a
SPRITESHEET
Default.vs
SpriteSheet.fs
 - Renders a texture using an offset, thus only rendering a - portion of it. Useful for sprite sheets and other texture atlases. - The size of the texture rendered will match the size of your sprite, - and tiling / stretching is impossible. - - - - - - -
offsetThe offset, in pixels, with which to render the texture.
- 
FADE
Default.vs
Fade.fs
 - Applies a weight to all of the colors to darken or lighten,
- simulating a fading effect. - 		- - - - - -
alphaThe fade level. 0.0 is fully faded to black.
- 
RIPPLE
Default.vs
Ripple.fs
Simulates a water ripple effect on a texture. - - - - - - - - - -
timeThe total time elapsed
rate The rate at which to ripple
-
- -

Definition at line 59 of file Effect.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
CEffect::CEffect (const EffectType Type,
asset::CAssetManager & Assets 
)
-
- -

Definition at line 11 of file Effect.cpp.

- -
-
- -
-
- - - - - - - -
CEffect::~CEffect ()
-
- -

Definition at line 18 of file Effect.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
zen::gfx::CEffect::CEffect (const CEffect & Copy)
- 		-inline
-
- -

Definition at line 66 of file Effect.hpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
CEffect& zen::gfx::CEffect::operator= (const CEffect & Copy)
- 		-inline
-
- -

Definition at line 72 of file Effect.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CEffect::Init ()
- 		-virtual
-
-
Todo:

Use Gaussian Blur vertex shaders.

-

Add logging for shader type in Release builds.

-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 23 of file Effect.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CEffect::Destroy ()
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 111 of file Effect.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool zen::gfx::CEffect::SetParameter (const string_t & name,
const real_t * pValues,
const size_t count = 1 
)
-
-

The parameter name must directly correspond to the uniform variable name found in the respective effect shader file.

-

There are multiple overloads to support a variety of parameter types and value combinations.

-

Regardless of whether or not real_t is defined as a float or a double, GLSL only deals with single-precision uniform values.

-
Parameters
- - - - -
nameParameter name
pValuesArray of values of type T (or single)
countAmount of values passed (optional=1)
-
-
-
Returns
true if the parameter was found for the effect false if the effect was not loaded.
- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool zen::gfx::CEffect::SetParameter (const string_t & name,
const int * pValues,
const size_t count = 1 
)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool CEffect::SetParameter (const string_t & name,
const math::matrix4x4_t & Matrix 
)
-
-

The behavior of this method is identical to that of SetParameter(), but it modifies a matrix instead of a primitive type (int, float, ...)

-
Parameters
- - - -
nameName of matrix parameter
MatrixMatrix value to send to effect
-
-
-
Returns
true if the parameter was found and set, false otherwise.
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 176 of file Effect.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CEffect::Enable () const
- 		-inline
-
- -

Definition at line 2 of file Effect.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CEffect::Disable () const
- 		-inline
-
- -

Definition at line 7 of file Effect.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
GLuint CEffect::GetObjectHandle () const
- 		-inlinevirtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 22 of file Effect.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const string_t & CEffect::GetError () const
- 		-inline
-
- -

Definition at line 12 of file Effect.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
EffectType zen::gfx::CEffect::GetType () const
- 		-inline
-
- -

Definition at line 136 of file Effect.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CEffect::GetID () const
- 		-inline
-
- -

Definition at line 137 of file Effect.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CEffect::SetType (const EffectType Type)
- 		-inline
-
- -

Definition at line 17 of file Effect.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-

Friends And Related Function Documentation

- -
-
- - - - - -
- - - - -
friend class ZEN_API CMaterial
- 		-friend
-
- -

Definition at line 139 of file Effect.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect.js b/docs/classzen_1_1gfx_1_1_c_effect.js deleted file mode 100644 index 0457325f..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect.js +++ /dev/null @@ -1,20 +0,0 @@ -var classzen_1_1gfx_1_1_c_effect = -[ - [ "CEffect", "classzen_1_1gfx_1_1_c_effect.html#a4648bf7823c70225604f25e2b4a5f6f5", null ], - [ "~CEffect", "classzen_1_1gfx_1_1_c_effect.html#a82e0afb2d8f454d9490b1663b84053b2", null ], - [ "CEffect", "classzen_1_1gfx_1_1_c_effect.html#a16614fbdc75217cb1bfecf29d7d6241c", null ], - [ "operator=", "classzen_1_1gfx_1_1_c_effect.html#a2e742e7db4b9fa9371337104626e700d", null ], - [ "Init", "classzen_1_1gfx_1_1_c_effect.html#a50e90b0eca7a078c18d25bf910832674", null ], - [ "Destroy", "classzen_1_1gfx_1_1_c_effect.html#aa78b99ce0be0433057d464fad264eaa0", null ], - [ "SetParameter", "classzen_1_1gfx_1_1_c_effect.html#aebfa8bad8c99a5d5b737258827424c41", null ], - [ "SetParameter", "classzen_1_1gfx_1_1_c_effect.html#a5e6477b503b4d9b67e4786120fa453e4", null ], - [ "SetParameter", "classzen_1_1gfx_1_1_c_effect.html#a4e72b52073995c9449a224a8000a7452", null ], - [ "Enable", "classzen_1_1gfx_1_1_c_effect.html#a55724770ecc469bc576fbc2edd402432", null ], - [ "Disable", "classzen_1_1gfx_1_1_c_effect.html#ac4d46b32f3c12853f2ff38f3e2f9c831", null ], - [ "GetObjectHandle", "classzen_1_1gfx_1_1_c_effect.html#a7b8c9a5bf841f2f8e81b6b4e3b3cb8c9", null ], - [ "GetError", "classzen_1_1gfx_1_1_c_effect.html#a3238e4b5c27c7d88f5b1cd4a5387d448", null ], - [ "GetType", "classzen_1_1gfx_1_1_c_effect.html#a0b2b3e9fb37b848b92f9991de69479be", null ], - [ "GetID", "classzen_1_1gfx_1_1_c_effect.html#af44d97ae520e8e360a35ccf60ff2fe13", null ], - [ "SetType", "classzen_1_1gfx_1_1_c_effect.html#ad158fce4d64e9b0c1193733f2287db78", null ], - [ "CMaterial", "classzen_1_1gfx_1_1_c_effect.html#a0b4556cbcbc88cbe9ec08c9f5b372880", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_effect_a0b2b3e9fb37b848b92f9991de69479be_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_a0b2b3e9fb37b848b92f9991de69479be_icgraph.map deleted file mode 100644 index d3ff50f1..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_a0b2b3e9fb37b848b92f9991de69479be_icgraph.map +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_a0b2b3e9fb37b848b92f9991de69479be_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_a0b2b3e9fb37b848b92f9991de69479be_icgraph.png deleted file mode 100644 index 48e4a0a9..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_a0b2b3e9fb37b848b92f9991de69479be_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect_a50e90b0eca7a078c18d25bf910832674_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_a50e90b0eca7a078c18d25bf910832674_icgraph.map deleted file mode 100644 index fcf938fc..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_a50e90b0eca7a078c18d25bf910832674_icgraph.map +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_a50e90b0eca7a078c18d25bf910832674_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_a50e90b0eca7a078c18d25bf910832674_icgraph.png deleted file mode 100644 index 9d1b2175..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_a50e90b0eca7a078c18d25bf910832674_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect_a55724770ecc469bc576fbc2edd402432_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_a55724770ecc469bc576fbc2edd402432_icgraph.map deleted file mode 100644 index 36ca2ef9..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_a55724770ecc469bc576fbc2edd402432_icgraph.map +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_a55724770ecc469bc576fbc2edd402432_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_a55724770ecc469bc576fbc2edd402432_icgraph.png deleted file mode 100644 index 5e9861b2..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_a55724770ecc469bc576fbc2edd402432_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect_aa78b99ce0be0433057d464fad264eaa0_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_aa78b99ce0be0433057d464fad264eaa0_icgraph.map deleted file mode 100644 index dfcfda9e..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_aa78b99ce0be0433057d464fad264eaa0_icgraph.map +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_aa78b99ce0be0433057d464fad264eaa0_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_aa78b99ce0be0433057d464fad264eaa0_icgraph.png deleted file mode 100644 index a0c3e374..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_aa78b99ce0be0433057d464fad264eaa0_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect_ac4d46b32f3c12853f2ff38f3e2f9c831_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_ac4d46b32f3c12853f2ff38f3e2f9c831_icgraph.map deleted file mode 100644 index 0f9a2b2a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_ac4d46b32f3c12853f2ff38f3e2f9c831_icgraph.map +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_ac4d46b32f3c12853f2ff38f3e2f9c831_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_ac4d46b32f3c12853f2ff38f3e2f9c831_icgraph.png deleted file mode 100644 index 33eca726..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_ac4d46b32f3c12853f2ff38f3e2f9c831_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect_ad158fce4d64e9b0c1193733f2287db78_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_ad158fce4d64e9b0c1193733f2287db78_icgraph.map deleted file mode 100644 index 5f0f4e6d..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_ad158fce4d64e9b0c1193733f2287db78_icgraph.map +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_ad158fce4d64e9b0c1193733f2287db78_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_ad158fce4d64e9b0c1193733f2287db78_icgraph.png deleted file mode 100644 index 1b5a5bec..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_ad158fce4d64e9b0c1193733f2287db78_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_effect_aebfa8bad8c99a5d5b737258827424c41_icgraph.map b/docs/classzen_1_1gfx_1_1_c_effect_aebfa8bad8c99a5d5b737258827424c41_icgraph.map deleted file mode 100644 index 71b3939e..00000000 --- a/docs/classzen_1_1gfx_1_1_c_effect_aebfa8bad8c99a5d5b737258827424c41_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_effect_aebfa8bad8c99a5d5b737258827424c41_icgraph.png b/docs/classzen_1_1gfx_1_1_c_effect_aebfa8bad8c99a5d5b737258827424c41_icgraph.png deleted file mode 100644 index e61da18a..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_effect_aebfa8bad8c99a5d5b737258827424c41_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light.html b/docs/classzen_1_1gfx_1_1_c_light.html deleted file mode 100644 index 8412e06d..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light.html +++ /dev/null @@ -1,678 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CLight Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfx::CLight Class Reference
Graphics
-
-
- -

Represents a light object acting on a graphical scene. - More...

- -

#include "Light.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CLight (asset::CAssetManager &m_Assets, const LightType &Type, const uint16_t window_h)
 Constructs a light instance. More...
 
 ~CLight ()
 
bool Init ()
 
bool IsInit () const
 
bool Enable () const
 
bool Disable () const
 
void Adjust (const real_t dx, const real_t dy)
 
bool SetBrightness (const real_t brightness)
 
bool SetColor (const real_t r, const real_t g, const real_t b)
 
bool SetColor (const color3f_t &Color)
 
bool SetAttenuation (const real_t c, const real_t l, const real_t q)
 
bool SetAttenuation (const math::vector_t &Att)
 
bool SetPosition (const real_t x, const real_t y)
 
bool SetPosition (const math::vector_t &Pos)
 
bool SetMaximumAngle (const real_t degrees)
 
bool SetMinimumAngle (const real_t degrees)
 
real_t GetBrightness () const
 
const color3f_t & GetColor () const
 
const math::vector_t & GetPosition () const
 
-

Detailed Description

-

Each lighting type has its own special variables and parameters that can be modified and accessed. See the raw shader files to learn the specific parameter names, or the specification here.

-
Todo:
Investigate why the scr_height shader parameter is necessary.
- -

Definition at line 43 of file Light.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
CLight::CLight (asset::CAssetManager & m_Assets,
const LightType & Type,
const uint16_t window_h 
)
-
-

The window height is required for the shader to perform some weird offset calculations that would otherwise give bad results in terms of light positioning.

-
Parameters
- - - - -
m_AssetsThe asset manager to make the effect from
TypeThe light type you want
window_hThe height of the OpenGL context
-
-
- -

Definition at line 15 of file Light.cpp.

- -
-
- -
-
- - - - - - - -
CLight::~CLight ()
-
- -

Definition at line 25 of file Light.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - -
bool CLight::Init ()
-
- -

Definition at line 30 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool zen::gfx::CLight::IsInit () const
-
- -
-
- -
-
- - - - - - - -
bool CLight::Enable () const
-
- -

Definition at line 112 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CLight::Disable () const
-
- -

Definition at line 117 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void CLight::Adjust (const real_t dx,
const real_t dy 
)
-
- -

Definition at line 107 of file Light.cpp.

- -
-
- -
-
- - - - - - - - -
bool CLight::SetBrightness (const real_t brightness)
-
- -

Definition at line 122 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool CLight::SetColor (const real_t r,
const real_t g,
const real_t b 
)
-
- -

Definition at line 129 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CLight::SetColor (const color3f_t & Color)
-
- -

Definition at line 136 of file Light.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool CLight::SetAttenuation (const real_t c,
const real_t l,
const real_t q 
)
-
- -

Definition at line 141 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CLight::SetAttenuation (const math::vector_t & Att)
-
- -

Definition at line 148 of file Light.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool CLight::SetPosition (const real_t x,
const real_t y 
)
-
-
Todo:
Figure out why the 200px offset is necessary.
- -

Definition at line 154 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CLight::SetPosition (const math::vector_t & Pos)
-
- -

Definition at line 161 of file Light.cpp.

- -
-
- -
-
- - - - - - - - -
bool CLight::SetMaximumAngle (const real_t degrees)
-
- -

Definition at line 166 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CLight::SetMinimumAngle (const real_t degrees)
-
- -

Definition at line 175 of file Light.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
zen::real_t CLight::GetBrightness () const
-
- -

Definition at line 184 of file Light.cpp.

- -
-
- -
-
- - - - - - - -
const color3f_t & CLight::GetColor () const
-
- -

Definition at line 189 of file Light.cpp.

- -
-
- -
-
- - - - - - - -
const math::vector_t & CLight::GetPosition () const
-
- -

Definition at line 194 of file Light.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light.js b/docs/classzen_1_1gfx_1_1_c_light.js deleted file mode 100644 index eee6b774..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light.js +++ /dev/null @@ -1,22 +0,0 @@ -var classzen_1_1gfx_1_1_c_light = -[ - [ "CLight", "classzen_1_1gfx_1_1_c_light.html#adc1cb87199f57548ff303fb324ff08e1", null ], - [ "~CLight", "classzen_1_1gfx_1_1_c_light.html#aef6c25b7608cf6776c3a627c03f70ff2", null ], - [ "Init", "classzen_1_1gfx_1_1_c_light.html#adcbc2641c459f93aebd72f3ff99fa0df", null ], - [ "IsInit", "classzen_1_1gfx_1_1_c_light.html#ad9a41b61cf148dc434c47efb07b57339", null ], - [ "Enable", "classzen_1_1gfx_1_1_c_light.html#a0d5c3ae85e8081a181f101c01eac0672", null ], - [ "Disable", "classzen_1_1gfx_1_1_c_light.html#a50fa9064e9f4b80ecd0fed9a71675dcd", null ], - [ "Adjust", "classzen_1_1gfx_1_1_c_light.html#aa7e18f52464a03d93f33a860c0acea7c", null ], - [ "SetBrightness", "classzen_1_1gfx_1_1_c_light.html#a24bfab8d3bcea9b7505907f35ba58164", null ], - [ "SetColor", "classzen_1_1gfx_1_1_c_light.html#acd7fedd4318f0181319fa0a554de9462", null ], - [ "SetColor", "classzen_1_1gfx_1_1_c_light.html#a9829f650d6b5e7c498ad386587d7c2de", null ], - [ "SetAttenuation", "classzen_1_1gfx_1_1_c_light.html#a1fb0fca148f12193b681fbeca3e8ea27", null ], - [ "SetAttenuation", "classzen_1_1gfx_1_1_c_light.html#a94ac3bba22924c6b0417466007b3ff3d", null ], - [ "SetPosition", "classzen_1_1gfx_1_1_c_light.html#ae0e20c2400ebd02ba93d53aab025c6c4", null ], - [ "SetPosition", "classzen_1_1gfx_1_1_c_light.html#a5128a50da4d0be3710a65a555316269f", null ], - [ "SetMaximumAngle", "classzen_1_1gfx_1_1_c_light.html#a6c9fae4d974cb0a4012107b9753d6132", null ], - [ "SetMinimumAngle", "classzen_1_1gfx_1_1_c_light.html#a6d6ce70d7bdb8c94817c24fac3535719", null ], - [ "GetBrightness", "classzen_1_1gfx_1_1_c_light.html#afa076f90dc70323274703772f20313fa", null ], - [ "GetColor", "classzen_1_1gfx_1_1_c_light.html#a5307cfb44e32bed716045c1f7669ad37", null ], - [ "GetPosition", "classzen_1_1gfx_1_1_c_light.html#a2ccaeefc0115bd76e7284e97bd97738c", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_light_a0d5c3ae85e8081a181f101c01eac0672_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_a0d5c3ae85e8081a181f101c01eac0672_icgraph.map deleted file mode 100644 index 53a4d1dc..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_a0d5c3ae85e8081a181f101c01eac0672_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_a0d5c3ae85e8081a181f101c01eac0672_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_a0d5c3ae85e8081a181f101c01eac0672_icgraph.png deleted file mode 100644 index dd8cca3f..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_a0d5c3ae85e8081a181f101c01eac0672_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_a1fb0fca148f12193b681fbeca3e8ea27_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_a1fb0fca148f12193b681fbeca3e8ea27_icgraph.map deleted file mode 100644 index 48983e5c..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_a1fb0fca148f12193b681fbeca3e8ea27_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_a1fb0fca148f12193b681fbeca3e8ea27_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_a1fb0fca148f12193b681fbeca3e8ea27_icgraph.png deleted file mode 100644 index 89aa517d..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_a1fb0fca148f12193b681fbeca3e8ea27_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_a24bfab8d3bcea9b7505907f35ba58164_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_a24bfab8d3bcea9b7505907f35ba58164_icgraph.map deleted file mode 100644 index 63dfc467..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_a24bfab8d3bcea9b7505907f35ba58164_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_a24bfab8d3bcea9b7505907f35ba58164_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_a24bfab8d3bcea9b7505907f35ba58164_icgraph.png deleted file mode 100644 index 3e7de087..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_a24bfab8d3bcea9b7505907f35ba58164_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_a50fa9064e9f4b80ecd0fed9a71675dcd_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_a50fa9064e9f4b80ecd0fed9a71675dcd_icgraph.map deleted file mode 100644 index 314c320d..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_a50fa9064e9f4b80ecd0fed9a71675dcd_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_a50fa9064e9f4b80ecd0fed9a71675dcd_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_a50fa9064e9f4b80ecd0fed9a71675dcd_icgraph.png deleted file mode 100644 index c389081d..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_a50fa9064e9f4b80ecd0fed9a71675dcd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_a6c9fae4d974cb0a4012107b9753d6132_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_a6c9fae4d974cb0a4012107b9753d6132_icgraph.map deleted file mode 100644 index 464d300b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_a6c9fae4d974cb0a4012107b9753d6132_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_a6c9fae4d974cb0a4012107b9753d6132_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_a6c9fae4d974cb0a4012107b9753d6132_icgraph.png deleted file mode 100644 index 283bfbca..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_a6c9fae4d974cb0a4012107b9753d6132_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_a6d6ce70d7bdb8c94817c24fac3535719_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_a6d6ce70d7bdb8c94817c24fac3535719_icgraph.map deleted file mode 100644 index 4e3dc590..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_a6d6ce70d7bdb8c94817c24fac3535719_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_a6d6ce70d7bdb8c94817c24fac3535719_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_a6d6ce70d7bdb8c94817c24fac3535719_icgraph.png deleted file mode 100644 index 7679d617..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_a6d6ce70d7bdb8c94817c24fac3535719_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_acd7fedd4318f0181319fa0a554de9462_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_acd7fedd4318f0181319fa0a554de9462_icgraph.map deleted file mode 100644 index 402e4808..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_acd7fedd4318f0181319fa0a554de9462_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_acd7fedd4318f0181319fa0a554de9462_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_acd7fedd4318f0181319fa0a554de9462_icgraph.png deleted file mode 100644 index 6fac9633..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_acd7fedd4318f0181319fa0a554de9462_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_adcbc2641c459f93aebd72f3ff99fa0df_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_adcbc2641c459f93aebd72f3ff99fa0df_icgraph.map deleted file mode 100644 index 2929c802..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_adcbc2641c459f93aebd72f3ff99fa0df_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_adcbc2641c459f93aebd72f3ff99fa0df_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_adcbc2641c459f93aebd72f3ff99fa0df_icgraph.png deleted file mode 100644 index 74bc91c4..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_adcbc2641c459f93aebd72f3ff99fa0df_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_light_ae0e20c2400ebd02ba93d53aab025c6c4_icgraph.map b/docs/classzen_1_1gfx_1_1_c_light_ae0e20c2400ebd02ba93d53aab025c6c4_icgraph.map deleted file mode 100644 index 0e3c7718..00000000 --- a/docs/classzen_1_1gfx_1_1_c_light_ae0e20c2400ebd02ba93d53aab025c6c4_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_light_ae0e20c2400ebd02ba93d53aab025c6c4_icgraph.png b/docs/classzen_1_1gfx_1_1_c_light_ae0e20c2400ebd02ba93d53aab025c6c4_icgraph.png deleted file mode 100644 index b53cd34f..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_light_ae0e20c2400ebd02ba93d53aab025c6c4_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material.html b/docs/classzen_1_1gfx_1_1_c_material.html deleted file mode 100644 index 0cf15e20..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material.html +++ /dev/null @@ -1,714 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CMaterial Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfx::CMaterial Class Reference
Graphics
-
-
- -

Rendering data composed of a shader effect and a texture. - More...

- -

#include "Material.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CMaterial (asset::CAssetManager &Assets)
 
 CMaterial (const CMaterial &Copy)
 
CMaterial operator= (const CMaterial &Copy)
 
 ~CMaterial ()
 
bool LoadFromFile (const string_t &filename)
 Loads a material from a .zfx file. More...
 
bool LoadFromStream (std::ifstream &stream, const std::streampos &start=0, const std::streampos &end=-1)
 Loads a material from an existing file stream. More...
 
bool LoadTexture (const gfxcore::CTexture &Texture)
 Loads a texture from an existing one. More...
 
bool LoadTextureFromFile (const string_t &filename)
 Loads a texture from disk. More...
 
bool LoadTextureFromHandle (const GLuint handle)
 Loads a texture from an existing OpenGL handle. More...
 
bool LoadEffect (const EffectType Type)
 Loads an effect from disk. More...
 
bool Attach (CEffect &E, gfxcore::CTexture &T)
 Attaches the given effect/texture to the material. More...
 
bool Attach (CEffect &&E, gfxcore::CTexture &&T)
 Temporary rvalue references are not allowed. More...
 
bool Enable () const
 Enables the effect and texture for rendering. More...
 
bool EnableEffect () const
 Enables only the effect. More...
 
bool EnableTexture () const
 Enables only the texture. More...
 
bool Disable () const
 Disables rendering with the effect/texture. More...
 
bool DisableEffect () const
 Disables only the effect. More...
 
bool DisableTexture () const
 Disables only the texture. More...
 
CEffect & GetEffect ()
 
const gfxcore::CTexture & GetTexture () const
 
uint16_t GetID () const
 
-

Detailed Description

-

A material is a combination of an effect (shaders) and a texture. It's used to specify what picture should be drawn on the screen, and how it should be drawn. There is a default instance of it in zen::gfxcore::CRenderer, and it is used for standard rendering to the screen, primarily for primitives.

-

The object will store a local copy of the default texture and effect, allowing for less pointer interactions and potential errors. This doesn't mean the default effect will be loaded multiple times, as the internal shaders are registered assets and asset::CAssetManager will take care of preventing copies.

- -

Definition at line 36 of file Material.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CMaterial::CMaterial (asset::CAssetManager & Assets)
-
- -

Definition at line 9 of file Material.cpp.

- -
-
- -
-
- - - - - - - - -
CMaterial::CMaterial (const CMaterial & Copy)
-
- -

Definition at line 19 of file Material.cpp.

- -
-
- -
-
- - - - - - - -
CMaterial::~CMaterial ()
-
- -

Definition at line 34 of file Material.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
CMaterial zen::gfx::CMaterial::operator= (const CMaterial & Copy)
-
- -
-
- -
-
- - - - - - - - -
bool CMaterial::LoadFromFile (const string_t & filename)
-
-
See Also
Specification
- -

Definition at line 39 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool CMaterial::LoadFromStream (std::ifstream & stream,
const std::streampos & start = 0,
const std::streampos & end = -1 
)
-
-

It must follow the same specifications as LoadFromFile() The default behavior is parsing from the current stream location until EOF is reached. If start or end are specified, the stream will seek to the start, parse till end (inclusive) and then reset the stream to start (regardless of errors).

-
Parameters
- - - - -
streamFile stream to load from
startFile position to start loading from (optional)
endFile position to end loading from (optional)
-
-
-
Returns
true if a valid material was loaded, false otherwise.
-
See Also
Specification
-
-zen::util::CINIParser::LoadFromStream()
- -

Definition at line 71 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CMaterial::LoadTexture (const gfxcore::CTexture & Texture)
-
- -

Definition at line 98 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CMaterial::LoadTextureFromFile (const string_t & filename)
-
- -

Definition at line 124 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CMaterial::LoadTextureFromHandle (const GLuint handle)
-
- -

Definition at line 138 of file Material.cpp.

- -
-
- -
-
- - - - - - - - -
bool CMaterial::LoadEffect (const EffectType Type)
-
- -

Definition at line 145 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool zen::gfx::CMaterial::Attach (CEffect & E,
gfxcore::CTexture & T 
)
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool zen::gfx::CMaterial::Attach (CEffect && E,
gfxcore::CTexture && T 
)
-
- -
-
- -
-
- - - - - - - -
bool CMaterial::Enable () const
-
- -

Definition at line 167 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CMaterial::EnableEffect () const
-
- -

Definition at line 172 of file Material.cpp.

- -
-
- -
-
- - - - - - - -
bool CMaterial::EnableTexture () const
-
- -

Definition at line 177 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CMaterial::Disable () const
-
- -

Definition at line 182 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CMaterial::DisableEffect () const
-
- -

Definition at line 187 of file Material.cpp.

- -
-
- -
-
- - - - - - - -
bool CMaterial::DisableTexture () const
-
- -

Definition at line 192 of file Material.cpp.

- -
-
- -
-
- - - - - - - -
gfx::CEffect & CMaterial::GetEffect ()
-
- -

Definition at line 197 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
const gfxcore::CTexture & CMaterial::GetTexture () const
-
- -

Definition at line 202 of file Material.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CMaterial::GetID () const
- 		-inline
-
- -

Definition at line 102 of file Material.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material.js b/docs/classzen_1_1gfx_1_1_c_material.js deleted file mode 100644 index c243543a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material.js +++ /dev/null @@ -1,24 +0,0 @@ -var classzen_1_1gfx_1_1_c_material = -[ - [ "CMaterial", "classzen_1_1gfx_1_1_c_material.html#abd23ec17632f3e5dc1920eef2cf72c0f", null ], - [ "CMaterial", "classzen_1_1gfx_1_1_c_material.html#add6be40cd0ce911e65c8ccfcf51f840a", null ], - [ "~CMaterial", "classzen_1_1gfx_1_1_c_material.html#ad4e986a9a628c785b4f0a0684064a2ca", null ], - [ "operator=", "classzen_1_1gfx_1_1_c_material.html#a7574545f4df74b06d8a2edd21034295d", null ], - [ "LoadFromFile", "classzen_1_1gfx_1_1_c_material.html#a110ab4fb26d36407598d8ea3c18481d1", null ], - [ "LoadFromStream", "classzen_1_1gfx_1_1_c_material.html#a0c1a0412ef12327edb8cb948314f9c43", null ], - [ "LoadTexture", "classzen_1_1gfx_1_1_c_material.html#a73e57ac33fcd48a19a270ef1283ed458", null ], - [ "LoadTextureFromFile", "classzen_1_1gfx_1_1_c_material.html#a55a9539641630a1e5f7387d018678b06", null ], - [ "LoadTextureFromHandle", "classzen_1_1gfx_1_1_c_material.html#a93c55905dea1adc5e2ee393b35e5ac3a", null ], - [ "LoadEffect", "classzen_1_1gfx_1_1_c_material.html#a452b483a0c05089216fec332f0c576a6", null ], - [ "Attach", "classzen_1_1gfx_1_1_c_material.html#a5ba1fdd8516cc54cb4c79f3a379337ef", null ], - [ "Attach", "classzen_1_1gfx_1_1_c_material.html#a9d84c6d5017c968a6d8af3306b6f9491", null ], - [ "Enable", "classzen_1_1gfx_1_1_c_material.html#a320cb498234e02231b9ce04cf78999e9", null ], - [ "EnableEffect", "classzen_1_1gfx_1_1_c_material.html#aabde12c0fa098dcc8febe03b5d5c320f", null ], - [ "EnableTexture", "classzen_1_1gfx_1_1_c_material.html#a4866a925322a57f4cb0d70833db0da7a", null ], - [ "Disable", "classzen_1_1gfx_1_1_c_material.html#a5962ae2836315bf7d6175a43035855a1", null ], - [ "DisableEffect", "classzen_1_1gfx_1_1_c_material.html#a1b01d4800f23dee94cff5d4e7d69d74f", null ], - [ "DisableTexture", "classzen_1_1gfx_1_1_c_material.html#af2d97e02572716bf85f8074b5b7a890d", null ], - [ "GetEffect", "classzen_1_1gfx_1_1_c_material.html#addd5eb8166b408c26abe605ff7d3e7de", null ], - [ "GetTexture", "classzen_1_1gfx_1_1_c_material.html#ab3f789974bf6235ee73b814290a009f2", null ], - [ "GetID", "classzen_1_1gfx_1_1_c_material.html#a0c6f53b01b6bdfd43c21388004c35cde", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_material_a0c1a0412ef12327edb8cb948314f9c43_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a0c1a0412ef12327edb8cb948314f9c43_icgraph.map deleted file mode 100644 index 0dbdad9e..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a0c1a0412ef12327edb8cb948314f9c43_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a0c1a0412ef12327edb8cb948314f9c43_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a0c1a0412ef12327edb8cb948314f9c43_icgraph.png deleted file mode 100644 index be30c83d..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a0c1a0412ef12327edb8cb948314f9c43_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a110ab4fb26d36407598d8ea3c18481d1_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a110ab4fb26d36407598d8ea3c18481d1_icgraph.map deleted file mode 100644 index 0d424d5f..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a110ab4fb26d36407598d8ea3c18481d1_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a110ab4fb26d36407598d8ea3c18481d1_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a110ab4fb26d36407598d8ea3c18481d1_icgraph.png deleted file mode 100644 index 9a0351d3..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a110ab4fb26d36407598d8ea3c18481d1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a320cb498234e02231b9ce04cf78999e9_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a320cb498234e02231b9ce04cf78999e9_icgraph.map deleted file mode 100644 index 954d9e0f..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a320cb498234e02231b9ce04cf78999e9_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a320cb498234e02231b9ce04cf78999e9_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a320cb498234e02231b9ce04cf78999e9_icgraph.png deleted file mode 100644 index acfe26e1..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a320cb498234e02231b9ce04cf78999e9_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a452b483a0c05089216fec332f0c576a6_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a452b483a0c05089216fec332f0c576a6_icgraph.map deleted file mode 100644 index 49b69138..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a452b483a0c05089216fec332f0c576a6_icgraph.map +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a452b483a0c05089216fec332f0c576a6_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a452b483a0c05089216fec332f0c576a6_icgraph.png deleted file mode 100644 index 76a4e8d6..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a452b483a0c05089216fec332f0c576a6_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a4866a925322a57f4cb0d70833db0da7a_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a4866a925322a57f4cb0d70833db0da7a_icgraph.map deleted file mode 100644 index d99f5b8b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a4866a925322a57f4cb0d70833db0da7a_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a4866a925322a57f4cb0d70833db0da7a_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a4866a925322a57f4cb0d70833db0da7a_icgraph.png deleted file mode 100644 index 16db6808..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a4866a925322a57f4cb0d70833db0da7a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a55a9539641630a1e5f7387d018678b06_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a55a9539641630a1e5f7387d018678b06_icgraph.map deleted file mode 100644 index 8200ce8b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a55a9539641630a1e5f7387d018678b06_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a55a9539641630a1e5f7387d018678b06_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a55a9539641630a1e5f7387d018678b06_icgraph.png deleted file mode 100644 index 2f7a3fec..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a55a9539641630a1e5f7387d018678b06_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a5962ae2836315bf7d6175a43035855a1_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a5962ae2836315bf7d6175a43035855a1_icgraph.map deleted file mode 100644 index dd976b64..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a5962ae2836315bf7d6175a43035855a1_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a5962ae2836315bf7d6175a43035855a1_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a5962ae2836315bf7d6175a43035855a1_icgraph.png deleted file mode 100644 index dfb0d77c..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a5962ae2836315bf7d6175a43035855a1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_a73e57ac33fcd48a19a270ef1283ed458_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_a73e57ac33fcd48a19a270ef1283ed458_icgraph.map deleted file mode 100644 index ae8a2dae..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_a73e57ac33fcd48a19a270ef1283ed458_icgraph.map +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_a73e57ac33fcd48a19a270ef1283ed458_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_a73e57ac33fcd48a19a270ef1283ed458_icgraph.png deleted file mode 100644 index 57fc956e..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_a73e57ac33fcd48a19a270ef1283ed458_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_ab3f789974bf6235ee73b814290a009f2_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_ab3f789974bf6235ee73b814290a009f2_icgraph.map deleted file mode 100644 index 424d8465..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_ab3f789974bf6235ee73b814290a009f2_icgraph.map +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_ab3f789974bf6235ee73b814290a009f2_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_ab3f789974bf6235ee73b814290a009f2_icgraph.png deleted file mode 100644 index 6a2a4350..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_ab3f789974bf6235ee73b814290a009f2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_material_addd5eb8166b408c26abe605ff7d3e7de_icgraph.map b/docs/classzen_1_1gfx_1_1_c_material_addd5eb8166b408c26abe605ff7d3e7de_icgraph.map deleted file mode 100644 index 2cdd50ae..00000000 --- a/docs/classzen_1_1gfx_1_1_c_material_addd5eb8166b408c26abe605ff7d3e7de_icgraph.map +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_material_addd5eb8166b408c26abe605ff7d3e7de_icgraph.png b/docs/classzen_1_1gfx_1_1_c_material_addd5eb8166b408c26abe605ff7d3e7de_icgraph.png deleted file mode 100644 index 632c75ac..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_material_addd5eb8166b408c26abe605ff7d3e7de_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_polygon.html b/docs/classzen_1_1gfx_1_1_c_polygon.html deleted file mode 100644 index e1a3b6b4..00000000 --- a/docs/classzen_1_1gfx_1_1_c_polygon.html +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CPolygon Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfx::CPolygon Class Reference
Graphics
-
-
- -

An arbitrary n-vertex convex polygon. - More...

- -

#include "Polygon.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CPolygon (asset::CAssetManager &Assets)
 
 ~CPolygon ()
 
void AddVertex (const math::vector_t &Position)
 Adds a vertex to the polygon at the specified position. More...
 
CDrawable & Create ()
 Creates the polygon from the internally stored vertices. More...
 
void SetColor (const color4f_t &Color)
 Sets the vertex color of the temporary buffer. More...
 
- Public Member Functions inherited from zen::gfxcore::CDrawable
 CDrawable (asset::CAssetManager &)
 
 CDrawable (const CDrawable &Copy)
 Creates an instance from another instance. More...
 
 CDrawable (CDrawable &&Copy)
 
virtual ~CDrawable ()
 
void Move (const math::vector_t &Position)
 Moves the drawable to a certain location. More...
 
void Move (const real_t x, const real_t y, const real_t z=1.0)
 This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
 
void AttachMaterial (gfx::CMaterial &Material)
 Attaches a material to render on top of the primitive. More...
 
void RemoveMaterial ()
 Reverts to using the default material. More...
 
bool Draw (const bool is_bound=false)
 Draws the primitive on-screen. More...
 
bool IsModifiable () const
 Request to see if we can change the internal vertices or not. More...
 
const math::vector_t & GetPosition () const
 
real_t GetX () const
 
real_t GetY () const
 
void LoadIntoVAO (gfxcore::CVertexArray &VAO, const bool preserve=true)
 Shortcut to prevent loading simple objects manually. More...
 
- - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::gfxcore::CDrawable
gfx::CMaterial m_Material
 
math::vector_t m_Position
 
DrawBatch m_DrawData
 
bool m_internal
 
-

Detailed Description

-

This is a class representing an arbitrary convex polygon that can accept any number of vertices. It does NOT work with concave polygons, meaning there can be no way to connect any two vertices with a line that goes outside of the polygon. The polygon will be generated, of course, since there is no check for concavity, but it will simply not look correct when rendered on-screen.

-

The polygon is generated by drawing triangles to each individual vertex, beginning from the first vertex added.

-

Polygons are created a little differently than pre-baked primitives such as gfx::CQuad, they store vertices in a temporary buffer until Create() is called. Thus calls to the various Set*() methods are overidden in order to use the temporary buffer rather than the true internal vertex buffer as specified by the base class gfxcore::CDrawable.

- -

Definition at line 32 of file Polygon.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CPolygon::CPolygon (asset::CAssetManager & Assets)
-
- -

Definition at line 6 of file Polygon.cpp.

- -
-
- -
-
- - - - - - - -
CPolygon::~CPolygon ()
-
- -

Definition at line 12 of file Polygon.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
void CPolygon::AddVertex (const math::vector_t & Position)
-
-

Vertices form triangles from the first vertex added, and thus will not look right if there is any notion of concavity.

-
Parameters
- - -
PositionThe location to create the next vertex at
-
-
- -

Definition at line 18 of file Polygon.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
gfxcore::CDrawable & CPolygon::Create ()
- 		-virtual
-
-
Precondition
>= 3 vertices have been added to the polygon.
-
Postcondition
No temporary vertices are stored until AddVertex() is called again.
- -

Implements zen::gfxcore::CDrawable.

- -

Definition at line 25 of file Polygon.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CPolygon::SetColor (const color4f_t & Color)
- 		-virtual
-
- -

Reimplemented from zen::gfxcore::CDrawable.

- -

Definition at line 59 of file Polygon.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_polygon.js b/docs/classzen_1_1gfx_1_1_c_polygon.js deleted file mode 100644 index 376a8dda..00000000 --- a/docs/classzen_1_1gfx_1_1_c_polygon.js +++ /dev/null @@ -1,8 +0,0 @@ -var classzen_1_1gfx_1_1_c_polygon = -[ - [ "CPolygon", "classzen_1_1gfx_1_1_c_polygon.html#a34f567c8dd977e8fda98435ba6793ed7", null ], - [ "~CPolygon", "classzen_1_1gfx_1_1_c_polygon.html#a2e8a08cf38a25f83073b8243bc700ae1", null ], - [ "AddVertex", "classzen_1_1gfx_1_1_c_polygon.html#a5a2144dedeb6f5df1716337f443ba1fe", null ], - [ "Create", "classzen_1_1gfx_1_1_c_polygon.html#ac1a4664668d5203fb6f76226164d3783", null ], - [ "SetColor", "classzen_1_1gfx_1_1_c_polygon.html#ab8e15a4e08f31cae41583c4524b2a765", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_polygon_a5a2144dedeb6f5df1716337f443ba1fe_icgraph.map b/docs/classzen_1_1gfx_1_1_c_polygon_a5a2144dedeb6f5df1716337f443ba1fe_icgraph.map deleted file mode 100644 index bc718994..00000000 --- a/docs/classzen_1_1gfx_1_1_c_polygon_a5a2144dedeb6f5df1716337f443ba1fe_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_polygon_a5a2144dedeb6f5df1716337f443ba1fe_icgraph.png b/docs/classzen_1_1gfx_1_1_c_polygon_a5a2144dedeb6f5df1716337f443ba1fe_icgraph.png deleted file mode 100644 index 5758aa20..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_polygon_a5a2144dedeb6f5df1716337f443ba1fe_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_polygon_ab8e15a4e08f31cae41583c4524b2a765_icgraph.map b/docs/classzen_1_1gfx_1_1_c_polygon_ab8e15a4e08f31cae41583c4524b2a765_icgraph.map deleted file mode 100644 index fab0ec67..00000000 --- a/docs/classzen_1_1gfx_1_1_c_polygon_ab8e15a4e08f31cae41583c4524b2a765_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_polygon_ab8e15a4e08f31cae41583c4524b2a765_icgraph.png b/docs/classzen_1_1gfx_1_1_c_polygon_ab8e15a4e08f31cae41583c4524b2a765_icgraph.png deleted file mode 100644 index ebfd0a2e..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_polygon_ab8e15a4e08f31cae41583c4524b2a765_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_polygon_ac1a4664668d5203fb6f76226164d3783_icgraph.map b/docs/classzen_1_1gfx_1_1_c_polygon_ac1a4664668d5203fb6f76226164d3783_icgraph.map deleted file mode 100644 index e734b399..00000000 --- a/docs/classzen_1_1gfx_1_1_c_polygon_ac1a4664668d5203fb6f76226164d3783_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_polygon_ac1a4664668d5203fb6f76226164d3783_icgraph.png b/docs/classzen_1_1gfx_1_1_c_polygon_ac1a4664668d5203fb6f76226164d3783_icgraph.png deleted file mode 100644 index 3d64b82b..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_polygon_ac1a4664668d5203fb6f76226164d3783_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad.html b/docs/classzen_1_1gfx_1_1_c_quad.html deleted file mode 100644 index fc8c1481..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad.html +++ /dev/null @@ -1,606 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CQuad Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfx::CQuad Class Reference
Graphics
-
-
- -

A four-sided quadrilateral primitive. - More...

- -

#include "Quad.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CQuad (asset::CAssetManager &, const math::rect_t &Size)
 
 CQuad (asset::CAssetManager &, const uint16_t w, const uint16_t h)
 
 CQuad (const CQuad &Copy)
 
 ~CQuad ()
 
virtual CDrawable & Create ()
 Creates initial vertex structure. More...
 
void Resize (const math::vectoru16_t &Size)
 Resizes the quad to a new dimension. More...
 
void Resize (const uint16_t w, const uint16_t h)
 
void SetInverted (const bool flag)
 Makes the vertices have non-zero y values. More...
 
void SetRepeating (const bool flag)
 Repeat texture or stretch to fit. More...
 
uint16_t GetW () const
 
uint16_t GetH () const
 
const CMaterial & GetMaterial () const
 
- Public Member Functions inherited from zen::gfxcore::CDrawable
 CDrawable (asset::CAssetManager &)
 
 CDrawable (const CDrawable &Copy)
 Creates an instance from another instance. More...
 
 CDrawable (CDrawable &&Copy)
 
virtual ~CDrawable ()
 
void Move (const math::vector_t &Position)
 Moves the drawable to a certain location. More...
 
void Move (const real_t x, const real_t y, const real_t z=1.0)
 This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
 
void AttachMaterial (gfx::CMaterial &Material)
 Attaches a material to render on top of the primitive. More...
 
void RemoveMaterial ()
 Reverts to using the default material. More...
 
virtual void SetColor (const color4f_t &Color)
 Sets all vertices to have a given color value. More...
 
bool Draw (const bool is_bound=false)
 Draws the primitive on-screen. More...
 
bool IsModifiable () const
 Request to see if we can change the internal vertices or not. More...
 
const math::vector_t & GetPosition () const
 
real_t GetX () const
 
real_t GetY () const
 
void LoadIntoVAO (gfxcore::CVertexArray &VAO, const bool preserve=true)
 Shortcut to prevent loading simple objects manually. More...
 
- - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::gfxcore::CDrawable
gfx::CMaterial m_Material
 
math::vector_t m_Position
 
DrawBatch m_DrawData
 
bool m_internal
 
-

Detailed Description

-

Quads are the essential drawing primitive behind Zenderer. They are used internally by zen::obj::CEntity instances, which just attach materials to one or more of them and draw them on-screen using the standard implementation.

- -

Definition at line 33 of file Quad.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
zen::gfx::CQuad::CQuad (asset::CAssetManager & ,
const math::rect_t & Size 
)
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
zen::gfx::CQuad::CQuad (asset::CAssetManager & ,
const uint16_t w,
const uint16_t h 
)
-
- -
-
- -
-
- - - - - - - - -
CQuad::CQuad (const CQuad & Copy)
-
- -

Definition at line 14 of file Quad.cpp.

- -
-
- -
-
- - - - - - - -
CQuad::~CQuad ()
-
- -

Definition at line 21 of file Quad.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
gfxcore::CDrawable & CQuad::Create ()
- 		-virtual
-
-
Returns
Reference to itself for easy chaining.
- -

Implements zen::gfxcore::CDrawable.

- -

Definition at line 27 of file Quad.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CQuad::Resize (const math::vectoru16_t & Size)
-
-
Parameters
- - -
SizeNew quad size (in pixels)
-
-
-
Precondition
Draw() has not been called yet.
- -

Definition at line 62 of file Quad.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void CQuad::Resize (const uint16_t w,
const uint16_t h 
)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 67 of file Quad.cpp.

- -
-
- -
-
- - - - - - - - -
void CQuad::SetInverted (const bool flag)
-
-

This is used (by me) to support skewing the upper vertices of a quad to simulate waving effects and such. By default, the quad's vertices are laid out like this:

-
 (0,0) _________________ (w,0)
-      |                 |
-      |                 |
-      |                 |
-      |_________________|
- (0,h)                   (w,h)
-

As such, when skew operations are performed in the x-direction, they only modify the bottom vertices since they have non-zero y-values. Calling this method will arrange the vertices like so:

-
 (0,-h) _________________ (w,-h)
-       |                 |
-       |                 |
-       |                 |
-       |_________________|
- (0,0)                    (w,0)
-

Thus allowing for the upper vertices to be skewed properly, but the bottom ones will not, naturally.

-
Parameters
- - -
flagtrue will make the upper vertices skewable, false will create the quad as normal
-
-
-
Precondition
Neither Draw() nor Create() have been called yet.
- -

Definition at line 76 of file Quad.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CQuad::SetRepeating (const bool flag)
-
-

When a material is attached to the drawable instance, and the size of the drawable is larger than the texture size, it will be stretched by default. You can set it to repeat the texture pattern across the drawable with this method.

-
Parameters
- - -
flagtrue makes it repeat, false stretches
-
-
-
Precondition
Neither Draw() nor Create() have been called yet.
- -

Definition at line 81 of file Quad.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CQuad::GetW () const
- 		-inline
-
- -

Definition at line 101 of file Quad.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CQuad::GetH () const
- 		-inline
-
- -

Definition at line 102 of file Quad.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const CMaterial& zen::gfx::CQuad::GetMaterial () const
- 		-inline
-
- -

Definition at line 103 of file Quad.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad.js b/docs/classzen_1_1gfx_1_1_c_quad.js deleted file mode 100644 index c80f632d..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad.js +++ /dev/null @@ -1,15 +0,0 @@ -var classzen_1_1gfx_1_1_c_quad = -[ - [ "CQuad", "classzen_1_1gfx_1_1_c_quad.html#a76122affb224683f76cea7b65fb2c2b7", null ], - [ "CQuad", "classzen_1_1gfx_1_1_c_quad.html#ac83f61fe622d003a1f8360ff11b50291", null ], - [ "CQuad", "classzen_1_1gfx_1_1_c_quad.html#a6a23cc950f23f678b7ad9bc43da025c7", null ], - [ "~CQuad", "classzen_1_1gfx_1_1_c_quad.html#a60bf556640212f48877f7b406862e48e", null ], - [ "Create", "classzen_1_1gfx_1_1_c_quad.html#a7213f1f53d40ec11f75f65e93d00f279", null ], - [ "Resize", "classzen_1_1gfx_1_1_c_quad.html#a3e86d46b495cd3adfd7d10b3cc0153c4", null ], - [ "Resize", "classzen_1_1gfx_1_1_c_quad.html#ac92fe178ffe4f5ac729b550d8e6a5061", null ], - [ "SetInverted", "classzen_1_1gfx_1_1_c_quad.html#aaea2ad21f738ee8119e381ef4820f408", null ], - [ "SetRepeating", "classzen_1_1gfx_1_1_c_quad.html#abb824d556d0a467d940a5734523b9333", null ], - [ "GetW", "classzen_1_1gfx_1_1_c_quad.html#aebb4c16f626050111237d714ac872c01", null ], - [ "GetH", "classzen_1_1gfx_1_1_c_quad.html#adcb3228cc38c642baaa63029ca135ea7", null ], - [ "GetMaterial", "classzen_1_1gfx_1_1_c_quad.html#abe89f3e09d71e4c2084567d1142f629a", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_quad_a3e86d46b495cd3adfd7d10b3cc0153c4_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_a3e86d46b495cd3adfd7d10b3cc0153c4_icgraph.map deleted file mode 100644 index 4d868ad0..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_a3e86d46b495cd3adfd7d10b3cc0153c4_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_a3e86d46b495cd3adfd7d10b3cc0153c4_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_a3e86d46b495cd3adfd7d10b3cc0153c4_icgraph.png deleted file mode 100644 index f1342e6b..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_a3e86d46b495cd3adfd7d10b3cc0153c4_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad_a7213f1f53d40ec11f75f65e93d00f279_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_a7213f1f53d40ec11f75f65e93d00f279_icgraph.map deleted file mode 100644 index 70a895ac..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_a7213f1f53d40ec11f75f65e93d00f279_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_a7213f1f53d40ec11f75f65e93d00f279_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_a7213f1f53d40ec11f75f65e93d00f279_icgraph.png deleted file mode 100644 index d4d5af83..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_a7213f1f53d40ec11f75f65e93d00f279_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad_aaea2ad21f738ee8119e381ef4820f408_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_aaea2ad21f738ee8119e381ef4820f408_icgraph.map deleted file mode 100644 index 000b6574..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_aaea2ad21f738ee8119e381ef4820f408_icgraph.map +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_aaea2ad21f738ee8119e381ef4820f408_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_aaea2ad21f738ee8119e381ef4820f408_icgraph.png deleted file mode 100644 index 3f2d108c..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_aaea2ad21f738ee8119e381ef4820f408_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad_abb824d556d0a467d940a5734523b9333_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_abb824d556d0a467d940a5734523b9333_icgraph.map deleted file mode 100644 index 2de79c5d..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_abb824d556d0a467d940a5734523b9333_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_abb824d556d0a467d940a5734523b9333_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_abb824d556d0a467d940a5734523b9333_icgraph.png deleted file mode 100644 index 5374d55a..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_abb824d556d0a467d940a5734523b9333_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad_abe89f3e09d71e4c2084567d1142f629a_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_abe89f3e09d71e4c2084567d1142f629a_icgraph.map deleted file mode 100644 index 13441188..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_abe89f3e09d71e4c2084567d1142f629a_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_abe89f3e09d71e4c2084567d1142f629a_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_abe89f3e09d71e4c2084567d1142f629a_icgraph.png deleted file mode 100644 index 001e46e6..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_abe89f3e09d71e4c2084567d1142f629a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad_adcb3228cc38c642baaa63029ca135ea7_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_adcb3228cc38c642baaa63029ca135ea7_icgraph.map deleted file mode 100644 index 18c2eb1b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_adcb3228cc38c642baaa63029ca135ea7_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_adcb3228cc38c642baaa63029ca135ea7_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_adcb3228cc38c642baaa63029ca135ea7_icgraph.png deleted file mode 100644 index 1b1336b4..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_adcb3228cc38c642baaa63029ca135ea7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_quad_aebb4c16f626050111237d714ac872c01_icgraph.map b/docs/classzen_1_1gfx_1_1_c_quad_aebb4c16f626050111237d714ac872c01_icgraph.map deleted file mode 100644 index fd5cd69c..00000000 --- a/docs/classzen_1_1gfx_1_1_c_quad_aebb4c16f626050111237d714ac872c01_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_quad_aebb4c16f626050111237d714ac872c01_icgraph.png b/docs/classzen_1_1gfx_1_1_c_quad_aebb4c16f626050111237d714ac872c01_icgraph.png deleted file mode 100644 index 27524993..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_quad_aebb4c16f626050111237d714ac872c01_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target.html b/docs/classzen_1_1gfx_1_1_c_render_target.html deleted file mode 100644 index 370b3a3b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target.html +++ /dev/null @@ -1,613 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CRenderTarget Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfx::CRenderTarget Class Reference
Graphics
-
-
- -

Creates a target for all subsequent rendering operations. - More...

- -

#include "RenderTarget.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CRenderTarget (const math::rect_t &Dimensions)
 Creates a render target of the specified dimensions. More...
 
 CRenderTarget (const uint16_t w, const uint16_t h)
 
 ~CRenderTarget ()
 
bool Init ()
 Creates the render target with an attached texture. More...
 
bool Destroy ()
 Destroys the render target and everything attached to it. More...
 
bool Bind () const
 All draws after this call will go to the texture, not the screen. More...
 
bool Unbind () const
 Resume drawing to the screen. More...
 
bool BindTexture () const
 Binds the render target's texture for drawing or modification. More...
 
bool Clear (const color4f_t C=color4f_t(0.0, 0.0, 0.0, 1.0))
 Clears the rendering target texture with a color (default black). More...
 
bool AttachDepthBuffer ()
 Attach depth buffer to render target. More...
 
bool AttachStencilBuffer ()
 Attach stencil to the render target. More...
 
GLuint GetObjectHandle () const
 Get the raw render target OpenGL handle. More...
 
GLuint GetTexture () const
 Get the raw render target's texture handle. More...
 
uint16_t GetHeight () const
 
uint16_t GetWidth () const
 
- - - - - - - - - - -

-Additional Inherited Members

- Private Member Functions inherited from zen::gfxcore::CGLSubsystem
 CGLSubsystem (const string_t name="OpenGL")
 
virtual ~CGLSubsystem ()
 
bool IsInit ()
 
virtual const string_t & GetName () const
 
-

Detailed Description

-

Render targets are useful for rendering things off-screen, multi-pass rendering, and other useful routines for rendering things to a texture, and then using that texture for later operations. It's used extensively in the gfx::CScene API in order to provide post-processing effects and additive lighting effects.

- -

Definition at line 36 of file RenderTarget.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - - -
CRenderTarget::CRenderTarget (const math::rect_t & Dimensions)
- 		-explicit
-
- -

Definition at line 9 of file RenderTarget.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
CRenderTarget::CRenderTarget (const uint16_t w,
const uint16_t h 
)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 16 of file RenderTarget.cpp.

- -
-
- -
-
- - - - - - - -
CRenderTarget::~CRenderTarget ()
-
- -

Definition at line 22 of file RenderTarget.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CRenderTarget::Init ()
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 28 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CRenderTarget::Destroy ()
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 76 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CRenderTarget::Bind () const
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 91 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CRenderTarget::Unbind () const
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 101 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CRenderTarget::BindTexture () const
-
- -

Definition at line 110 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CRenderTarget::Clear (const color4f_t C = color4f_t(0.0, 0.0, 0.0, 1.0))
-
- -

Definition at line 116 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CRenderTarget::AttachDepthBuffer ()
-
- -

Definition at line 124 of file RenderTarget.cpp.

- -
-
- -
-
- - - - - - - -
bool zen::gfx::CRenderTarget::AttachStencilBuffer ()
-
- -
-
- -
-
- - - - - -
- - - - - - - -
GLuint CRenderTarget::GetObjectHandle () const
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 165 of file RenderTarget.cpp.

- -
-
- -
-
- - - - - - - -
GLuint CRenderTarget::GetTexture () const
-
- -

Definition at line 170 of file RenderTarget.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CRenderTarget::GetHeight () const
- 		-inline
-
- -

Definition at line 72 of file RenderTarget.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CRenderTarget::GetWidth () const
- 		-inline
-
- -

Definition at line 73 of file RenderTarget.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target.js b/docs/classzen_1_1gfx_1_1_c_render_target.js deleted file mode 100644 index b099ed49..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target.js +++ /dev/null @@ -1,18 +0,0 @@ -var classzen_1_1gfx_1_1_c_render_target = -[ - [ "CRenderTarget", "classzen_1_1gfx_1_1_c_render_target.html#a12a9eff1545ec868fb53186bdc127ef2", null ], - [ "CRenderTarget", "classzen_1_1gfx_1_1_c_render_target.html#a537c961ad191dff4f53761105c150fae", null ], - [ "~CRenderTarget", "classzen_1_1gfx_1_1_c_render_target.html#a140f5687594cc589c8b22221c84e4fba", null ], - [ "Init", "classzen_1_1gfx_1_1_c_render_target.html#a83b307e763f5bb9846675a28a7f1f0a0", null ], - [ "Destroy", "classzen_1_1gfx_1_1_c_render_target.html#a2de2294eb5cd10e8d1f7b412a41fad73", null ], - [ "Bind", "classzen_1_1gfx_1_1_c_render_target.html#a977428dad3918f406920190164760f6f", null ], - [ "Unbind", "classzen_1_1gfx_1_1_c_render_target.html#aa1e1c94cbadb638ad5f0d084d915b7c0", null ], - [ "BindTexture", "classzen_1_1gfx_1_1_c_render_target.html#a1f45e13224dd42f52ccb8194a1f2c9eb", null ], - [ "Clear", "classzen_1_1gfx_1_1_c_render_target.html#a99cd55ce477e7ef20e220f81a841f49e", null ], - [ "AttachDepthBuffer", "classzen_1_1gfx_1_1_c_render_target.html#a1158e22ca14496564a677294ff11cd79", null ], - [ "AttachStencilBuffer", "classzen_1_1gfx_1_1_c_render_target.html#ab4d5f66a4b553b2d68edb4ea728cab77", null ], - [ "GetObjectHandle", "classzen_1_1gfx_1_1_c_render_target.html#ab27ab130d9778d04220ec7eea766f19c", null ], - [ "GetTexture", "classzen_1_1gfx_1_1_c_render_target.html#ac9dc97a466fa55c77089b61a384b28c8", null ], - [ "GetHeight", "classzen_1_1gfx_1_1_c_render_target.html#a20df8fedbc1bb60e134ea7e17018944a", null ], - [ "GetWidth", "classzen_1_1gfx_1_1_c_render_target.html#a32f74785727a099ea9ad847ad4755918", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a1f45e13224dd42f52ccb8194a1f2c9eb_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_a1f45e13224dd42f52ccb8194a1f2c9eb_icgraph.map deleted file mode 100644 index 15da4c81..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_a1f45e13224dd42f52ccb8194a1f2c9eb_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a1f45e13224dd42f52ccb8194a1f2c9eb_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_a1f45e13224dd42f52ccb8194a1f2c9eb_icgraph.png deleted file mode 100644 index 777a53b4..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_a1f45e13224dd42f52ccb8194a1f2c9eb_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a20df8fedbc1bb60e134ea7e17018944a_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_a20df8fedbc1bb60e134ea7e17018944a_icgraph.map deleted file mode 100644 index 1efc2ff5..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_a20df8fedbc1bb60e134ea7e17018944a_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a20df8fedbc1bb60e134ea7e17018944a_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_a20df8fedbc1bb60e134ea7e17018944a_icgraph.png deleted file mode 100644 index 23e71a43..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_a20df8fedbc1bb60e134ea7e17018944a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a2de2294eb5cd10e8d1f7b412a41fad73_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_a2de2294eb5cd10e8d1f7b412a41fad73_icgraph.map deleted file mode 100644 index 49c5c5df..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_a2de2294eb5cd10e8d1f7b412a41fad73_icgraph.map +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a2de2294eb5cd10e8d1f7b412a41fad73_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_a2de2294eb5cd10e8d1f7b412a41fad73_icgraph.png deleted file mode 100644 index 2ad9fbe6..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_a2de2294eb5cd10e8d1f7b412a41fad73_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a83b307e763f5bb9846675a28a7f1f0a0_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_a83b307e763f5bb9846675a28a7f1f0a0_icgraph.map deleted file mode 100644 index 26b6a6a1..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_a83b307e763f5bb9846675a28a7f1f0a0_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a83b307e763f5bb9846675a28a7f1f0a0_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_a83b307e763f5bb9846675a28a7f1f0a0_icgraph.png deleted file mode 100644 index c6715075..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_a83b307e763f5bb9846675a28a7f1f0a0_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a977428dad3918f406920190164760f6f_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_a977428dad3918f406920190164760f6f_icgraph.map deleted file mode 100644 index b7b6eddb..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_a977428dad3918f406920190164760f6f_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a977428dad3918f406920190164760f6f_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_a977428dad3918f406920190164760f6f_icgraph.png deleted file mode 100644 index 532b9470..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_a977428dad3918f406920190164760f6f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a99cd55ce477e7ef20e220f81a841f49e_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_a99cd55ce477e7ef20e220f81a841f49e_icgraph.map deleted file mode 100644 index 9dcc9bf6..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_a99cd55ce477e7ef20e220f81a841f49e_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_a99cd55ce477e7ef20e220f81a841f49e_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_a99cd55ce477e7ef20e220f81a841f49e_icgraph.png deleted file mode 100644 index b61225c4..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_a99cd55ce477e7ef20e220f81a841f49e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_aa1e1c94cbadb638ad5f0d084d915b7c0_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_aa1e1c94cbadb638ad5f0d084d915b7c0_icgraph.map deleted file mode 100644 index 7c6fd9bc..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_aa1e1c94cbadb638ad5f0d084d915b7c0_icgraph.map +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_aa1e1c94cbadb638ad5f0d084d915b7c0_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_aa1e1c94cbadb638ad5f0d084d915b7c0_icgraph.png deleted file mode 100644 index f98c8001..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_aa1e1c94cbadb638ad5f0d084d915b7c0_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_ac9dc97a466fa55c77089b61a384b28c8_icgraph.map b/docs/classzen_1_1gfx_1_1_c_render_target_ac9dc97a466fa55c77089b61a384b28c8_icgraph.map deleted file mode 100644 index 5a148c0a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_render_target_ac9dc97a466fa55c77089b61a384b28c8_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_render_target_ac9dc97a466fa55c77089b61a384b28c8_icgraph.png b/docs/classzen_1_1gfx_1_1_c_render_target_ac9dc97a466fa55c77089b61a384b28c8_icgraph.png deleted file mode 100644 index 724a868a..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_render_target_ac9dc97a466fa55c77089b61a384b28c8_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene.html b/docs/classzen_1_1gfx_1_1_c_scene.html deleted file mode 100644 index f1618af7..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene.html +++ /dev/null @@ -1,909 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CScene Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfx::CScene Class Reference
Graphics
-
-
- -

#include "Scene.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CScene (const uint16_t w, const uint16_t h, asset::CAssetManager &Mgr)
 
 ~CScene ()
 
bool Init ()
 Initializes internal graphical components. More...
 
bool Destroy ()
 
obj::CEntity & AddEntity ()
 Adds an unloaded, managed entity to the scene. More...
 
template<typename T >
obj::CEntity & AddPrimitive ()
 Adds a managed primitive to the scene as an entity. More...
 
CLight & AddLight (const LightType &Type)
 Creates and adds a managed light instance to the scene. More...
 
CEffect & AddEffect (const EffectType &Type)
 Adds an effect to be rendered on the whole scene. More...
 
obj::CEntity & InsertEntity (const uint32_t index)
 Inserts an entity at a point in the draw queue. More...
 
bool RemoveEntity (const obj::CEntity &Obj)
 Removes an entity instance from the scene, if it exists. More...
 
bool RemoveEntity (const uint32_t index)
 
bool Clear ()
 Deletes all scene data (lights, objects, effects, etc). More...
 
bool Render ()
 Renders the scene to the screen. More...
 
bool IsValidEntityIndex (int32_t i)
 Verifies the given index is within the valid range. More...
 
int32_t GetEntityIndex (const obj::CEntity &D)
 Returns the queue index of a certain entity (or -1). More...
 
void EnableLighting ()
 Enables / disables scene lighting. More...
 
void DisableLighting ()
 
bool ToggleLighting ()
 
void EnablePostProcessing ()
 Enables / disables post processing effects. More...
 
void DisablePostProcessing ()
 
bool TogglePostProcessing ()
 
void SetSeeThrough (bool flag)
 Allows for underlying rendered data to be seen where scene is empty. More...
 
template<typename T >
obj::CEntity & AddPrimitive ()
 
- Public Member Functions inherited from zen::CSubsystem
 CSubsystem (const string_t name="Subsystem")
 Sets subsystem to an uninitialized state. More...
 
virtual ~CSubsystem ()
 Destructor does absolutely nothing. More...
 
bool IsInit () const
 Returns the sub-system initialization status. More...
 
void SetLog (util::CLog &Log)
 Sets a custom output log. More...
 
const string_t & GetName () const
 Retrieves the subsystem name. More...
 
- - - - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::CSubsystem
util::CLog & m_Log
 
string_t m_name
 
bool m_init
 
- Static Protected Attributes inherited from zen::CSubsystem
static std::vector< CSubsystem * > sp_allSystems
 No copying subsystems. More...
 
-

Detailed Description

-

This high-level interface combines almost all components of Zenderer in an easy-to-use, abstracted way that provides versatility, efficiency, customization, and pretty scenes, of course.

-

A scene is a collection of renderable objects, lighting, and post-processing effects drawn together on the main framebuffer (otherwise know as the screen).

-

All components of the scene are managed by the scene, and the user is guaranteed to be interacting with valid references, unless they explicitly delete them from the scene via one of the Delete*() calls.

-
Todo:
Test post-processing.
- -

Definition at line 42 of file Scene.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
CScene::CScene (const uint16_t w,
const uint16_t h,
asset::CAssetManager & Mgr 
)
-
- -

Definition at line 11 of file Scene.cpp.

- -
-
- -
-
- - - - - - - -
CScene::~CScene ()
-
- -

Definition at line 18 of file Scene.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CScene::Init ()
- 		-virtual
-
- -

Implements zen::CSubsystem.

- -

Definition at line 23 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CScene::Destroy ()
- 		-virtual
-
-
Bug:
A crash occurs deleting entities.
- -

Implements zen::CSubsystem.

- -

Definition at line 30 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
obj::CEntity & CScene::AddEntity ()
-
-

If the entity is simply left as-returned, nothing will be drawn on-screen. This method is merely here to abstract away memory cleanup operations from the user and give them a valid reference to work with at all times.

-
Returns
An unloaded entity instance.
- -

Definition at line 36 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
-
-template<typename T >
- - - - - - - -
obj::CEntity & zen::gfx::CScene::AddPrimitive ()
-
-

The default primitive initialization options are specified for this primitive. If you want to specify them on your own, the suggested approach is adding a raw managed entity via AddEntity(), and then loading it with primitives yourself.

-
Returns
A CEntity& instance loaded with the given primitive.
- -

Definition at line 3 of file Scene.hpp.

- -
-
- -
-
- - - - - - - - -
CLight & CScene::AddLight (const LightType & Type)
-
-

The only setup performed on the light is the initial loading of the effects. You can check that status by just calling IsInit() on the returned instance.

-

Light render ordering is irrelevant, therefore there is no InsertLight() or GetLightIndex() method like there are for the other renderable objects.

-
Parameters
- - -
TypeThe light type you wish to create
-
-
-
Returns
A created light instance.
-
Todo:
Fix window size
- -

Definition at line 43 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
CEffect & CScene::AddEffect (const EffectType & Type)
-
-

This is a post-processing effect shader that will be applied to the entire scene after lighting, geometry, etc is renderered.

-

You can check the creation status by checking the GetError() method of the returned instance.

-

Though the effect execution order may matter, just add them in the right order, because there are no Insert() or GetIndex() methods provided for this, just like for lights.

-
Parameters
- - -
TypeThe type of post-processing you wish to add
-
-
-
Returns
The effect instance
-
See Also
gfx::CEffect::GetError()
- -

Definition at line 51 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
obj::CEntity & CScene::InsertEntity (const uint32_t index)
-
-

Sometimes, you need to have something drawn in a different order than you had originally planned. Thus this method allows you to insert entities at any point in the draw queue. This operation is O(index), meaning it's complexity varies in direct proportion to the index parameter.

-
Parameters
- - -
indexThe index to insert an entity at
-
-
-
Returns
A CEntity& instance with no data.
-
Warning
The index must be in the range of the current list, or an entity will just be inserted at the end of the internal list. The range cannot be checked because this method only returns a valid reference. Use IsValidEntityIndex() to check for a good index.
-
See Also
GetEntityIndex()
-
-IsValidEntityIndex()
- -

Definition at line 66 of file Scene.cpp.

- -
-
- -
-
- - - - - - - - -
bool CScene::RemoveEntity (const obj::CEntity & Obj)
-
-
Parameters
- - -
EntThe entity to remove from the manager
-
-
-
Returns
true if the entity was removed from the internal manager, false if it wasn't found or the index is out of range (for the indexed overload, of course).
- -

Definition at line 78 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CScene::RemoveEntity (const uint32_t index)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 96 of file Scene.cpp.

- -
-
- -
-
- - - - - - - -
bool CScene::Clear ()
-
- -

Definition at line 109 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CScene::Render ()
-
-
Todo:
Clipping.
- -

Definition at line 122 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CScene::IsValidEntityIndex (int32_t i)
-
- -

Definition at line 279 of file Scene.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
int32_t CScene::GetEntityIndex (const obj::CEntity & D)
-
- -

Definition at line 267 of file Scene.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::gfx::CScene::EnableLighting ()
- 		-inline
-
- -

Definition at line 162 of file Scene.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::gfx::CScene::DisableLighting ()
- 		-inline
-
- -

Definition at line 163 of file Scene.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::gfx::CScene::ToggleLighting ()
- 		-inline
-
- -

Definition at line 164 of file Scene.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::gfx::CScene::EnablePostProcessing ()
- 		-inline
-
- -

Definition at line 167 of file Scene.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::gfx::CScene::DisablePostProcessing ()
- 		-inline
-
- -

Definition at line 168 of file Scene.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::gfx::CScene::TogglePostProcessing ()
- 		-inline
-
- -

Definition at line 169 of file Scene.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void zen::gfx::CScene::SetSeeThrough (bool flag)
- 		-inline
-
-

If, for example, geometry is rendered prior to a call to Render() on this particular scene, and there are portions of the scene without geometry rendered to it, this will allow for that previously rendered data to be seen in those parts.

-
Parameters
- - -
flagTurn it on, or off?
-
-
-
Warning
This does not work well when combined with lighting.
-
See Also
EnableLighting()
- -

Definition at line 184 of file Scene.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
-
-template<typename T >
- - - - - - - -
obj::CEntity& zen::gfx::CScene::AddPrimitive ()
-
- -

Definition at line 2 of file Scene.inl.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene.js b/docs/classzen_1_1gfx_1_1_c_scene.js deleted file mode 100644 index b3becf8c..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene.js +++ /dev/null @@ -1,26 +0,0 @@ -var classzen_1_1gfx_1_1_c_scene = -[ - [ "CScene", "classzen_1_1gfx_1_1_c_scene.html#a01fae9d934c0922582b82a809f35e9ab", null ], - [ "~CScene", "classzen_1_1gfx_1_1_c_scene.html#a8f230d53cbde78e2a0d4a94fca1653b7", null ], - [ "Init", "classzen_1_1gfx_1_1_c_scene.html#ac7b4358bbb73e4247a0e9225f82fe284", null ], - [ "Destroy", "classzen_1_1gfx_1_1_c_scene.html#a7cd402e9baf35c2819a4351744f6c6bd", null ], - [ "AddEntity", "classzen_1_1gfx_1_1_c_scene.html#ae9bf1c452fcfd96a2549f5a5f77a770e", null ], - [ "AddPrimitive", "classzen_1_1gfx_1_1_c_scene.html#ad5c4166a9500e35047f62e3baea469d6", null ], - [ "AddLight", "classzen_1_1gfx_1_1_c_scene.html#af230cf55827776babf3608e28a0d447d", null ], - [ "AddEffect", "classzen_1_1gfx_1_1_c_scene.html#a637f4d8ba83dcb54ef7c73822b6903eb", null ], - [ "InsertEntity", "classzen_1_1gfx_1_1_c_scene.html#afda837fcd999b0566b3e7212e5d71fdf", null ], - [ "RemoveEntity", "classzen_1_1gfx_1_1_c_scene.html#a3646f0f295bbb4440d22a552226425a1", null ], - [ "RemoveEntity", "classzen_1_1gfx_1_1_c_scene.html#af4360449cd2a03481e0f7c3a8fa75512", null ], - [ "Clear", "classzen_1_1gfx_1_1_c_scene.html#a91585c003c70ee56d7721bcb7d101962", null ], - [ "Render", "classzen_1_1gfx_1_1_c_scene.html#a8a76be972608f2edf4b689eed92a61fd", null ], - [ "IsValidEntityIndex", "classzen_1_1gfx_1_1_c_scene.html#abec7fa7a09742ed866cb84e54aed4e48", null ], - [ "GetEntityIndex", "classzen_1_1gfx_1_1_c_scene.html#a64f011804bd27564dfa509d42421bf6c", null ], - [ "EnableLighting", "classzen_1_1gfx_1_1_c_scene.html#a95214df92f8dddc9434f2a52b945a72f", null ], - [ "DisableLighting", "classzen_1_1gfx_1_1_c_scene.html#a0b61113ef961ed0a10a47c665a2e4fa6", null ], - [ "ToggleLighting", "classzen_1_1gfx_1_1_c_scene.html#abb222521d57dfac131dd46b97547af71", null ], - [ "EnablePostProcessing", "classzen_1_1gfx_1_1_c_scene.html#ab98f50b4c7b8011131564e4f5db92c87", null ], - [ "DisablePostProcessing", "classzen_1_1gfx_1_1_c_scene.html#a9498b02d4699e36e9c193e06ea8f778d", null ], - [ "TogglePostProcessing", "classzen_1_1gfx_1_1_c_scene.html#a0338d84ddede678ee55827bf604f1138", null ], - [ "SetSeeThrough", "classzen_1_1gfx_1_1_c_scene.html#a775696f2a5d021fda90aa2f512cb6e28", null ], - [ "AddPrimitive", "classzen_1_1gfx_1_1_c_scene.html#a309b8c6171a4f29edcad5c63b84530a5", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a0b61113ef961ed0a10a47c665a2e4fa6_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a0b61113ef961ed0a10a47c665a2e4fa6_icgraph.map deleted file mode 100644 index 4b5bfb1f..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a0b61113ef961ed0a10a47c665a2e4fa6_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a0b61113ef961ed0a10a47c665a2e4fa6_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a0b61113ef961ed0a10a47c665a2e4fa6_icgraph.png deleted file mode 100644 index b13839f6..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a0b61113ef961ed0a10a47c665a2e4fa6_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a3646f0f295bbb4440d22a552226425a1_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a3646f0f295bbb4440d22a552226425a1_icgraph.map deleted file mode 100644 index 3ed979d5..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a3646f0f295bbb4440d22a552226425a1_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a3646f0f295bbb4440d22a552226425a1_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a3646f0f295bbb4440d22a552226425a1_icgraph.png deleted file mode 100644 index eb476a85..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a3646f0f295bbb4440d22a552226425a1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a637f4d8ba83dcb54ef7c73822b6903eb_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a637f4d8ba83dcb54ef7c73822b6903eb_icgraph.map deleted file mode 100644 index 8f2fea8a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a637f4d8ba83dcb54ef7c73822b6903eb_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a637f4d8ba83dcb54ef7c73822b6903eb_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a637f4d8ba83dcb54ef7c73822b6903eb_icgraph.png deleted file mode 100644 index 08d03eee..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a637f4d8ba83dcb54ef7c73822b6903eb_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a775696f2a5d021fda90aa2f512cb6e28_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a775696f2a5d021fda90aa2f512cb6e28_icgraph.map deleted file mode 100644 index 87c51cee..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a775696f2a5d021fda90aa2f512cb6e28_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a775696f2a5d021fda90aa2f512cb6e28_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a775696f2a5d021fda90aa2f512cb6e28_icgraph.png deleted file mode 100644 index 87312505..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a775696f2a5d021fda90aa2f512cb6e28_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a7cd402e9baf35c2819a4351744f6c6bd_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a7cd402e9baf35c2819a4351744f6c6bd_icgraph.map deleted file mode 100644 index bc74d988..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a7cd402e9baf35c2819a4351744f6c6bd_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a7cd402e9baf35c2819a4351744f6c6bd_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a7cd402e9baf35c2819a4351744f6c6bd_icgraph.png deleted file mode 100644 index e7c87096..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a7cd402e9baf35c2819a4351744f6c6bd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a8a76be972608f2edf4b689eed92a61fd_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a8a76be972608f2edf4b689eed92a61fd_icgraph.map deleted file mode 100644 index 55449b01..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a8a76be972608f2edf4b689eed92a61fd_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a8a76be972608f2edf4b689eed92a61fd_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a8a76be972608f2edf4b689eed92a61fd_icgraph.png deleted file mode 100644 index 8ef10c6c..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a8a76be972608f2edf4b689eed92a61fd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a91585c003c70ee56d7721bcb7d101962_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a91585c003c70ee56d7721bcb7d101962_icgraph.map deleted file mode 100644 index 30e99e6b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a91585c003c70ee56d7721bcb7d101962_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a91585c003c70ee56d7721bcb7d101962_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a91585c003c70ee56d7721bcb7d101962_icgraph.png deleted file mode 100644 index d11573f5..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a91585c003c70ee56d7721bcb7d101962_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a9498b02d4699e36e9c193e06ea8f778d_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_a9498b02d4699e36e9c193e06ea8f778d_icgraph.map deleted file mode 100644 index e9173cef..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_a9498b02d4699e36e9c193e06ea8f778d_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_a9498b02d4699e36e9c193e06ea8f778d_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_a9498b02d4699e36e9c193e06ea8f778d_icgraph.png deleted file mode 100644 index 202ea4db..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_a9498b02d4699e36e9c193e06ea8f778d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_ab98f50b4c7b8011131564e4f5db92c87_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_ab98f50b4c7b8011131564e4f5db92c87_icgraph.map deleted file mode 100644 index fa607cfb..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_ab98f50b4c7b8011131564e4f5db92c87_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_ab98f50b4c7b8011131564e4f5db92c87_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_ab98f50b4c7b8011131564e4f5db92c87_icgraph.png deleted file mode 100644 index 5828d4ba..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_ab98f50b4c7b8011131564e4f5db92c87_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_abec7fa7a09742ed866cb84e54aed4e48_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_abec7fa7a09742ed866cb84e54aed4e48_icgraph.map deleted file mode 100644 index 65b5f37a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_abec7fa7a09742ed866cb84e54aed4e48_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_abec7fa7a09742ed866cb84e54aed4e48_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_abec7fa7a09742ed866cb84e54aed4e48_icgraph.png deleted file mode 100644 index 757f17c2..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_abec7fa7a09742ed866cb84e54aed4e48_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_ac7b4358bbb73e4247a0e9225f82fe284_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_ac7b4358bbb73e4247a0e9225f82fe284_icgraph.map deleted file mode 100644 index 7f23ffb7..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_ac7b4358bbb73e4247a0e9225f82fe284_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_ac7b4358bbb73e4247a0e9225f82fe284_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_ac7b4358bbb73e4247a0e9225f82fe284_icgraph.png deleted file mode 100644 index 3900e62f..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_ac7b4358bbb73e4247a0e9225f82fe284_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_ae9bf1c452fcfd96a2549f5a5f77a770e_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_ae9bf1c452fcfd96a2549f5a5f77a770e_icgraph.map deleted file mode 100644 index bb9e3e30..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_ae9bf1c452fcfd96a2549f5a5f77a770e_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_ae9bf1c452fcfd96a2549f5a5f77a770e_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_ae9bf1c452fcfd96a2549f5a5f77a770e_icgraph.png deleted file mode 100644 index c19b69ab..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_ae9bf1c452fcfd96a2549f5a5f77a770e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_scene_af230cf55827776babf3608e28a0d447d_icgraph.map b/docs/classzen_1_1gfx_1_1_c_scene_af230cf55827776babf3608e28a0d447d_icgraph.map deleted file mode 100644 index 0632017a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_scene_af230cf55827776babf3608e28a0d447d_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_scene_af230cf55827776babf3608e28a0d447d_icgraph.png b/docs/classzen_1_1gfx_1_1_c_scene_af230cf55827776babf3608e28a0d447d_icgraph.png deleted file mode 100644 index 97c9cf70..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_scene_af230cf55827776babf3608e28a0d447d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_triangle_quad.js b/docs/classzen_1_1gfx_1_1_c_triangle_quad.js deleted file mode 100644 index be3d013a..00000000 --- a/docs/classzen_1_1gfx_1_1_c_triangle_quad.js +++ /dev/null @@ -1,10 +0,0 @@ -var classzen_1_1gfx_1_1_c_triangle_quad = -[ - [ "~CTriangle", "classzen_1_1gfx_1_1_c_triangle_quad.html#aca441558426604afc26a9204401d2db3", null ], - [ "CTriangle", "classzen_1_1gfx_1_1_c_triangle_quad.html#a8fbe4911bf4c324458ac4090a6db676b", null ], - [ "CTriangle", "classzen_1_1gfx_1_1_c_triangle_quad.html#a20feebfa304e03ea30ae3c59deb20ed0", null ], - [ "operator=", "classzen_1_1gfx_1_1_c_triangle_quad.html#af7ab746ae21115c99a0b9c1cccf9d829", null ], - [ "Create", "classzen_1_1gfx_1_1_c_triangle_quad.html#aed569c8e18efa39b5f1cd6dc44243261", null ], - [ "GetW", "classzen_1_1gfx_1_1_c_triangle_quad.html#a33a8856e413db9cd1f6f2782919e1be1", null ], - [ "GetH", "classzen_1_1gfx_1_1_c_triangle_quad.html#a03e10d09b3fe5e754e035865a7d90ac3", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_window.html b/docs/classzen_1_1gfx_1_1_c_window.html deleted file mode 100644 index c918f377..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window.html +++ /dev/null @@ -1,799 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfx::CWindow Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::gfx::CWindow Class Reference
Graphics
-
-
- -

Creates a renderable OpenGL context. - More...

- -

#include "Window.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CWindow (const uint16_t w, const uint16_t h, const string_t &caption, asset::CAssetManager &Mgr, const bool fullscreen=false)
 Constructs and sets up an OpenGL-enabled window for rendering. More...
 
 ~CWindow ()
 
bool Init ()
 Initializes the subsystem. More...
 
bool Destroy ()
 Destroys the current OpenGL-enabled window. More...
 
bool Clear ()
 Clears the framebuffer to black. More...
 
bool Clear (const color4f_t &Color)
 Clears the framebuffer to a specified color. More...
 
void Update () const
 Performs a context update. More...
 
bool ToggleFullscreen (int *const loaded=nullptr)
 Toggles the OpenGL context into/out of fullscreen mode. More...
 
bool EnableFullscreen (int *const loaded=nullptr)
 Enables fullscreen mode. More...
 
bool DisableFullscreen (int *const loaded=nullptr)
 
bool IsOpen () const
 
bool IsFullscreen () const
 
void Close () const
 
void SetClearBits (const uint32_t bits)
 Sets OpenGL clearing bits. More...
 
const math::matrix4x4_t & GetProjectionMatrix () const
 
uint16_t GetWidth () const
 
uint16_t GetHeight () const
 
GLFWwindow * GetWindow () const
 
math::vector_t GetMousePosition () const
 
bool GetMouseState (const evt::MouseButton &Btn) const
 
- Public Member Functions inherited from zen::CSubsystem
 CSubsystem (const string_t name="Subsystem")
 Sets subsystem to an uninitialized state. More...
 
virtual ~CSubsystem ()
 Destructor does absolutely nothing. More...
 
bool IsInit () const
 Returns the sub-system initialization status. More...
 
void SetLog (util::CLog &Log)
 Sets a custom output log. More...
 
const string_t & GetName () const
 Retrieves the subsystem name. More...
 
- - - -

-Static Public Member Functions

static bool ToggleVSYNC ()
 
- - - - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::CSubsystem
util::CLog & m_Log
 
string_t m_name
 
bool m_init
 
- Static Protected Attributes inherited from zen::CSubsystem
static std::vector< CSubsystem * > sp_allSystems
 No copying subsystems. More...
 
-

Detailed Description

-

This is a wrapper for creating a core OpenGL context to draw to. There is no testing of multiple windows (and thus multiple engine instances) but this likely isn't supported, especially since there is no way to specify which window is active. This is supported by GLFW, the underlying context creation API, so it's a potential todo. This absolutely must be the first thing you create, prior to interaction with any part of the graphics API. If it isn't, your objects will likely be invalid, or will simply fail to load (and destroy).

-
Todo:
Test / Implement multiple-context control.
- -

Definition at line 53 of file Window.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
zen::gfx::CWindow::CWindow (const uint16_t w,
const uint16_t h,
const string_t & caption,
asset::CAssetManager & Mgr,
const bool fullscreen = false 
)
-
-

The asset manager is there to allow for assets to be properly reloaded when toggling fullscreen mode. When going into (or out of) fullscreen mode, the current OpenGL context is destroyed, thus invalidating any and all handles to textures, shaders, vertex buffers, and other critical OpenGL objects used during rendering. By attaching a proper asset manager to the window, these can be reloaded on-the-fly when switching contexts.

-

Since the asset base class (zen::asset::CAsset) stores a filename, this can be used to reload the asset when necessary. Keep in mind that assets that were generated programmatically (such as various primitives) that do not depend on any files cannot normally be successfully reloaded and attached properly to the new rendering context.

-
Parameters
- - - - - - -
wWindow width
hWindow height
captionCaption to place in the title bar (windowed mode)
MgrManager to attach to window
fullscreenEnable fullscreen window? (optional)
-
-
-
Note
The window will automatically be created fullscreen in release mode (ZEN_DEBUG_BUILD) if unspecified.
-
See Also
Init()
-
-EnableFullscreen()
-
-DisableFullscreen()
-
-ToggleFullscreen()
-
-zen::asset::CAsset
- -
-
- -
-
- - - - - - - -
CWindow::~CWindow ()
-
- -

Definition at line 22 of file Window.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CWindow::Init ()
- 		-virtual
-
-

Any parameters should be passed through the derived class's constructor.

-
See Also
https://www.opengl.org/wiki/OpenGL_Loading_Library#GLEW
- -

Implements zen::CSubsystem.

- -

Definition at line 27 of file Window.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CWindow::Destroy ()
- 		-virtual
-
-

This should only be called if you are planning on calling Init() again, otherwise this will ruin any OpenGL object cleanup and cause fatal errors in debug builds. Leave the window management to zen::Quit().

-
Returns
true, always.
-
Postcondition
All assets from attached manager are destroyed.
-
Warning
Invalidates all OpenGL objects.
- -

Implements zen::CSubsystem.

- -

Definition at line 117 of file Window.cpp.

- -
-
- -
-
- - - - - - - -
bool CWindow::Clear ()
-
- -

Definition at line 128 of file Window.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CWindow::Clear (const color4f_t & Color)
-
- -

Definition at line 135 of file Window.cpp.

- -
-
- -
-
- - - - - - - -
void CWindow::Update () const
-
- -

Definition at line 142 of file Window.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CWindow::ToggleFullscreen (int *const loaded = nullptr)
-
-

Switching in and out of fullscreen mode requires a complete destruction and re-creation of the OpenGL context, invalidating any and all handles to OpenGL objects like textures, vertex buffers, and shaders. Thus, it is necessary for the user to attempt to keep track reloading assets and OpenGL data as needed. If a manager was given via AttachAssetManager(), an attempt will be made to reload all of the assets it contains via the zen::asset::CAsset::Reload method. The optional loaded parameter will be set to the number of assets that were reloaded successfully, based on the return value of the method.

-
Parameters
- - -
loadedTrack number of assets reloaded (optional=nullptr)
-
-
-
Returns
true if the window is now in fullscreen mode, and false if it was changed to windowed mode.
- -

Definition at line 147 of file Window.cpp.

- -
-
- -
-
- - - - - - - - -
bool CWindow::EnableFullscreen (int *const loaded = nullptr)
-
-

Disables fullscreen mode.

- -

Definition at line 153 of file Window.cpp.

- -
-
- -
-
- - - - - - - - -
bool CWindow::DisableFullscreen (int *const loaded = nullptr)
-
- -

Definition at line 165 of file Window.cpp.

- -
-
- -
-
- - - - - - - -
bool CWindow::IsOpen () const
-
- -

Definition at line 177 of file Window.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CWindow::IsFullscreen () const
-
- -

Definition at line 182 of file Window.cpp.

- -
-
- -
-
- - - - - - - -
void CWindow::Close () const
-
- -

Definition at line 187 of file Window.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void zen::gfx::CWindow::SetClearBits (const uint32_t bits)
-
-

By default, calling Clear() will clear the color buffer. This method allows the user to specify exactly which bits get cleared.

-
Parameters
- - -
bitsOpenGL bits to clear (GL_*_BIT)
-
-
-
See Also
GL/gl.h
- -
-
- -
-
- - - - - -
- - - - - - - -
const math::matrix4x4_t& zen::gfx::CWindow::GetProjectionMatrix () const
- 		-inline
-
- -

Definition at line 169 of file Window.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CWindow::GetWidth () const
- 		-inline
-
- -

Definition at line 172 of file Window.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfx::CWindow::GetHeight () const
- 		-inline
-
- -

Definition at line 173 of file Window.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
GLFWwindow* zen::gfx::CWindow::GetWindow () const
- 		-inline
-
-
Todo:
Remove when uneccessary.
- -

Definition at line 176 of file Window.hpp.

- -
-
- -
-
- - - - - - - -
math::vector_t CWindow::GetMousePosition () const
-
- -

Definition at line 192 of file Window.cpp.

- -
-
- -
-
- - - - - - - - -
bool CWindow::GetMouseState (const evt::MouseButton & Btn) const
-
- -

Definition at line 199 of file Window.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CWindow::ToggleVSYNC ()
- 		-static
-
- -

Definition at line 221 of file Window.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window.js b/docs/classzen_1_1gfx_1_1_c_window.js deleted file mode 100644 index 77c07f65..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window.js +++ /dev/null @@ -1,24 +0,0 @@ -var classzen_1_1gfx_1_1_c_window = -[ - [ "CWindow", "classzen_1_1gfx_1_1_c_window.html#ae2650793decd989698b4243a4ac4da3e", null ], - [ "~CWindow", "classzen_1_1gfx_1_1_c_window.html#a952e8bd3d29abbac67c252c192077c87", null ], - [ "Init", "classzen_1_1gfx_1_1_c_window.html#a5a43bdacc8a996a71bfa0255796145e8", null ], - [ "Destroy", "classzen_1_1gfx_1_1_c_window.html#a0174d1cf2c60a5b6f775751785616855", null ], - [ "Clear", "classzen_1_1gfx_1_1_c_window.html#a8c829e940b9d9fea7ac4f416e828df05", null ], - [ "Clear", "classzen_1_1gfx_1_1_c_window.html#a7f0bbe1f4f851531112c92844555761f", null ], - [ "Update", "classzen_1_1gfx_1_1_c_window.html#af21d93ba75e342c3c0010bbd86536e0c", null ], - [ "ToggleFullscreen", "classzen_1_1gfx_1_1_c_window.html#ab5987f93d975a7548e40c7c8aad1307d", null ], - [ "EnableFullscreen", "classzen_1_1gfx_1_1_c_window.html#a3339fcf4250c24f03448f1b8c51c2012", null ], - [ "DisableFullscreen", "classzen_1_1gfx_1_1_c_window.html#afd3587d5359dc9b8ac1adc0758f05a84", null ], - [ "IsOpen", "classzen_1_1gfx_1_1_c_window.html#a633a8eee54aaee24cdab3bf8f5e2f091", null ], - [ "IsFullscreen", "classzen_1_1gfx_1_1_c_window.html#a9b3c60c007d0108ee82304277549b7ad", null ], - [ "Close", "classzen_1_1gfx_1_1_c_window.html#ac2ec148343bb7675d331f06bed192ab3", null ], - [ "SetClearBits", "classzen_1_1gfx_1_1_c_window.html#ac142af8c14b730f077e35445934ff0be", null ], - [ "GetProjectionMatrix", "classzen_1_1gfx_1_1_c_window.html#aec125cfb8e67f9339fddff514a4b529b", null ], - [ "GetWidth", "classzen_1_1gfx_1_1_c_window.html#a8852633544730f480dad49ad4b53dbf6", null ], - [ "GetHeight", "classzen_1_1gfx_1_1_c_window.html#ae3b4451816d29a80829d70a87fad62b5", null ], - [ "GetWindow", "classzen_1_1gfx_1_1_c_window.html#a7574da6790394665fb63d5be9058543b", null ], - [ "GetMousePosition", "classzen_1_1gfx_1_1_c_window.html#ad1976ef7e312c2df8694759f9a421fb3", null ], - [ "GetMouseState", "classzen_1_1gfx_1_1_c_window.html#ab9ed5973af4d2224a482eae56ebad084", null ], - [ "ToggleVSYNC", "classzen_1_1gfx_1_1_c_window.html#a63143db627c180d561c2162019c741d7", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1_c_window_a5a43bdacc8a996a71bfa0255796145e8_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_a5a43bdacc8a996a71bfa0255796145e8_icgraph.map deleted file mode 100644 index eaed456f..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_a5a43bdacc8a996a71bfa0255796145e8_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_a5a43bdacc8a996a71bfa0255796145e8_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_a5a43bdacc8a996a71bfa0255796145e8_icgraph.png deleted file mode 100644 index 3a1694bf..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_a5a43bdacc8a996a71bfa0255796145e8_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_a63143db627c180d561c2162019c741d7_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_a63143db627c180d561c2162019c741d7_icgraph.map deleted file mode 100644 index 4011541c..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_a63143db627c180d561c2162019c741d7_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_a63143db627c180d561c2162019c741d7_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_a63143db627c180d561c2162019c741d7_icgraph.png deleted file mode 100644 index 3185ac10..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_a63143db627c180d561c2162019c741d7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_a633a8eee54aaee24cdab3bf8f5e2f091_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_a633a8eee54aaee24cdab3bf8f5e2f091_icgraph.map deleted file mode 100644 index d0767235..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_a633a8eee54aaee24cdab3bf8f5e2f091_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_a633a8eee54aaee24cdab3bf8f5e2f091_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_a633a8eee54aaee24cdab3bf8f5e2f091_icgraph.png deleted file mode 100644 index 58ac1307..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_a633a8eee54aaee24cdab3bf8f5e2f091_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_a8852633544730f480dad49ad4b53dbf6_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_a8852633544730f480dad49ad4b53dbf6_icgraph.map deleted file mode 100644 index 00750dcf..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_a8852633544730f480dad49ad4b53dbf6_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_a8852633544730f480dad49ad4b53dbf6_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_a8852633544730f480dad49ad4b53dbf6_icgraph.png deleted file mode 100644 index ae90eded..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_a8852633544730f480dad49ad4b53dbf6_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_a8c829e940b9d9fea7ac4f416e828df05_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_a8c829e940b9d9fea7ac4f416e828df05_icgraph.map deleted file mode 100644 index 6275a413..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_a8c829e940b9d9fea7ac4f416e828df05_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_a8c829e940b9d9fea7ac4f416e828df05_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_a8c829e940b9d9fea7ac4f416e828df05_icgraph.png deleted file mode 100644 index 671296a8..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_a8c829e940b9d9fea7ac4f416e828df05_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_ac2ec148343bb7675d331f06bed192ab3_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_ac2ec148343bb7675d331f06bed192ab3_icgraph.map deleted file mode 100644 index 54132f21..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_ac2ec148343bb7675d331f06bed192ab3_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_ac2ec148343bb7675d331f06bed192ab3_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_ac2ec148343bb7675d331f06bed192ab3_icgraph.png deleted file mode 100644 index 5b074c78..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_ac2ec148343bb7675d331f06bed192ab3_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_ae3b4451816d29a80829d70a87fad62b5_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_ae3b4451816d29a80829d70a87fad62b5_icgraph.map deleted file mode 100644 index 56a5aa88..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_ae3b4451816d29a80829d70a87fad62b5_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_ae3b4451816d29a80829d70a87fad62b5_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_ae3b4451816d29a80829d70a87fad62b5_icgraph.png deleted file mode 100644 index 3e2f4e21..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_ae3b4451816d29a80829d70a87fad62b5_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1_c_window_af21d93ba75e342c3c0010bbd86536e0c_icgraph.map b/docs/classzen_1_1gfx_1_1_c_window_af21d93ba75e342c3c0010bbd86536e0c_icgraph.map deleted file mode 100644 index 7c878b7b..00000000 --- a/docs/classzen_1_1gfx_1_1_c_window_af21d93ba75e342c3c0010bbd86536e0c_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1_c_window_af21d93ba75e342c3c0010bbd86536e0c_icgraph.png b/docs/classzen_1_1gfx_1_1_c_window_af21d93ba75e342c3c0010bbd86536e0c_icgraph.png deleted file mode 100644 index 720477bb..00000000 Binary files a/docs/classzen_1_1gfx_1_1_c_window_af21d93ba75e342c3c0010bbd86536e0c_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_concave_polygon.html b/docs/classzen_1_1gfx_1_1z_concave_polygon.html index ac5166aa..3cf59f0f 100644 --- a/docs/classzen_1_1gfx_1_1z_concave_polygon.html +++ b/docs/classzen_1_1gfx_1_1z_concave_polygon.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -125,13 +125,12 @@    ~zConcavePolygon ()   -virtual zPolygon & Create () - Creates the polygon from the internally stored vertices. More...
-  +virtual zPolygon & Create () +  - Public Member Functions inherited from zen::gfx::zPolygon  zPolygon (asset::zAssetManager &Assets, const size_t preload=0)   - ~zPolygon () +virtual ~zPolygon ()    zPolygon (const zPolygon &Copy)   @@ -140,6 +139,9 @@ void AddVertex (const math::vector_t &Position)  Adds a vertex to the polygon at the specified position. More...
  +virtual zPolygon & Create (const bool do_triangulation=true) + Creates the polygon from the internally stored vertices. More...
+  virtual void Move (const math::vector_t &Position)  Moves the drawable to a certain location. More...
  @@ -157,17 +159,19 @@ void LoadIntoVAO (gfxcore::zVertexArray &VAO, const bool preserve=true)  Shortcut to prevent loading simple objects manually. More...
  -virtual bool Collides (const zPolygon &Other, math::vector_t *poi=nullptr) - Attempts collision detection with another polygon. More...
-  -virtual bool Collides (const math::aabb_t &other) -  +virtual bool Collides (const zPolygon &Other, math::cquery_t *q=nullptr) const + Attempts collision detection with another polygon. More...
+  +virtual bool Collides (const math::aabb_t &other) const +  void SetIndices (const std::vector< gfxcore::index_t > &Indices)  Overrides default index creation for the added vertices. More...
  void SetColor (const color4f_t &Color)  Sets the vertex color of the created vertices. More...
  +void SetColor (const real_t r, const real_t g, const real_t b, const real_t a=1.0) +  const std::vector
< math::vector_t > & GetTriangulation () const   @@ -185,16 +189,22 @@ uint16_t GetW () const  Gets preset width for the current vertices. More...
  +int16_t CalcX () const + Calculates the lowest X value for the polygon. More...
+  +int16_t CalcY () const + Calculates the lowest Y value for the polygon. More...
+  uint16_t CalcH ()  Calculates maximum height for the current vertices. More...
  uint16_t CalcW ()  Calculates width for the current vertices. More...
  -int GetLowPoint () const -  -int GetLeftPoint () const -  +int GetLowPoint () const +  +int GetLeftPoint () const +  bool IsModifiable () const  Request to see if we can change the internal vertices or not. More...
  @@ -273,7 +283,7 @@

Member Function Documentation

- +
@@ -281,7 +291,7 @@

Member Function Documentation

@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -442,7 +442,7 @@

Member Function Documentation

- +

@@ -478,7 +478,7 @@

Member Function Documentation

- +

@@ -531,7 +531,7 @@

Member Function Documentation

- +

@@ -634,7 +634,7 @@

Member Function Documentation

- +

@@ -668,7 +668,7 @@

Member Function Documentation

- +

@@ -754,7 +754,7 @@

Member Function Documentation

- +

@@ -814,7 +814,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.map index 48a3bae2..44efc200 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.map @@ -1,22 +1,24 @@ - - + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.png index 91929608..f2643646 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_a41984ac2a64d8bcb7d83a427f0806dd4_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.map index 3bc217b5..7116c0cb 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.map @@ -1,14 +1,15 @@ - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.png index efec87b3..98ed95b7 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_a43daea858e13c760de4f0c0af715d880_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.map index d8fd5a52..7d0f2ed2 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.map @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.png index e9dba820..d1c80749 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_a5b23e013a9af07ffc5c4d6d28d442b86_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.map index fbf24514..9322cd80 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.map @@ -1,19 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.png index 6570d306..07bc3576 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_a6bffe94d832c9fbddad60112ee6d1ac0_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.map index 0ee94241..38773a62 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.map @@ -1,12 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.png index 12b38b3a..86cd2333 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_a721e306846c082f43701117d0a579946_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.map index 5f233084..89f36acc 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.map @@ -3,8 +3,9 @@ - - - - + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.png index 2331f796..3baacd26 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_aa548ff18a71cee074c77587e2f6f9959_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.map b/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.map index a24eb33a..a8121209 100644 --- a/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.map @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.png b/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.png index 956bef50..3990c21e 100644 Binary files a/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.png and b/docs/classzen_1_1gfx_1_1z_effect_af3cb1da0385e7470efe9b7b13d1ab515_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light.html b/docs/classzen_1_1gfx_1_1z_light.html index af6888a2..562a29ca 100644 --- a/docs/classzen_1_1gfx_1_1z_light.html +++ b/docs/classzen_1_1gfx_1_1z_light.html @@ -30,9 +30,9 @@
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -227,7 +227,7 @@
- + @@ -293,13 +303,18 @@

Member Function Documentation

zPolygon & zConcavePolygon::Create gfx::zPolygon & zConcavePolygon::Create ( )
-
Precondition
>= 3 vertices have been added to the polygon.
-
Postcondition
No temporary vertices are stored until AddVertex() is called again.
- -

Reimplemented from zen::gfx::zPolygon.

Definition at line 24 of file ConcavePolygon.cpp.

+

+Here is the caller graph for this function:
+
+
+ + +
+

+
The documentation for this class was generated from the following files:
    diff --git a/docs/classzen_1_1gfx_1_1z_concave_polygon.js b/docs/classzen_1_1gfx_1_1z_concave_polygon.js index 691efb04..4d3f62ab 100644 --- a/docs/classzen_1_1gfx_1_1z_concave_polygon.js +++ b/docs/classzen_1_1gfx_1_1z_concave_polygon.js @@ -2,5 +2,5 @@ var classzen_1_1gfx_1_1z_concave_polygon = [ [ "zConcavePolygon", "classzen_1_1gfx_1_1z_concave_polygon.html#a595421bc42e6ba537614c12d1a4ab371", null ], [ "~zConcavePolygon", "classzen_1_1gfx_1_1z_concave_polygon.html#a63c8d13eb8b8983eeb0ca1912b38e889", null ], - [ "Create", "classzen_1_1gfx_1_1z_concave_polygon.html#a10251b694ecba0fb2ec99fe53c05f79d", null ] + [ "Create", "classzen_1_1gfx_1_1z_concave_polygon.html#ab9a368fae6346609c591204180b5ed04", null ] ]; \ No newline at end of file diff --git a/docs/classzen_1_1gfx_1_1z_concave_polygon_ab9a368fae6346609c591204180b5ed04_icgraph.map b/docs/classzen_1_1gfx_1_1z_concave_polygon_ab9a368fae6346609c591204180b5ed04_icgraph.map new file mode 100644 index 00000000..f0930d12 --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_concave_polygon_ab9a368fae6346609c591204180b5ed04_icgraph.map @@ -0,0 +1,4 @@ + + + + diff --git a/docs/classzen_1_1gfx_1_1z_concave_polygon_ab9a368fae6346609c591204180b5ed04_icgraph.png b/docs/classzen_1_1gfx_1_1z_concave_polygon_ab9a368fae6346609c591204180b5ed04_icgraph.png new file mode 100644 index 00000000..151b4996 Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_concave_polygon_ab9a368fae6346609c591204180b5ed04_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_effect.html b/docs/classzen_1_1gfx_1_1z_effect.html index 15ba05e1..ac7dbbe5 100644 --- a/docs/classzen_1_1gfx_1_1z_effect.html +++ b/docs/classzen_1_1gfx_1_1z_effect.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
-

Definition at line 25 of file Light.cpp.

+

Definition at line 24 of file Light.cpp.

@@ -245,7 +245,7 @@

Member Function Documentation

-

Definition at line 30 of file Light.cpp.

+

Definition at line 29 of file Light.cpp.

Here is the caller graph for this function:
@@ -293,7 +293,7 @@

Member Function Documentation

- +

@@ -319,7 +319,7 @@

Member Function Documentation

- +

@@ -374,7 +374,7 @@

Member Function Documentation

- +

@@ -417,7 +417,7 @@

Member Function Documentation

- +

@@ -478,7 +478,7 @@

Member Function Documentation

- +

@@ -525,7 +525,7 @@

Member Function Documentation

-
Todo:
Figure out why the 200px offset is necessary.
+
Todo:
Figure out why the 200px offset is necessary.

Definition at line 154 of file Light.cpp.

@@ -534,7 +534,7 @@

Member Function Documentation

- +

@@ -579,7 +579,7 @@

Member Function Documentation

- +

@@ -606,7 +606,7 @@

Member Function Documentation

- +

@@ -628,15 +628,6 @@

Member Function Documentation

Definition at line 184 of file Light.cpp.

-

-Here is the caller graph for this function:
-
-
- - -
-

-
@@ -710,7 +701,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.map index f970e032..be41d48c 100644 --- a/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.map @@ -1,4 +1,6 @@ - - + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.png index 2c6c7efa..b2cbfa91 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_a0af149a504bddc4726bdcbca49461883_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.map index 1b3e4cad..2086b969 100644 --- a/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.map @@ -1,6 +1,7 @@ - - - + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.png index d392e9b4..dd40d801 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_a2bb6a384afd9f987ae7cbefca7bd4206_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.map index cafb80b9..2a35b1d7 100644 --- a/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.map @@ -1,8 +1,9 @@ - - - - - + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.png index f20ad4e1..885b1989 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_a3f2116f95076a1dabff8e92d473aff25_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.map index 5859075a..06fb7e93 100644 --- a/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.map @@ -1,4 +1,6 @@ - - + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.png index f11843b1..ce81cf5b 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_a6ceaf85f16dd8bed926f1555a36cdb6b_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.map index 82cfe035..da43fe88 100644 --- a/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.map @@ -1,7 +1,8 @@ - - - - + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.png index e8e02f24..6a2466a2 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_a750b1a6baa892c3bd28c45492a58264d_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.map index 73a1d3e0..0c119b30 100644 --- a/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.map @@ -1,8 +1,9 @@ - - - - - + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.png index a1ac785f..5ad8f8be 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_a88e3dfd6578acaf653f7f40a585ee892_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_ac6dfc7af8d9c157fce58d2fbbc460f11_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_ac6dfc7af8d9c157fce58d2fbbc460f11_icgraph.map deleted file mode 100644 index 9044a4d5..00000000 --- a/docs/classzen_1_1gfx_1_1z_light_ac6dfc7af8d9c157fce58d2fbbc460f11_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1z_light_ac6dfc7af8d9c157fce58d2fbbc460f11_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_ac6dfc7af8d9c157fce58d2fbbc460f11_icgraph.png deleted file mode 100644 index 9fd7fb78..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_light_ac6dfc7af8d9c157fce58d2fbbc460f11_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.map index b776acc4..c8f111f6 100644 --- a/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.map @@ -1,6 +1,7 @@ - - - + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.png index f68c1ec3..abbb6a3b 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_ad0c225879baccdb81db9206d0350d269_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.map index 97a0ec39..a8168515 100644 --- a/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.map @@ -1,3 +1,4 @@ + diff --git a/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.png index a368bf76..f538977a 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_ad378e8b65a3977cfd292441e3a31b783_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.map b/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.map index 9b7b0711..dc9ca301 100644 --- a/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.map @@ -1,9 +1,10 @@ - - - - - - + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.png b/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.png index 1d8b5f18..ba65594e 100644 Binary files a/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.png and b/docs/classzen_1_1gfx_1_1z_light_ad58b74bcf6cfb1f365560dde0a3ef92f_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_material.html b/docs/classzen_1_1gfx_1_1z_material.html index 8a3e16b2..24fadb28 100644 --- a/docs/classzen_1_1gfx_1_1z_material.html +++ b/docs/classzen_1_1gfx_1_1z_material.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -218,7 +218,7 @@
-

Definition at line 19 of file Material.cpp.

+

Definition at line 18 of file Material.cpp.

@@ -235,7 +235,7 @@
-

Definition at line 34 of file Material.cpp.

+

Definition at line 33 of file Material.cpp.

@@ -271,7 +271,7 @@

Member Function Documentation

See Also
Specification
-

Definition at line 39 of file Material.cpp.

+

Definition at line 38 of file Material.cpp.

Here is the caller graph for this function:
@@ -327,7 +327,7 @@

Member Function Documentation

zen::util::zParser::LoadFromStream()
-

Definition at line 71 of file Material.cpp.

+

Definition at line 70 of file Material.cpp.

Here is the caller graph for this function:
@@ -354,14 +354,14 @@

Member Function Documentation

-

Definition at line 98 of file Material.cpp.

+

Definition at line 97 of file Material.cpp.

Here is the caller graph for this function:
- +

@@ -381,14 +381,14 @@

Member Function Documentation

-

Definition at line 124 of file Material.cpp.

+

Definition at line 123 of file Material.cpp.

Here is the caller graph for this function:
- +

@@ -408,7 +408,7 @@

Member Function Documentation

-

Definition at line 138 of file Material.cpp.

+

Definition at line 137 of file Material.cpp.

@@ -426,14 +426,14 @@

Member Function Documentation

-

Definition at line 145 of file Material.cpp.

+

Definition at line 144 of file Material.cpp.

Here is the caller graph for this function:
- +

@@ -504,14 +504,14 @@

Member Function Documentation

-

Definition at line 167 of file Material.cpp.

+

Definition at line 166 of file Material.cpp.

Here is the caller graph for this function:
- +

@@ -530,7 +530,7 @@

Member Function Documentation

-

Definition at line 172 of file Material.cpp.

+

Definition at line 171 of file Material.cpp.

@@ -547,7 +547,7 @@

Member Function Documentation

-

Definition at line 177 of file Material.cpp.

+

Definition at line 176 of file Material.cpp.

Here is the caller graph for this function:
@@ -573,7 +573,7 @@

Member Function Documentation

-

Definition at line 182 of file Material.cpp.

+

Definition at line 181 of file Material.cpp.

Here is the caller graph for this function:
@@ -599,7 +599,7 @@

Member Function Documentation

-

Definition at line 187 of file Material.cpp.

+

Definition at line 186 of file Material.cpp.

@@ -616,7 +616,7 @@

Member Function Documentation

-

Definition at line 192 of file Material.cpp.

+

Definition at line 191 of file Material.cpp.

@@ -633,14 +633,14 @@

Member Function Documentation

-

Definition at line 197 of file Material.cpp.

+

Definition at line 196 of file Material.cpp.

Here is the caller graph for this function:
- +

@@ -674,14 +674,14 @@

Member Function Documentation

-

Definition at line 207 of file Material.cpp.

+

Definition at line 206 of file Material.cpp.

Here is the caller graph for this function:
- +

diff --git a/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.map b/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.map index 9ddd41e5..a02e8b73 100644 --- a/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.map @@ -1,13 +1,14 @@ - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.png b/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.png index 37306c6e..a6c52a77 100644 Binary files a/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.png and b/docs/classzen_1_1gfx_1_1z_material_a202d56fa36200af0a257ef644206b9f0_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.map b/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.map index 721eb41a..a41962bf 100644 --- a/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.map @@ -1,16 +1,17 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.png b/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.png index 85d59076..ee5f2ca9 100644 Binary files a/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.png and b/docs/classzen_1_1gfx_1_1z_material_a4cbfde3e3944b735e9e67a4b55fe7594_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.map b/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.map index a07dee16..45947366 100644 --- a/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.png b/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.png index 47d1862f..63488024 100644 Binary files a/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.png and b/docs/classzen_1_1gfx_1_1z_material_a8f82d5c3f189e6493b322b43f0fba50c_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.map b/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.map index d8b688e4..adf0e6db 100644 --- a/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.map @@ -1,9 +1,10 @@ - - - - - - - + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.png b/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.png index f51b3695..5ecf980a 100644 Binary files a/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.png and b/docs/classzen_1_1gfx_1_1z_material_aceadc7675f220a26dc57ac615ee8a856_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.map b/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.map index d42313b7..43b9eeb5 100644 --- a/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.png b/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.png index 1c4f1ad7..42a0393a 100644 Binary files a/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.png and b/docs/classzen_1_1gfx_1_1z_material_ad2efdd2bd417020f5044d40a81cd7db2_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.map b/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.map index 93c8990d..8fa0d9db 100644 --- a/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.map @@ -1,15 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.png b/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.png index 1241460c..7d9a4c80 100644 Binary files a/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.png and b/docs/classzen_1_1gfx_1_1z_material_af84a61503a11b2cf804488ba25d88b82_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon.html b/docs/classzen_1_1gfx_1_1z_polygon.html index 118cbe20..04f918e1 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon.html +++ b/docs/classzen_1_1gfx_1_1z_polygon.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -125,7 +125,7 @@ Public Member Functions  zPolygon (asset::zAssetManager &Assets, const size_t preload=0)   - ~zPolygon () +virtual ~zPolygon ()    zPolygon (const zPolygon &Copy)   @@ -134,9 +134,9 @@ void AddVertex (const math::vector_t &Position)  Adds a vertex to the polygon at the specified position. More...
  -virtual zPolygon & Create () - Creates the polygon from the internally stored vertices. More...
-  +virtual zPolygon & Create (const bool do_triangulation=true) + Creates the polygon from the internally stored vertices. More...
+  virtual void Move (const math::vector_t &Position)  Moves the drawable to a certain location. More...
  @@ -154,17 +154,19 @@ void LoadIntoVAO (gfxcore::zVertexArray &VAO, const bool preserve=true)  Shortcut to prevent loading simple objects manually. More...
  -virtual bool Collides (const zPolygon &Other, math::vector_t *poi=nullptr) - Attempts collision detection with another polygon. More...
-  -virtual bool Collides (const math::aabb_t &other) -  +virtual bool Collides (const zPolygon &Other, math::cquery_t *q=nullptr) const + Attempts collision detection with another polygon. More...
+  +virtual bool Collides (const math::aabb_t &other) const +  void SetIndices (const std::vector< gfxcore::index_t > &Indices)  Overrides default index creation for the added vertices. More...
  void SetColor (const color4f_t &Color)  Sets the vertex color of the created vertices. More...
  +void SetColor (const real_t r, const real_t g, const real_t b, const real_t a=1.0) +  const std::vector
< math::vector_t > & GetTriangulation () const   @@ -182,16 +184,22 @@ uint16_t GetW () const  Gets preset width for the current vertices. More...
  +int16_t CalcX () const + Calculates the lowest X value for the polygon. More...
+  +int16_t CalcY () const + Calculates the lowest Y value for the polygon. More...
+  uint16_t CalcH ()  Calculates maximum height for the current vertices. More...
  uint16_t CalcW ()  Calculates width for the current vertices. More...
  -int GetLowPoint () const -  -int GetLeftPoint () const -  +int GetLowPoint () const +  +int GetLeftPoint () const +  bool IsModifiable () const  Request to see if we can change the internal vertices or not. More...
  @@ -223,9 +231,9 @@

Detailed Description

This is a class representing an arbitrary convex polygon that can accept any number of vertices. It does NOT work with concave polygons, meaning there can be no way to connect any two vertices with a line that goes outside of the polygon. The polygon will be generated, of course, since there is no check for concavity, but it will simply not look correct when rendered on-screen.

The polygon is generated by drawing triangles to each individual vertex, beginning from the first vertex added.

-

Polygons present the basis for inheriting classes that provide pre-baked vertex configurations, such as gfx::zQuad. Vertices are stored in a temporary buffer until Create() is called.

+

Polygons present the basis for inheriting classes that provide pre-baked vertex configurations, such as gfx::zQuad. Vertices are stored in a temporary buffer until Create() is called.

-

Definition at line 35 of file Polygon.hpp.

+

Definition at line 37 of file Polygon.hpp.

Constructor & Destructor Documentation

@@ -256,6 +264,9 @@
+ + + + + +
@@ -264,9 +275,14 @@
zPolygon::~zPolygon
+ 		+virtual
-

Definition at line 78 of file Polygon.cpp.

+

Definition at line 75 of file Polygon.cpp.

@@ -302,7 +318,7 @@
-

Definition at line 56 of file Polygon.cpp.

+

Definition at line 55 of file Polygon.cpp.

@@ -328,20 +344,20 @@

Member Function Documentation

-

Definition at line 121 of file Polygon.cpp.

+

Definition at line 118 of file Polygon.cpp.

Here is the caller graph for this function:
- +

- +
@@ -351,7 +367,8 @@

Member Function Documentation

- + +
zPolygon & zPolygon::Create ()const bool do_triangulation = true)
@@ -361,19 +378,26 @@

Member Function Documentation

+

If do_triangulation is set to false, the internal triangulation storage will simply default to the contents of the current temporary vertices. This comes in handy if, for example, you wish to directly implement a concave polygon (without using zConcavePolygon). In this case, you would set custom indices, then Create() the polygon without triangulation, since the vertices you've given would already form triangles. This type of processing is used by zen::lvl::zLevelLoader.

+
Parameters
+ + +
do_triangulationShould we triangulate?
+
+
Precondition
>= 3 vertices have been added to the polygon.
Postcondition
No temporary vertices are stored until AddVertex() is called again.
-

Reimplemented in zen::gfx::zQuad, and zen::gfx::zConcavePolygon.

+

Reimplemented in zen::gfx::zQuad.

-

Definition at line 126 of file Polygon.cpp.

+

Definition at line 123 of file Polygon.cpp.

Here is the caller graph for this function:
-
- - +
+ +

@@ -408,14 +432,14 @@

Member Function Documentation

-

Definition at line 87 of file Polygon.cpp.

+

Definition at line 84 of file Polygon.cpp.

Here is the caller graph for this function:
- +

@@ -454,7 +478,7 @@

Member Function Documentation

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 98 of file Polygon.cpp.

+

Definition at line 95 of file Polygon.cpp.

@@ -478,17 +502,17 @@

Member Function Documentation

-
Precondition
Create() or Draw() haven't been called yet.
+
Precondition
Create() or Draw() haven't been called yet.
Note
I promise the given material won't be modified.
-

Definition at line 109 of file Polygon.cpp.

+

Definition at line 106 of file Polygon.cpp.

Here is the caller graph for this function:
- +

@@ -507,7 +531,7 @@

Member Function Documentation

-

Definition at line 115 of file Polygon.cpp.

+

Definition at line 112 of file Polygon.cpp.

@@ -533,14 +557,14 @@

Member Function Documentation

Returns
true if drawing was successful, false otherwise.
-

Definition at line 183 of file Polygon.cpp.

+

Definition at line 162 of file Polygon.cpp.

Here is the caller graph for this function:
- +

@@ -578,11 +602,11 @@

Member Function Documentation

-

Definition at line 237 of file Polygon.cpp.

+

Definition at line 216 of file Polygon.cpp.

- +
@@ -598,13 +622,13 @@

Member Function Documentation

- - + + - +
math::vector_t * poi = nullptr math::cquery_t * q = nullptr 
) const
@@ -617,26 +641,26 @@

Member Function Documentation

Parameters
- +
OtherPolygon to check collision with
poiOptional point of impact specifier.
qOptional collision info specifier.
Returns
true if this polygon collides with the given parameter, false otherwise.
-

Reimplemented in zen::gfx::zQuad.

+

Reimplemented in zen::gfx::zQuad.

Here is the caller graph for this function:
-
- - +
+ +

- +
@@ -644,11 +668,11 @@

Member Function Documentation

@@ -659,10 +683,6 @@

Member Function Documentation

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Reimplemented in zen::gfx::zQuad.

- -

Definition at line 279 of file Polygon.cpp.

-
@@ -686,16 +706,7 @@

Member Function Documentation

-

Definition at line 302 of file Polygon.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

+

Definition at line 297 of file Polygon.cpp.

@@ -713,17 +724,56 @@

Member Function Documentation

- + - +
bool zPolygon::Collides virtual bool zen::gfx::zPolygon::Collides ( const math::aabb_t &  other) const
-

Definition at line 295 of file Polygon.cpp.

+

Definition at line 284 of file Polygon.cpp.

Here is the caller graph for this function:
- +

+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
void zen::gfx::zPolygon::SetColor (const real_t r,
const real_t g,
const real_t b,
const real_t a = 1.0 
)
+
+

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

+
@@ -747,14 +797,14 @@

Member Function Documentation

-

Definition at line 149 of file Polygon.hpp.

+

Definition at line 165 of file Polygon.hpp.

Here is the caller graph for this function:
- +

@@ -781,7 +831,7 @@

Member Function Documentation

-

Definition at line 151 of file Polygon.hpp.

+

Definition at line 167 of file Polygon.hpp.

@@ -806,7 +856,7 @@

Member Function Documentation

-

Definition at line 155 of file Polygon.hpp.

+

Definition at line 171 of file Polygon.hpp.

@@ -831,7 +881,7 @@

Member Function Documentation

-

Definition at line 157 of file Polygon.hpp.

+

Definition at line 173 of file Polygon.hpp.

@@ -856,7 +906,7 @@

Member Function Documentation

-

Definition at line 158 of file Polygon.hpp.

+

Definition at line 174 of file Polygon.hpp.

@@ -881,14 +931,14 @@

Member Function Documentation

-

Definition at line 161 of file Polygon.hpp.

+

Definition at line 177 of file Polygon.hpp.

Here is the caller graph for this function:
- +

@@ -915,121 +965,157 @@

Member Function Documentation

-

Definition at line 164 of file Polygon.hpp.

+

Definition at line 180 of file Polygon.hpp.

Here is the caller graph for this function:
- +

- +
- + - +
uint16_t zPolygon::CalcH int16_t zPolygon::CalcX ( ) const
-

Caches it for retrieval via GetH().

-

Definition at line 312 of file Polygon.cpp.

+

Definition at line 307 of file Polygon.cpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

- +
- + - +
uint16_t zPolygon::CalcW int16_t zPolygon::CalcY ( ) const
-

Caches it for retrieval via GetW().

-

Definition at line 338 of file Polygon.cpp.

+

Definition at line 324 of file Polygon.cpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

- +
- - - - - -
- + - +
int zen::gfx::zPolygon::GetLowPoint uint16_t zPolygon::CalcH ( ) const
- 		-inline
+

Caches it for retrieval via GetH().

-

Definition at line 174 of file Polygon.hpp.

+

Definition at line 341 of file Polygon.cpp.

Here is the caller graph for this function:
-
- - +
+ +

- +
- - - - - -
- + - +
int zen::gfx::zPolygon::GetLeftPoint uint16_t zPolygon::CalcW ( ) const
- 		-inline
+

Caches it for retrieval via GetW().

-

Definition at line 193 of file Polygon.hpp.

+

Definition at line 367 of file Polygon.cpp.

Here is the caller graph for this function:
-
- - +
+ +

+
+
+ +
+
+ + + + + + + +
int zPolygon::GetLowPoint () const
+
+ +

Definition at line 393 of file Polygon.cpp.

+ +
+
+ +
+
+ + + + + + + +
int zPolygon::GetLeftPoint () const
+
+ +

Definition at line 410 of file Polygon.cpp.

+
@@ -1045,7 +1131,7 @@

Member Function Documentation

-

Definition at line 364 of file Polygon.cpp.

+

Definition at line 427 of file Polygon.cpp.

Here is the caller graph for this function:
@@ -1071,14 +1157,14 @@

Member Function Documentation

-

Definition at line 369 of file Polygon.cpp.

+

Definition at line 432 of file Polygon.cpp.

Here is the caller graph for this function:
- +

@@ -1105,7 +1191,7 @@

Member Function Documentation

-

Definition at line 227 of file Polygon.hpp.

+

Definition at line 214 of file Polygon.hpp.

@@ -1128,7 +1214,7 @@

Field Documentation

-

Definition at line 229 of file Polygon.hpp.

+

Definition at line 216 of file Polygon.hpp.

@@ -1150,7 +1236,7 @@

Field Documentation

-

Definition at line 229 of file Polygon.hpp.

+

Definition at line 216 of file Polygon.hpp.

@@ -1172,7 +1258,7 @@

Field Documentation

-

Definition at line 230 of file Polygon.hpp.

+

Definition at line 217 of file Polygon.hpp.

@@ -1194,7 +1280,7 @@

Field Documentation

-

Definition at line 231 of file Polygon.hpp.

+

Definition at line 218 of file Polygon.hpp.

@@ -1216,7 +1302,7 @@

Field Documentation

-

Definition at line 232 of file Polygon.hpp.

+

Definition at line 219 of file Polygon.hpp.

@@ -1238,7 +1324,7 @@

Field Documentation

-

Definition at line 233 of file Polygon.hpp.

+

Definition at line 220 of file Polygon.hpp.

@@ -1260,7 +1346,7 @@

Field Documentation

-

Definition at line 234 of file Polygon.hpp.

+

Definition at line 221 of file Polygon.hpp.

diff --git a/docs/classzen_1_1gfx_1_1z_polygon.js b/docs/classzen_1_1gfx_1_1z_polygon.js index 69fae92f..c242c578 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon.js +++ b/docs/classzen_1_1gfx_1_1z_polygon.js @@ -5,17 +5,18 @@ var classzen_1_1gfx_1_1z_polygon = [ "zPolygon", "classzen_1_1gfx_1_1z_polygon.html#a671a04f2358287c3d03d5f296bf5077b", null ], [ "zPolygon", "classzen_1_1gfx_1_1z_polygon.html#ab51b46d8382897edc481d19f1af419ef", null ], [ "AddVertex", "classzen_1_1gfx_1_1z_polygon.html#ad40c6155bf17ce17ebb5f3e95266820e", null ], - [ "Create", "classzen_1_1gfx_1_1z_polygon.html#ac9df030c2f41e4454a7b6d260e0fd21a", null ], + [ "Create", "classzen_1_1gfx_1_1z_polygon.html#a1955ad2231b3b46bbf4f4e2408be3c62", null ], [ "Move", "classzen_1_1gfx_1_1z_polygon.html#a40ae71e4df1b6fe15500d1367d749193", null ], [ "Move", "classzen_1_1gfx_1_1z_polygon.html#a631f77c20d84f47ebebe768a405b5bf3", null ], [ "AttachMaterial", "classzen_1_1gfx_1_1z_polygon.html#a679c54a2052d619caea511cdc1ce4e80", null ], [ "RemoveMaterial", "classzen_1_1gfx_1_1z_polygon.html#a1e58cf0134e0693790713f7791f2d736", null ], [ "Draw", "classzen_1_1gfx_1_1z_polygon.html#ab7fb29249ab405cc610bb5e451397fea", null ], [ "LoadIntoVAO", "classzen_1_1gfx_1_1z_polygon.html#a8477362b059957c20edb7dfe4ff04fd9", null ], - [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a7cd1ed28b12be147b3567325035588ab", null ], - [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a3574b7e895e99b3aba9352083b86e36b", null ], + [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a445f57a850cd65629ba96595172d2ef4", null ], + [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a05f999895093561101c8016f43f2a464", null ], [ "SetIndices", "classzen_1_1gfx_1_1z_polygon.html#ae812840875c700f99062aa1c34fe9a4f", null ], [ "SetColor", "classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3", null ], + [ "SetColor", "classzen_1_1gfx_1_1z_polygon.html#a23ad8a42c4b82114209ee864c5be873e", null ], [ "GetTriangulation", "classzen_1_1gfx_1_1z_polygon.html#aaed8a4e7e4232d9a2f64032676995778", null ], [ "GetPosition", "classzen_1_1gfx_1_1z_polygon.html#ade8d718f4392ea6f7d36563363d667db", null ], [ "GetBoundingBox", "classzen_1_1gfx_1_1z_polygon.html#aabb3fd590b40851176dcbc81edc10b47", null ], @@ -23,10 +24,12 @@ var classzen_1_1gfx_1_1z_polygon = [ "GetY", "classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe", null ], [ "GetH", "classzen_1_1gfx_1_1z_polygon.html#a8f19764a95eab8010a529652d484635d", null ], [ "GetW", "classzen_1_1gfx_1_1z_polygon.html#ad9810bdc85ac5ccb72b0e07880b075b7", null ], + [ "CalcX", "classzen_1_1gfx_1_1z_polygon.html#a44b2721ed65c2e2fb2b5391b4397ae9b", null ], + [ "CalcY", "classzen_1_1gfx_1_1z_polygon.html#adc5878f6c1cb869b6e5ed4ba8911bd62", null ], [ "CalcH", "classzen_1_1gfx_1_1z_polygon.html#a429c80360298608d83c56c74bae31e22", null ], [ "CalcW", "classzen_1_1gfx_1_1z_polygon.html#a55d204431680f82b0016e5b290c25ccf", null ], - [ "GetLowPoint", "classzen_1_1gfx_1_1z_polygon.html#a3fad6b6af1a44dac05b4cecb9bfdc31d", null ], - [ "GetLeftPoint", "classzen_1_1gfx_1_1z_polygon.html#a1952d1ddbb16cae0816d03a4c284f5d6", null ], + [ "GetLowPoint", "classzen_1_1gfx_1_1z_polygon.html#ae9034f5809ff965852ae22fa4d869b19", null ], + [ "GetLeftPoint", "classzen_1_1gfx_1_1z_polygon.html#a5d5880fa1e14f9b5622db4ef4322d1db", null ], [ "IsModifiable", "classzen_1_1gfx_1_1z_polygon.html#ad957c880eed742790fb244ddf42c54d6", null ], [ "GetMaterial", "classzen_1_1gfx_1_1z_polygon.html#a54a92a7768eafb28d57909f4313223bc", null ], [ "MapTexCoords", "classzen_1_1gfx_1_1z_polygon.html#aa2df331795d72f7554bba150831c332a", null ], diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.map index 24146998..888b4c89 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.map @@ -1,10 +1,13 @@ - - - - - - - - + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.png index 96449edc..377547fa 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_a07c24dbdd21b9c510b38256f67e42bc3_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a1952d1ddbb16cae0816d03a4c284f5d6_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a1952d1ddbb16cae0816d03a4c284f5d6_icgraph.map deleted file mode 100644 index a33ca72a..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_a1952d1ddbb16cae0816d03a4c284f5d6_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a1952d1ddbb16cae0816d03a4c284f5d6_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a1952d1ddbb16cae0816d03a4c284f5d6_icgraph.png deleted file mode 100644 index bb5aa8f8..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a1952d1ddbb16cae0816d03a4c284f5d6_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a1955ad2231b3b46bbf4f4e2408be3c62_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a1955ad2231b3b46bbf4f4e2408be3c62_icgraph.map new file mode 100644 index 00000000..083d1543 --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_polygon_a1955ad2231b3b46bbf4f4e2408be3c62_icgraph.map @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a1955ad2231b3b46bbf4f4e2408be3c62_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a1955ad2231b3b46bbf4f4e2408be3c62_icgraph.png new file mode 100644 index 00000000..5103c69b Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_polygon_a1955ad2231b3b46bbf4f4e2408be3c62_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a264d5c351bf4af5ee2e6d86a062e8291_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a264d5c351bf4af5ee2e6d86a062e8291_icgraph.map deleted file mode 100644 index 0eaebae3..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_a264d5c351bf4af5ee2e6d86a062e8291_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a264d5c351bf4af5ee2e6d86a062e8291_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a264d5c351bf4af5ee2e6d86a062e8291_icgraph.png deleted file mode 100644 index e25ea842..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a264d5c351bf4af5ee2e6d86a062e8291_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a3fad6b6af1a44dac05b4cecb9bfdc31d_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a3fad6b6af1a44dac05b4cecb9bfdc31d_icgraph.map deleted file mode 100644 index b47870bf..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_a3fad6b6af1a44dac05b4cecb9bfdc31d_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a3fad6b6af1a44dac05b4cecb9bfdc31d_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a3fad6b6af1a44dac05b4cecb9bfdc31d_icgraph.png deleted file mode 100644 index 177c93b6..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a3fad6b6af1a44dac05b4cecb9bfdc31d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.map index f0bfbd22..dc7fc99b 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.png index 4c3f4512..9aef5430 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_a40ae71e4df1b6fe15500d1367d749193_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a429c80360298608d83c56c74bae31e22_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a429c80360298608d83c56c74bae31e22_icgraph.map new file mode 100644 index 00000000..60f9933f --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_polygon_a429c80360298608d83c56c74bae31e22_icgraph.map @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a429c80360298608d83c56c74bae31e22_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a429c80360298608d83c56c74bae31e22_icgraph.png new file mode 100644 index 00000000..21270305 Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_polygon_a429c80360298608d83c56c74bae31e22_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a7cd1ed28b12be147b3567325035588ab_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a445f57a850cd65629ba96595172d2ef4_icgraph.map similarity index 71% rename from docs/classzen_1_1gfx_1_1z_polygon_a7cd1ed28b12be147b3567325035588ab_icgraph.map rename to docs/classzen_1_1gfx_1_1z_polygon_a445f57a850cd65629ba96595172d2ef4_icgraph.map index 67d494ab..89e7704e 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_a7cd1ed28b12be147b3567325035588ab_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_a445f57a850cd65629ba96595172d2ef4_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a445f57a850cd65629ba96595172d2ef4_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a445f57a850cd65629ba96595172d2ef4_icgraph.png new file mode 100644 index 00000000..120a0c96 Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_polygon_a445f57a850cd65629ba96595172d2ef4_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a44b2721ed65c2e2fb2b5391b4397ae9b_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a44b2721ed65c2e2fb2b5391b4397ae9b_icgraph.map new file mode 100644 index 00000000..31c90705 --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_polygon_a44b2721ed65c2e2fb2b5391b4397ae9b_icgraph.map @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a44b2721ed65c2e2fb2b5391b4397ae9b_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a44b2721ed65c2e2fb2b5391b4397ae9b_icgraph.png new file mode 100644 index 00000000..1c0ba741 Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_polygon_a44b2721ed65c2e2fb2b5391b4397ae9b_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.map index 3a7132ea..2cd0251c 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.map @@ -1,9 +1,11 @@ - - - - - - - + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.png index 9fb4bd41..bf0f54f4 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_a54a92a7768eafb28d57909f4313223bc_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a55d204431680f82b0016e5b290c25ccf_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a55d204431680f82b0016e5b290c25ccf_icgraph.map new file mode 100644 index 00000000..5d0fcf1c --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_polygon_a55d204431680f82b0016e5b290c25ccf_icgraph.map @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a55d204431680f82b0016e5b290c25ccf_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a55d204431680f82b0016e5b290c25ccf_icgraph.png new file mode 100644 index 00000000..8ab02a99 Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_polygon_a55d204431680f82b0016e5b290c25ccf_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.map index 7194c35a..4e72a940 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.map @@ -1,12 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.png index 1a1d5da6..0aa807c8 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_a679c54a2052d619caea511cdc1ce4e80_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a6f684f3158b5ab347dbc28db162e9f83_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a6f684f3158b5ab347dbc28db162e9f83_icgraph.map deleted file mode 100644 index 26f62af4..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_a6f684f3158b5ab347dbc28db162e9f83_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a6f684f3158b5ab347dbc28db162e9f83_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a6f684f3158b5ab347dbc28db162e9f83_icgraph.png deleted file mode 100644 index 10502e88..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a6f684f3158b5ab347dbc28db162e9f83_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a7cd1ed28b12be147b3567325035588ab_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a7cd1ed28b12be147b3567325035588ab_icgraph.png deleted file mode 100644 index 8317bf20..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a7cd1ed28b12be147b3567325035588ab_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a8812b5007d3eedf5f6c8f97ef22e68c0_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a8812b5007d3eedf5f6c8f97ef22e68c0_icgraph.map deleted file mode 100644 index 28e249f5..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_a8812b5007d3eedf5f6c8f97ef22e68c0_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a8812b5007d3eedf5f6c8f97ef22e68c0_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a8812b5007d3eedf5f6c8f97ef22e68c0_icgraph.png deleted file mode 100644 index 87ec0962..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a8812b5007d3eedf5f6c8f97ef22e68c0_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.map index 47793606..130ce914 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.map @@ -1,9 +1,11 @@ - - - - - - - + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.png index f0c8abf2..a225b081 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_a8f19764a95eab8010a529652d484635d_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_aaed8a4e7e4232d9a2f64032676995778_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_aaed8a4e7e4232d9a2f64032676995778_icgraph.map index 701a6137..8ce004f3 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_aaed8a4e7e4232d9a2f64032676995778_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_aaed8a4e7e4232d9a2f64032676995778_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.map index 7c889faa..2ee7696f 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.map @@ -1,4 +1,3 @@ - - + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.png index 070dd8d0..202268d0 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_ab7fb29249ab405cc610bb5e451397fea_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_abfd864260599d3a8486d56ca7923b98d_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_abfd864260599d3a8486d56ca7923b98d_icgraph.map deleted file mode 100644 index b07a8f20..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_abfd864260599d3a8486d56ca7923b98d_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_abfd864260599d3a8486d56ca7923b98d_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_abfd864260599d3a8486d56ca7923b98d_icgraph.png deleted file mode 100644 index a8e750d8..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_abfd864260599d3a8486d56ca7923b98d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ac9df030c2f41e4454a7b6d260e0fd21a_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_ac9df030c2f41e4454a7b6d260e0fd21a_icgraph.map deleted file mode 100644 index faccaaae..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_ac9df030c2f41e4454a7b6d260e0fd21a_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ac9df030c2f41e4454a7b6d260e0fd21a_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_ac9df030c2f41e4454a7b6d260e0fd21a_icgraph.png deleted file mode 100644 index c993c176..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_ac9df030c2f41e4454a7b6d260e0fd21a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.map index 0060e042..cdb1b2ec 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.map @@ -1,5 +1,5 @@ - - + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.png index f8f2236a..469774c4 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_ad40c6155bf17ce17ebb5f3e95266820e_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.map index 3416f5f2..cc6cb62a 100644 --- a/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.map @@ -1,9 +1,11 @@ - - - - - - - + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.png index 252dd14e..181151e0 100644 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.png and b/docs/classzen_1_1gfx_1_1z_polygon_ad9810bdc85ac5ccb72b0e07880b075b7_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_adc5878f6c1cb869b6e5ed4ba8911bd62_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_adc5878f6c1cb869b6e5ed4ba8911bd62_icgraph.map new file mode 100644 index 00000000..36d1b9da --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_polygon_adc5878f6c1cb869b6e5ed4ba8911bd62_icgraph.map @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_polygon_adc5878f6c1cb869b6e5ed4ba8911bd62_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_adc5878f6c1cb869b6e5ed4ba8911bd62_icgraph.png new file mode 100644 index 00000000..30a4543c Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_polygon_adc5878f6c1cb869b6e5ed4ba8911bd62_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ae812840875c700f99062aa1c34fe9a4f_icgraph.map b/docs/classzen_1_1gfx_1_1z_polygon_ae812840875c700f99062aa1c34fe9a4f_icgraph.map deleted file mode 100644 index ade27790..00000000 --- a/docs/classzen_1_1gfx_1_1z_polygon_ae812840875c700f99062aa1c34fe9a4f_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1z_polygon_ae812840875c700f99062aa1c34fe9a4f_icgraph.png b/docs/classzen_1_1gfx_1_1z_polygon_ae812840875c700f99062aa1c34fe9a4f_icgraph.png deleted file mode 100644 index 8f080e60..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_polygon_ae812840875c700f99062aa1c34fe9a4f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad.html b/docs/classzen_1_1gfx_1_1z_quad.html index eac8a347..a25f350e 100644 --- a/docs/classzen_1_1gfx_1_1z_quad.html +++ b/docs/classzen_1_1gfx_1_1z_quad.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,19 +129,19 @@    ~zQuad ()   -virtual gfx::zPolygon & Create () - Creates the polygon from the internally stored vertices. More...
-  +gfx::zPolygon & Create (const bool triangluate=true) + Creates the polygon from the internally stored vertices. More...
+  void Resize (const math::vectoru16_t &Size)  Resizes the quad to a new dimension. More...
  void Resize (const uint16_t w, const uint16_t h)   -virtual bool Collides (const zPolygon &Other, math::vector_t *poi=nullptr) - Attempts collision detection with another polygon. More...
-  -bool Collides (const zQuad &Other, math::vector_t *poi=nullptr) -  +virtual bool Collides (const zPolygon &Other, math::cquery_t *q) const + Attempts collision detection with another polygon. More...
+  +bool Collides (const zQuad &Other, math::cquery_t *q) const +  bool Collides (const math::aabb_t &other)   void SetInverted (const bool flag) @@ -153,7 +153,7 @@ - Public Member Functions inherited from zen::gfx::zPolygon  zPolygon (asset::zAssetManager &Assets, const size_t preload=0)   - ~zPolygon () +virtual ~zPolygon ()    zPolygon (const zPolygon &Copy)   @@ -179,12 +179,16 @@ void LoadIntoVAO (gfxcore::zVertexArray &VAO, const bool preserve=true)  Shortcut to prevent loading simple objects manually. More...
  +virtual bool Collides (const math::aabb_t &other) const +  void SetIndices (const std::vector< gfxcore::index_t > &Indices)  Overrides default index creation for the added vertices. More...
  void SetColor (const color4f_t &Color)  Sets the vertex color of the created vertices. More...
  +void SetColor (const real_t r, const real_t g, const real_t b, const real_t a=1.0) +  const std::vector
< math::vector_t > & GetTriangulation () const   @@ -202,16 +206,22 @@ uint16_t GetW () const  Gets preset width for the current vertices. More...
  +int16_t CalcX () const + Calculates the lowest X value for the polygon. More...
+  +int16_t CalcY () const + Calculates the lowest Y value for the polygon. More...
+  uint16_t CalcH ()  Calculates maximum height for the current vertices. More...
  uint16_t CalcW ()  Calculates width for the current vertices. More...
  -int GetLowPoint () const -  -int GetLeftPoint () const -  +int GetLowPoint () const +  +int GetLeftPoint () const +  bool IsModifiable () const  Request to see if we can change the internal vertices or not. More...
  @@ -338,7 +348,7 @@

Member Function Documentation

- +
@@ -348,7 +358,8 @@

Member Function Documentation

- + +
gfx::zPolygon & zQuad::Create ()const bool triangluate = true)
@@ -358,19 +369,27 @@

Member Function Documentation

+

If do_triangulation is set to false, the internal triangulation storage will simply default to the contents of the current temporary vertices. This comes in handy if, for example, you wish to directly implement a concave polygon (without using zConcavePolygon). In this case, you would set custom indices, then Create() the polygon without triangulation, since the vertices you've given would already form triangles. This type of processing is used by zen::lvl::zLevelLoader.

+
Parameters
+ + +
do_triangulationShould we triangulate?
+
+
Precondition
>= 3 vertices have been added to the polygon.
Postcondition
No temporary vertices are stored until AddVertex() is called again.
+
Warning
This method ignores the triangulate parameter.
-

Reimplemented from zen::gfx::zPolygon.

+

Reimplemented from zen::gfx::zPolygon.

Definition at line 28 of file Quad.cpp.

Here is the caller graph for this function:
-
- - +
+ +

@@ -431,7 +450,7 @@

Member Function Documentation

- +
@@ -447,13 +466,13 @@

Member Function Documentation

- - + + - +
math::vector_t * poi = nullptr math::cquery_t * q 
) const
@@ -466,19 +485,19 @@

Member Function Documentation

Parameters
- +
OtherPolygon to check collision with
poiOptional point of impact specifier.
qOptional collision info specifier.
Returns
true if this polygon collides with the given parameter, false otherwise.
-

Reimplemented from zen::gfx::zPolygon.

+

Reimplemented from zen::gfx::zPolygon.

-

Definition at line 58 of file Quad.hpp.

+

Definition at line 60 of file Quad.hpp.

- +
@@ -494,13 +513,13 @@

Member Function Documentation

- - + + - +
math::vector_t * poi = nullptr math::cquery_t * q 
) const
@@ -510,7 +529,7 @@

Member Function Documentation

-

Definition at line 76 of file Quad.hpp.

+

Definition at line 88 of file Quad.hpp.

@@ -531,15 +550,12 @@

Member Function Documentation

-inlinevirtual +inline
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Reimplemented from zen::gfx::zPolygon.

-

Definition at line 81 of file Quad.hpp.

+

Definition at line 106 of file Quad.hpp.

@@ -577,7 +593,7 @@

Member Function Documentation

-
Precondition
Neither Draw() nor Create() have been called yet.
+
Precondition
Neither Draw() nor Create() have been called yet.

Definition at line 84 of file Quad.cpp.

@@ -586,7 +602,7 @@

Member Function Documentation

- +

@@ -612,7 +628,7 @@

Member Function Documentation

-
Precondition
Neither Draw() nor Create() have been called yet.
+
Precondition
Neither Draw() nor Create() have been called yet.

Definition at line 89 of file Quad.cpp.

diff --git a/docs/classzen_1_1gfx_1_1z_quad.js b/docs/classzen_1_1gfx_1_1z_quad.js index 465f02bd..5d1e0418 100644 --- a/docs/classzen_1_1gfx_1_1z_quad.js +++ b/docs/classzen_1_1gfx_1_1z_quad.js @@ -4,11 +4,11 @@ var classzen_1_1gfx_1_1z_quad = [ "zQuad", "classzen_1_1gfx_1_1z_quad.html#a683d7e953f5018c035009a09bdbac4a7", null ], [ "zQuad", "classzen_1_1gfx_1_1z_quad.html#a6d50f5678187a56ba068cb04d96a5321", null ], [ "~zQuad", "classzen_1_1gfx_1_1z_quad.html#a5867cc5adb72ebb4b58718141db0f3bf", null ], - [ "Create", "classzen_1_1gfx_1_1z_quad.html#a8eaf715d98a3a11a202ad73f0f7e356d", null ], + [ "Create", "classzen_1_1gfx_1_1z_quad.html#a6ba50baedb76b9e4b966b9a3fa0333f4", null ], [ "Resize", "classzen_1_1gfx_1_1z_quad.html#aa18ef578cfc4552effe995fa42e7ce59", null ], [ "Resize", "classzen_1_1gfx_1_1z_quad.html#aecfed1edd9f86fdd22522ac869cae5a2", null ], - [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a5eb84d8851c72de252ee06a302d45e07", null ], - [ "Collides", "classzen_1_1gfx_1_1z_quad.html#ab47b202f4549acb2c691fad8199d45e7", null ], + [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a5f5ed27f47eb430f1bc36eb6b046b04a", null ], + [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a67eeed3aa34f859af6f017bd081c4f4d", null ], [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04", null ], [ "SetInverted", "classzen_1_1gfx_1_1z_quad.html#a432e755f175068c7e354053a37ac2365", null ], [ "SetRepeating", "classzen_1_1gfx_1_1z_quad.html#a2461053b411db584b9c3dd40364cdff2", null ] diff --git a/docs/classzen_1_1gfx_1_1z_quad_a2461053b411db584b9c3dd40364cdff2_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_a2461053b411db584b9c3dd40364cdff2_icgraph.map deleted file mode 100644 index b0da8ae7..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_a2461053b411db584b9c3dd40364cdff2_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_a2461053b411db584b9c3dd40364cdff2_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_a2461053b411db584b9c3dd40364cdff2_icgraph.png deleted file mode 100644 index 7e4c6abe..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_a2461053b411db584b9c3dd40364cdff2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.map index 87c5f13f..eabcb4bc 100644 --- a/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.map @@ -1,6 +1,8 @@ - - - - + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.png index a6eb59c9..95380f38 100644 Binary files a/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.png and b/docs/classzen_1_1gfx_1_1z_quad_a432e755f175068c7e354053a37ac2365_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_a570d736f6b0d5035dc05180fbcf6d90f_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_a570d736f6b0d5035dc05180fbcf6d90f_icgraph.map deleted file mode 100644 index 13b7c70b..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_a570d736f6b0d5035dc05180fbcf6d90f_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_a570d736f6b0d5035dc05180fbcf6d90f_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_a570d736f6b0d5035dc05180fbcf6d90f_icgraph.png deleted file mode 100644 index 78ee81be..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_a570d736f6b0d5035dc05180fbcf6d90f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_a5970d083f4026dc6ac70bb2220cd9486_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_a5970d083f4026dc6ac70bb2220cd9486_icgraph.map deleted file mode 100644 index 923b82ed..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_a5970d083f4026dc6ac70bb2220cd9486_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_a5970d083f4026dc6ac70bb2220cd9486_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_a5970d083f4026dc6ac70bb2220cd9486_icgraph.png deleted file mode 100644 index b3aa574b..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_a5970d083f4026dc6ac70bb2220cd9486_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_a6ba50baedb76b9e4b966b9a3fa0333f4_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_a6ba50baedb76b9e4b966b9a3fa0333f4_icgraph.map new file mode 100644 index 00000000..aae67e7b --- /dev/null +++ b/docs/classzen_1_1gfx_1_1z_quad_a6ba50baedb76b9e4b966b9a3fa0333f4_icgraph.map @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/docs/classzen_1_1gfx_1_1z_quad_a6ba50baedb76b9e4b966b9a3fa0333f4_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_a6ba50baedb76b9e4b966b9a3fa0333f4_icgraph.png new file mode 100644 index 00000000..5eac847f Binary files /dev/null and b/docs/classzen_1_1gfx_1_1z_quad_a6ba50baedb76b9e4b966b9a3fa0333f4_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_a8eaf715d98a3a11a202ad73f0f7e356d_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_a8eaf715d98a3a11a202ad73f0f7e356d_icgraph.map deleted file mode 100644 index ee3af6e6..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_a8eaf715d98a3a11a202ad73f0f7e356d_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_a8eaf715d98a3a11a202ad73f0f7e356d_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_a8eaf715d98a3a11a202ad73f0f7e356d_icgraph.png deleted file mode 100644 index 0e9b7aba..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_a8eaf715d98a3a11a202ad73f0f7e356d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_aa18ef578cfc4552effe995fa42e7ce59_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_aa18ef578cfc4552effe995fa42e7ce59_icgraph.map deleted file mode 100644 index c54d8cd2..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_aa18ef578cfc4552effe995fa42e7ce59_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_aa18ef578cfc4552effe995fa42e7ce59_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_aa18ef578cfc4552effe995fa42e7ce59_icgraph.png deleted file mode 100644 index d2852726..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_aa18ef578cfc4552effe995fa42e7ce59_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_acc347e557995ba6daf0f6d74b6fdb74d_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_acc347e557995ba6daf0f6d74b6fdb74d_icgraph.map deleted file mode 100644 index e7963665..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_acc347e557995ba6daf0f6d74b6fdb74d_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_acc347e557995ba6daf0f6d74b6fdb74d_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_acc347e557995ba6daf0f6d74b6fdb74d_icgraph.png deleted file mode 100644 index 74e5c503..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_acc347e557995ba6daf0f6d74b6fdb74d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_ad7257c792183c8a0a4ddac97ff4d74ad_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_ad7257c792183c8a0a4ddac97ff4d74ad_icgraph.map deleted file mode 100644 index b1a9234a..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_ad7257c792183c8a0a4ddac97ff4d74ad_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_ad7257c792183c8a0a4ddac97ff4d74ad_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_ad7257c792183c8a0a4ddac97ff4d74ad_icgraph.png deleted file mode 100644 index afae8a26..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_ad7257c792183c8a0a4ddac97ff4d74ad_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_quad_aee862c801b1d9d88f26c95508574a024_icgraph.map b/docs/classzen_1_1gfx_1_1z_quad_aee862c801b1d9d88f26c95508574a024_icgraph.map deleted file mode 100644 index 493bdec5..00000000 --- a/docs/classzen_1_1gfx_1_1z_quad_aee862c801b1d9d88f26c95508574a024_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfx_1_1z_quad_aee862c801b1d9d88f26c95508574a024_icgraph.png b/docs/classzen_1_1gfx_1_1z_quad_aee862c801b1d9d88f26c95508574a024_icgraph.png deleted file mode 100644 index a1005926..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_quad_aee862c801b1d9d88f26c95508574a024_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_render_target.html b/docs/classzen_1_1gfx_1_1z_render_target.html index 9ee8b8e6..55897aeb 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target.html +++ b/docs/classzen_1_1gfx_1_1z_render_target.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -176,7 +176,7 @@  

Detailed Description

-

Render targets are useful for rendering things off-screen, multi-pass rendering, and other useful routines for rendering things to a texture, and then using that texture for later operations. It's used extensively in the gfx::zScene API in order to provide post-processing effects and additive lighting effects.

+

Render targets are useful for rendering things off-screen, multi-pass rendering, and other useful routines for rendering things to a texture, and then using that texture for later operations. It's used extensively in the gfx::zScene API in order to provide post-processing effects and additive lighting effects.

Definition at line 36 of file RenderTarget.hpp.

Constructor & Destructor Documentation

@@ -283,7 +283,7 @@

Member Function Documentation

- +

@@ -319,7 +319,7 @@

Member Function Documentation

- +

@@ -355,7 +355,7 @@

Member Function Documentation

- +

@@ -391,7 +391,7 @@

Member Function Documentation

- +

@@ -444,7 +444,7 @@

Member Function Documentation

- +

@@ -529,7 +529,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.map b/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.map index c69c2a13..b77637ba 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.png b/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.png index 208473ab..235b1893 100644 Binary files a/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.png and b/docs/classzen_1_1gfx_1_1z_render_target_a21b4c56fcbd1993da78c5f47088e003c_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.map b/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.map index 36c68215..81c8a8eb 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.map @@ -5,7 +5,7 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.png b/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.png index 6b4f5c70..427e7126 100644 Binary files a/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.png and b/docs/classzen_1_1gfx_1_1z_render_target_a2d97510a4c3e5da0db6d8c6aa3e73d37_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.map b/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.map index 44c62ac2..fa6927a9 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.png b/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.png index 42327c49..bfc528ac 100644 Binary files a/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.png and b/docs/classzen_1_1gfx_1_1z_render_target_a5a3c2ed88bffcb4a815f2ffb9c102b77_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.map b/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.map index 99d61deb..9cff7392 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.map @@ -3,5 +3,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.png b/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.png index 816c50f1..22265424 100644 Binary files a/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.png and b/docs/classzen_1_1gfx_1_1z_render_target_a70237e852d42f0015741d6dc7acf10fd_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.map b/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.map index a9584927..2d90b959 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.png b/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.png index f9b08a95..9b88d350 100644 Binary files a/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.png and b/docs/classzen_1_1gfx_1_1z_render_target_ac33b26455487a4c2806149c992dd794b_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.map b/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.map index a842cf04..c6a884a3 100644 --- a/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.map @@ -8,7 +8,7 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.png b/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.png index 9561cdb5..898ce4a8 100644 Binary files a/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.png and b/docs/classzen_1_1gfx_1_1z_render_target_ae0cda2660f0cefefd78df4b7ed8da01a_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_scene.html b/docs/classzen_1_1gfx_1_1z_scene.html index 775e63fc..6b005969 100644 --- a/docs/classzen_1_1gfx_1_1z_scene.html +++ b/docs/classzen_1_1gfx_1_1z_scene.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -114,6 +114,9 @@
+

A high-level rendering wrapper allowing for special effects and lighting. + More...

+

#include "Scene.hpp"

+ + + + + + @@ -227,7 +236,7 @@

All components of the scene are managed by the scene, and the user is guaranteed to be interacting with valid references, unless they explicitly delete them from the scene via one of the Delete*() calls.

Todo:
Test post-processing.
-

Definition at line 43 of file Scene.hpp.

+

Definition at line 44 of file Scene.hpp.

Constructor & Destructor Documentation

@@ -276,7 +285,7 @@

@@ -152,6 +155,12 @@

 
bool RemoveEntity (const uint32_t index)
 
bool RemoveLight (const gfx::zLight &Light)
 Removes a light instance from the scene, if it exists. More...
 
bool ShiftEntity (obj::zEntity &Obj, const uint32_t index)
 Puts an entity in a different drawing order position. More...
 
bool Clear ()
 Deletes all scene data (lights, objects, effects, etc). More...
 
-

Definition at line 18 of file Scene.cpp.

+

Definition at line 19 of file Scene.cpp.

@@ -304,14 +313,14 @@

Member Function Documentation

Implements zen::zSubsystem.

-

Definition at line 23 of file Scene.cpp.

+

Definition at line 24 of file Scene.cpp.

Here is the caller graph for this function:
- +

@@ -341,7 +350,7 @@

Member Function Documentation

Implements zen::zSubsystem.

-

Definition at line 29 of file Scene.cpp.

+

Definition at line 30 of file Scene.cpp.

Here is the caller graph for this function:
@@ -369,14 +378,14 @@

Member Function Documentation

If the entity is simply left as-returned, nothing will be drawn on-screen. This method is merely here to abstract away memory cleanup operations from the user and give them a valid reference to work with at all times.

Returns
An unloaded entity instance.
-

Definition at line 35 of file Scene.cpp.

+

Definition at line 36 of file Scene.cpp.

Here is the caller graph for this function:
- +

@@ -403,7 +412,7 @@

Member Function Documentation

-

Definition at line 65 of file Scene.hpp.

+

Definition at line 66 of file Scene.hpp.

Here is the caller graph for this function:
@@ -461,7 +470,7 @@

Member Function Documentation

Returns
A created light instance.
Todo:
Fix window size
-

Definition at line 42 of file Scene.cpp.

+

Definition at line 43 of file Scene.cpp.

Here is the caller graph for this function:
@@ -499,7 +508,7 @@

Member Function Documentation

Returns
The effect instance
See Also
gfx::zEffect::GetError()
-

Definition at line 50 of file Scene.cpp.

+

Definition at line 51 of file Scene.cpp.

@@ -529,7 +538,7 @@

Member Function Documentation

IsValidEntityIndex()
-

Definition at line 65 of file Scene.cpp.

+

Definition at line 66 of file Scene.cpp.

@@ -554,7 +563,7 @@

Member Function Documentation

Returns
true if the entity was removed from the internal manager, false if it wasn't found or the index is out of range (for the indexed overload, of course).
-

Definition at line 77 of file Scene.cpp.

+

Definition at line 78 of file Scene.cpp.

Here is the caller graph for this function:
@@ -582,7 +591,71 @@

Member Function Documentation

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 95 of file Scene.cpp.

+

Definition at line 96 of file Scene.cpp.

+ +
+ + +
+
+ + + + + + + + +
bool zScene::RemoveLight (const gfx::zLight & Light)
+
+

This method behaves in an identical matter to RemoveEntity().

+

Removes an entity instance from the scene, if it exists.

+
Parameters
+ + +
EntThe entity to remove from the manager
+
+
+
Returns
true if the entity was removed from the internal manager, false if it wasn't found or the index is out of range (for the indexed overload, of course).
+ +

Definition at line 109 of file Scene.cpp.

+ +
+
+ +
+
+ + + + + + + + + + + + + + + + + + +
bool zScene::ShiftEntity (obj::zEntity & Obj,
const uint32_t index 
)
+
+

If the index is out of range of the scene entity list, the entity is inserted at the end.

+
Parameters
+ + + +
EntEntity to move
indexNew entity position
+
+
+
Returns
true if the entity was moved to a valid index, false if the entity doesn't exist in the scene.
+ +

Definition at line 127 of file Scene.cpp.

@@ -599,14 +672,14 @@

Member Function Documentation

-

Definition at line 108 of file Scene.cpp.

+

Definition at line 150 of file Scene.cpp.

Here is the caller graph for this function:
- +

@@ -626,14 +699,14 @@

Member Function Documentation

Todo:
Clipping.
-

Definition at line 121 of file Scene.cpp.

+

Definition at line 163 of file Scene.cpp.

Here is the caller graph for this function:
- +

@@ -653,14 +726,14 @@

Member Function Documentation

-

Definition at line 273 of file Scene.cpp.

+

Definition at line 314 of file Scene.cpp.

Here is the caller graph for this function:
- +

@@ -680,7 +753,7 @@

Member Function Documentation

-

Definition at line 261 of file Scene.cpp.

+

Definition at line 302 of file Scene.cpp.

@@ -705,7 +778,7 @@

Member Function Documentation

-

Definition at line 171 of file Scene.hpp.

+

Definition at line 193 of file Scene.hpp.

@@ -730,7 +803,7 @@

Member Function Documentation

-

Definition at line 174 of file Scene.hpp.

+

Definition at line 196 of file Scene.hpp.

@@ -755,7 +828,7 @@

Member Function Documentation

-

Definition at line 177 of file Scene.hpp.

+

Definition at line 199 of file Scene.hpp.

@@ -780,7 +853,7 @@

Member Function Documentation

-

Definition at line 178 of file Scene.hpp.

+

Definition at line 200 of file Scene.hpp.

Here is the caller graph for this function:
@@ -814,7 +887,7 @@

Member Function Documentation

-

Definition at line 179 of file Scene.hpp.

+

Definition at line 201 of file Scene.hpp.

Here is the caller graph for this function:
@@ -848,7 +921,7 @@

Member Function Documentation

-

Definition at line 182 of file Scene.hpp.

+

Definition at line 204 of file Scene.hpp.

Here is the caller graph for this function:
@@ -882,7 +955,7 @@

Member Function Documentation

-

Definition at line 183 of file Scene.hpp.

+

Definition at line 205 of file Scene.hpp.

Here is the caller graph for this function:
@@ -916,7 +989,7 @@

Member Function Documentation

-

Definition at line 184 of file Scene.hpp.

+

Definition at line 206 of file Scene.hpp.

@@ -951,7 +1024,7 @@

Member Function Documentation

Warning
This does not work well when combined with lighting.
See Also
EnableLighting()
-

Definition at line 199 of file Scene.hpp.

+

Definition at line 221 of file Scene.hpp.

Here is the caller graph for this function:
diff --git a/docs/classzen_1_1gfx_1_1z_scene.js b/docs/classzen_1_1gfx_1_1z_scene.js index ceb7cee3..3f25d55a 100644 --- a/docs/classzen_1_1gfx_1_1z_scene.js +++ b/docs/classzen_1_1gfx_1_1z_scene.js @@ -12,6 +12,8 @@ var classzen_1_1gfx_1_1z_scene = [ "InsertEntity", "classzen_1_1gfx_1_1z_scene.html#a1da8d9bef43e37b34a302faa35a986ba", null ], [ "RemoveEntity", "classzen_1_1gfx_1_1z_scene.html#a20048957053138cc366344e16c614561", null ], [ "RemoveEntity", "classzen_1_1gfx_1_1z_scene.html#ad3636d08d2f1492469b8af350d0b6062", null ], + [ "RemoveLight", "classzen_1_1gfx_1_1z_scene.html#ace7ecda0222bcc628b4d1e548fbafb7f", null ], + [ "ShiftEntity", "classzen_1_1gfx_1_1z_scene.html#a3d15fe6db75f5b1e8190f28b0fda1d5f", null ], [ "Clear", "classzen_1_1gfx_1_1z_scene.html#af6b595895bdc0cfcd832435f714ec3b6", null ], [ "Render", "classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1", null ], [ "IsValidEntityIndex", "classzen_1_1gfx_1_1z_scene.html#ad38c58aba5fc0fd4c5d6db43a6befa6b", null ], diff --git a/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.map b/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.map index 75052bba..e885efaf 100644 --- a/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.png b/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.png index a656cb5f..5efe84ce 100644 Binary files a/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.png and b/docs/classzen_1_1gfx_1_1z_scene_a1bbf433276d81e44483178df55a48843_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.map b/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.map index e4a28e55..0f99fdf8 100644 --- a/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.png b/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.png index bcff4f96..c4c845ef 100644 Binary files a/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.png and b/docs/classzen_1_1gfx_1_1z_scene_a7786082bd291405b9db93956a5aa849e_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.map b/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.map index 3c5cc72c..71d1ab51 100644 --- a/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.png b/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.png index 474638b0..de1ace51 100644 Binary files a/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.png and b/docs/classzen_1_1gfx_1_1z_scene_ab58eed1825bbe82791af92ccf45e72a1_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.map b/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.map index d37c2ef1..a09937b8 100644 --- a/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.map @@ -1,3 +1,4 @@ - + + diff --git a/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.png b/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.png index fccd100b..39b6eac0 100644 Binary files a/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.png and b/docs/classzen_1_1gfx_1_1z_scene_ad38c58aba5fc0fd4c5d6db43a6befa6b_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.map b/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.map index 29d98183..52d22fa4 100644 --- a/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.map @@ -5,5 +5,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.png b/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.png index 074148f1..8284e04d 100644 Binary files a/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.png and b/docs/classzen_1_1gfx_1_1z_scene_af6b595895bdc0cfcd832435f714ec3b6_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_scene_afe9179ffd2a0e19b01e8d7a83b56f5fb_icgraph.map b/docs/classzen_1_1gfx_1_1z_scene_afe9179ffd2a0e19b01e8d7a83b56f5fb_icgraph.map deleted file mode 100644 index 5dfb78df..00000000 --- a/docs/classzen_1_1gfx_1_1z_scene_afe9179ffd2a0e19b01e8d7a83b56f5fb_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfx_1_1z_scene_afe9179ffd2a0e19b01e8d7a83b56f5fb_icgraph.png b/docs/classzen_1_1gfx_1_1z_scene_afe9179ffd2a0e19b01e8d7a83b56f5fb_icgraph.png deleted file mode 100644 index 73237f44..00000000 Binary files a/docs/classzen_1_1gfx_1_1z_scene_afe9179ffd2a0e19b01e8d7a83b56f5fb_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfx_1_1z_window.html b/docs/classzen_1_1gfx_1_1z_window.html index 28bd4df5..465a33ff 100644 --- a/docs/classzen_1_1gfx_1_1z_window.html +++ b/docs/classzen_1_1gfx_1_1z_window.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -327,7 +327,7 @@

Member Function Documentation

- +

@@ -384,7 +384,7 @@

Member Function Documentation

- +

@@ -428,7 +428,7 @@

Member Function Documentation

- +

@@ -517,7 +517,7 @@

Member Function Documentation

- +

@@ -560,7 +560,7 @@

Member Function Documentation

- +

@@ -643,7 +643,7 @@

Member Function Documentation

- +

@@ -677,7 +677,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.map index 9fd59114..4b8d22d0 100644 --- a/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.map @@ -1,5 +1,4 @@ - - - + + diff --git a/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.png index efcd420c..a636f171 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_a038cb46b55e0dc76a7fd7c374dc0bf45_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.map index f407c096..98bf0883 100644 --- a/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.png index 8937e17f..78aa270a 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_a3d18497cbf3fc8f8a0231761fbf3bf9e_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.map index 3da2d7eb..bc7ec1cb 100644 --- a/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.map @@ -1,5 +1,4 @@ - - - + + diff --git a/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.png index c0fd54e5..d9ed653d 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_a5f087fafc6f8367d16913cfe06b83199_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.map index 71c168bf..f175c154 100644 --- a/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.png index 5eb6316a..3d44de02 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_a9716300787873b7ff91f3db7af20321f_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.map index d0151070..b5614318 100644 --- a/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.map @@ -1,5 +1,4 @@ - - - + + diff --git a/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.png index 78bc43b9..4768c394 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_ab43e8c6d204819da11380772da928561_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.map index 49bb5eb2..ba228210 100644 --- a/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.map @@ -1,5 +1,4 @@ - - - + + diff --git a/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.png index 59130139..594b9443 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_abcb441d17f9b7bd2f3d1ce72c6e8d356_icgraph.png differ diff --git a/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.map b/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.map index 1da28af2..f556c002 100644 --- a/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.map +++ b/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.png b/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.png index 8d6807b1..26b1a74e 100644 Binary files a/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.png and b/docs/classzen_1_1gfx_1_1z_window_ad90088168177bb1e68dd531405b76a2a_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable.html b/docs/classzen_1_1gfxcore_1_1_c_drawable.html deleted file mode 100644 index c38d5955..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_drawable.html +++ /dev/null @@ -1,726 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CDrawable Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Protected Attributes
-
-
zen::gfxcore::CDrawable Class Referenceabstract
CoreGraphics
-
-
- -

An abstract base class for all drawable primitives. - More...

- -

#include "Drawable.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CDrawable (asset::CAssetManager &)
 
 CDrawable (const CDrawable &Copy)
 Creates an instance from another instance. More...
 
 CDrawable (CDrawable &&Copy)
 
virtual ~CDrawable ()
 
virtual CDrawable & Create ()=0
 Creates initial vertex structure. More...
 
void Move (const math::vector_t &Position)
 Moves the drawable to a certain location. More...
 
void Move (const real_t x, const real_t y, const real_t z=1.0)
 This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
 
void AttachMaterial (gfx::CMaterial &Material)
 Attaches a material to render on top of the primitive. More...
 
void RemoveMaterial ()
 Reverts to using the default material. More...
 
virtual void SetColor (const color4f_t &Color)
 Sets all vertices to have a given color value. More...
 
bool Draw (const bool is_bound=false)
 Draws the primitive on-screen. More...
 
bool IsModifiable () const
 Request to see if we can change the internal vertices or not. More...
 
const math::vector_t & GetPosition () const
 
real_t GetX () const
 
real_t GetY () const
 
void LoadIntoVAO (gfxcore::CVertexArray &VAO, const bool preserve=true)
 Shortcut to prevent loading simple objects manually. More...
 
- - - - - - - - - -

-Protected Attributes

gfx::CMaterial m_Material
 
math::vector_t m_Position
 
DrawBatch m_DrawData
 
bool m_internal
 
-

Detailed Description

-

There are two ways to create renderable objects in Zenderer.

-

Firstly is through the zen::gfx::CScene class and its respective AddPrimitive() or AddEntity() methods. This will attach an internal zen::gfxcore::CVertexArray object that stores scene geometry. The scene itself takes care of the actual drawing, but the user can still call the Drawable::Draw() method if they want to do it again, post-render.

-

The other way is to simply create a drawable object instance and call Draw() on it. This will implicitly create a vertex array object internally the first time, and will just use it every subsequent call. Keep in mind that this object now can NOT be added to a scene. This functionality may be supported in future revisions.

- -

Definition at line 40 of file Drawable.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
zen::gfxcore::CDrawable::CDrawable (asset::CAssetManager & )
-
- -
-
- -
-
- - - - - - - - -
CDrawable::CDrawable (const CDrawable & Copy)
-
-

This only copies internal vertex/index data, as well as model-view matrix data (thus position). Material and internal GPU buffer references are NOT copied. These must be explicitly set later, be it with Draw() or through a friend class or through AttachMaterial.

-
Parameters
- - -
CopyPrimitive to copy draw data from
-
-
-
Warning
There can be no assignment of one primitive to another.
-
-Material info is not transferred.
-
See Also
gfxcore::DrawBatch
- -

Definition at line 19 of file Drawable.cpp.

- -
-
- -
-
- - - - - - - - -
CDrawable::CDrawable (CDrawable && Copy)
-
- -

Definition at line 45 of file Drawable.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CDrawable::~CDrawable ()
- 		-virtual
-
- -

Definition at line 65 of file Drawable.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
virtual CDrawable& zen::gfxcore::CDrawable::Create ()
- 		-pure virtual
-
-
Returns
Reference to itself for easy chaining.
- -

Implemented in zen::gfx::CPolygon, and zen::gfx::CQuad.

- -
-
- -
-
- - - - - - - - -
void CDrawable::Move (const math::vector_t & Position)
-
-

This doesn't rely on any vertex data, but rather uses the model-view matrix to translate the object, thus there is a default implementation.

-
Parameters
- - -
Position(x, y, z) coordinates where you want the object
-
-
- -

Definition at line 70 of file Drawable.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
void zen::gfxcore::CDrawable::Move (const real_t x,
const real_t y,
const real_t z = 1.0 
)
-
-
Todo:
Make it work properly when CQuad is inverted.
- -
-
- -
-
- - - - - - - - -
void CDrawable::AttachMaterial (gfx::CMaterial & Material)
-
-

This really shouldn't be allowed on simple primitives, but it's here if you need it. Keep in mind that this will override any color settings you've made. Likely this will only work well on quadrilateral primitives due to difficulties setting texture coordinates on other shapes.

-
Parameters
- - -
MaterialThe texture you want rendered
-
-
-
Precondition
Create() or Draw() haven't been called yet.
-
Note
I promise the given material won't be modified.
- -

Definition at line 80 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
void CDrawable::RemoveMaterial ()
-
- -

Definition at line 86 of file Drawable.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CDrawable::SetColor (const color4f_t & Color)
- 		-virtual
-
- -

Reimplemented in zen::gfx::CPolygon.

- -

Definition at line 92 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CDrawable::Draw (const bool is_bound = false)
-
-

This implements the technique described above. If there is no "owner" of the primitive (meaning no scene has set the internal data), it will automatically create a CVertexArray instance, a model-view matrix, and will use the default shader set. This data will be re-used time after time on subsequent Draw() calls, not recreated every time.

-
Parameters
- - -
is_boundHave we bound things? (VAO, material, etc.)
-
-
-
Returns
true if drawing was successful, false otherwise.
- -

Definition at line 100 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CDrawable::IsModifiable () const
-
- -

Definition at line 172 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const math::vector_t& zen::gfxcore::CDrawable::GetPosition () const
- 		-inline
-
- -

Definition at line 128 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::gfxcore::CDrawable::GetX () const
- 		-inline
-
- -

Definition at line 131 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::gfxcore::CDrawable::GetY () const
- 		-inline
-
- -

Definition at line 132 of file Drawable.hpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void CDrawable::LoadIntoVAO (gfxcore::CVertexArray & VAO,
const bool preserve = true 
)
-
-

This DOES NOT delete any internal vertex data unless explicitly specified. Thus, this can be called multiple times with various vertex settings to set up different primitives in the given vertex array.

-
Parameters
- - - -
VAOThe vertex array to store data into
preserveShould we keep our local vertex data?
-
-
- -

Definition at line 155 of file Drawable.cpp.

- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
gfx::CMaterial zen::gfxcore::CDrawable::m_Material
- 		-protected
-
- -

Definition at line 157 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - -
math::vector_t zen::gfxcore::CDrawable::m_Position
- 		-protected
-
- -

Definition at line 158 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - -
DrawBatch zen::gfxcore::CDrawable::m_DrawData
- 		-protected
-
- -

Definition at line 159 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - -
bool zen::gfxcore::CDrawable::m_internal
- 		-protected
-
- -

Definition at line 160 of file Drawable.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable.js b/docs/classzen_1_1gfxcore_1_1_c_drawable.js deleted file mode 100644 index 8aacc50d..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_drawable.js +++ /dev/null @@ -1,23 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_drawable = -[ - [ "CDrawable", "classzen_1_1gfxcore_1_1_c_drawable.html#a138126b609b3ae86c65711b40e246da2", null ], - [ "CDrawable", "classzen_1_1gfxcore_1_1_c_drawable.html#a4157209929cf41e327d896a5350a7613", null ], - [ "CDrawable", "classzen_1_1gfxcore_1_1_c_drawable.html#a472b671c4d9b0d39ca024d188fccc8e6", null ], - [ "~CDrawable", "classzen_1_1gfxcore_1_1_c_drawable.html#a58fd1036856d627b19976088e4143630", null ], - [ "Create", "classzen_1_1gfxcore_1_1_c_drawable.html#ac78681ab7e983757ef0a75eb676c45de", null ], - [ "Move", "classzen_1_1gfxcore_1_1_c_drawable.html#a65d35950a1094e90ac1e5aa9c4bb1bc2", null ], - [ "Move", "classzen_1_1gfxcore_1_1_c_drawable.html#a03d22a2a626bdeb8209ea231a06b235f", null ], - [ "AttachMaterial", "classzen_1_1gfxcore_1_1_c_drawable.html#a20601a6eca8f1835c3656ecbc2e66b67", null ], - [ "RemoveMaterial", "classzen_1_1gfxcore_1_1_c_drawable.html#a0903bde79f0b47d5790c8e0877024df2", null ], - [ "SetColor", "classzen_1_1gfxcore_1_1_c_drawable.html#a19575263590fb0ef8eec10a6a14844c7", null ], - [ "Draw", "classzen_1_1gfxcore_1_1_c_drawable.html#acaee6bd25adc67f4fbfcc0edf5fb8a7e", null ], - [ "IsModifiable", "classzen_1_1gfxcore_1_1_c_drawable.html#a12ccd6cd370ebfc28858789d8a4392d7", null ], - [ "GetPosition", "classzen_1_1gfxcore_1_1_c_drawable.html#ab5996d9c20af4a349098a2f8af134142", null ], - [ "GetX", "classzen_1_1gfxcore_1_1_c_drawable.html#ac620df10ab31ecb12fca55e4202c194b", null ], - [ "GetY", "classzen_1_1gfxcore_1_1_c_drawable.html#a54e399e7380b905d0544bb6c7e9a1dbf", null ], - [ "LoadIntoVAO", "classzen_1_1gfxcore_1_1_c_drawable.html#ad81d33436b4c823c160a983b4294fc06", null ], - [ "m_Material", "classzen_1_1gfxcore_1_1_c_drawable.html#a2c602d30d89ee5868102aafb773e31a8", null ], - [ "m_Position", "classzen_1_1gfxcore_1_1_c_drawable.html#a0f1c956bc36ed57958af7577a4c26d27", null ], - [ "m_DrawData", "classzen_1_1gfxcore_1_1_c_drawable.html#ac7a4507b960a2ad4079961b0e677d5c2", null ], - [ "m_internal", "classzen_1_1gfxcore_1_1_c_drawable.html#a4a873380d505b6ec978a1c6c09034a16", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_a12ccd6cd370ebfc28858789d8a4392d7_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_drawable_a12ccd6cd370ebfc28858789d8a4392d7_icgraph.map deleted file mode 100644 index 22baa817..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_drawable_a12ccd6cd370ebfc28858789d8a4392d7_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_a12ccd6cd370ebfc28858789d8a4392d7_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_drawable_a12ccd6cd370ebfc28858789d8a4392d7_icgraph.png deleted file mode 100644 index ba780e64..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_drawable_a12ccd6cd370ebfc28858789d8a4392d7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_a19575263590fb0ef8eec10a6a14844c7_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_drawable_a19575263590fb0ef8eec10a6a14844c7_icgraph.map deleted file mode 100644 index 269bfcf0..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_drawable_a19575263590fb0ef8eec10a6a14844c7_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_a19575263590fb0ef8eec10a6a14844c7_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_drawable_a19575263590fb0ef8eec10a6a14844c7_icgraph.png deleted file mode 100644 index 92f284c6..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_drawable_a19575263590fb0ef8eec10a6a14844c7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_a20601a6eca8f1835c3656ecbc2e66b67_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_drawable_a20601a6eca8f1835c3656ecbc2e66b67_icgraph.map deleted file mode 100644 index 4644fa91..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_drawable_a20601a6eca8f1835c3656ecbc2e66b67_icgraph.map +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_a20601a6eca8f1835c3656ecbc2e66b67_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_drawable_a20601a6eca8f1835c3656ecbc2e66b67_icgraph.png deleted file mode 100644 index 11f8b16b..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_drawable_a20601a6eca8f1835c3656ecbc2e66b67_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_acaee6bd25adc67f4fbfcc0edf5fb8a7e_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_drawable_acaee6bd25adc67f4fbfcc0edf5fb8a7e_icgraph.map deleted file mode 100644 index 48a5e2a0..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_drawable_acaee6bd25adc67f4fbfcc0edf5fb8a7e_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_drawable_acaee6bd25adc67f4fbfcc0edf5fb8a7e_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_drawable_acaee6bd25adc67f4fbfcc0edf5fb8a7e_icgraph.png deleted file mode 100644 index 1e0819eb..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_drawable_acaee6bd25adc67f4fbfcc0edf5fb8a7e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_g_l_subsystem.html b/docs/classzen_1_1gfxcore_1_1_c_g_l_subsystem.html deleted file mode 100644 index 8a8a13f1..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_g_l_subsystem.html +++ /dev/null @@ -1,442 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CGLSubsystem Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Protected Attributes | -Friends
-
-
zen::gfxcore::CGLSubsystem Class Referenceabstract
CoreGraphics
-
-
- -

A wrapper for OpenGL objects with proper cleanup. - More...

- -

#include "OpenGL.hpp"

- - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CGLSubsystem (const string_t name="OpenGL")
 
virtual ~CGLSubsystem ()
 
virtual bool Init ()=0
 
virtual bool Destroy ()=0
 
virtual bool Bind () const =0
 
virtual bool Unbind () const =0
 
virtual GLuint GetObjectHandle () const =0
 
bool IsInit ()
 
virtual const string_t & GetName () const
 
- - - -

-Protected Attributes

bool m_init
 
- - - -

-Friends

ZEN_API void zen::Quit ()
 
-

Detailed Description

-

Similar to zen::CSubsystem, this acts as a managed wrapper around various OpenGL object instances. Anything registered with this as a base class will automatically be Destroy()-ed when the engine is quit.

- -

Definition at line 103 of file OpenGL.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CGLSubsystem::CGLSubsystem (const string_t name = "OpenGL")
-
- -

Definition at line 7 of file OpenGL.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CGLSubsystem::~CGLSubsystem ()
- 		-virtual
-
- -

Definition at line 13 of file OpenGL.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
virtual bool zen::gfxcore::CGLSubsystem::Init ()
- 		-pure virtual
-
- -

Implemented in zen::gfx::CEffect, zen::gfxcore::CVertexArray, and zen::gfx::CRenderTarget.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual bool zen::gfxcore::CGLSubsystem::Destroy ()
- 		-pure virtual
-
- -

Implemented in zen::gfx::CEffect, zen::gfxcore::CVertexArray, and zen::gfx::CRenderTarget.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual bool zen::gfxcore::CGLSubsystem::Bind () const
- 		-pure virtual
-
- -

Implemented in zen::gfxcore::CVertexArray, and zen::gfx::CRenderTarget.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual bool zen::gfxcore::CGLSubsystem::Unbind () const
- 		-pure virtual
-
- -

Implemented in zen::gfxcore::CVertexArray, and zen::gfx::CRenderTarget.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual GLuint zen::gfxcore::CGLSubsystem::GetObjectHandle () const
- 		-pure virtual
-
- -

Implemented in zen::gfx::CEffect, zen::gfxcore::CVertexArray, and zen::gfx::CRenderTarget.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::gfxcore::CGLSubsystem::IsInit ()
- 		-inline
-
- -

Definition at line 117 of file OpenGL.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual const string_t& zen::gfxcore::CGLSubsystem::GetName () const
- 		-inlinevirtual
-
- -

Definition at line 119 of file OpenGL.hpp.

- -
-
-

Friends And Related Function Documentation

- -
-
- - - - - -
- - - - - - - -
ZEN_API void zen::Quit ()
- 		-friend
-
- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
bool zen::gfxcore::CGLSubsystem::m_init
- 		-protected
-
- -

Definition at line 125 of file OpenGL.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_g_l_subsystem.js b/docs/classzen_1_1gfxcore_1_1_c_g_l_subsystem.js deleted file mode 100644 index 4b423f17..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_g_l_subsystem.js +++ /dev/null @@ -1,14 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_g_l_subsystem = -[ - [ "CGLSubsystem", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a37093221910736e45e122a040844993a", null ], - [ "~CGLSubsystem", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a11c81e5aaeb17eab79db78dcbeeee611", null ], - [ "Init", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a432fea1dd5947e6f254dcd3570a349e8", null ], - [ "Destroy", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a77f0ea66633645e772c8ca12ec6e8872", null ], - [ "Bind", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#afa3147d5c699f63867f8158cd7108c6d", null ], - [ "Unbind", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a2f156a610268905fd5c1b10f5e48f354", null ], - [ "GetObjectHandle", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a1c51e85829c109daddc6f4a5aba66ac8", null ], - [ "IsInit", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a8f51d92f06d547070a5231f10f21fb7e", null ], - [ "GetName", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#aa05627df3b5723c2221d58d5a8da4732", null ], - [ "zen::Quit", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#a2f2251cf9cbb5af084e9f0f8f0561083", null ], - [ "m_init", "classzen_1_1gfxcore_1_1_c_g_l_subsystem.html#ad4248e312e0b60e82ff78d6e7b53f382", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer.html b/docs/classzen_1_1gfxcore_1_1_c_renderer.html deleted file mode 100644 index 6eeaea43..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer.html +++ /dev/null @@ -1,506 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CRenderer Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Static Public Member Functions
-
-
zen::gfxcore::CRenderer Class Reference
-
-
- -

Abstracts away API-specific rendering operations. - More...

- -

#include "Renderer.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Static Public Member Functions

static bool BlendOperation (const BlendFunc &Func)
 Sets the blending mode for subsequent draw calls. More...
 
static bool EnableTexture (const GLuint handle)
 Binds a texture handle. More...
 
static bool ToggleWireframe ()
 Wire frame mode. More...
 
static bool ResetMaterialState ()
 Resets shader and texture state to nothing. More...
 
static bool DisableBlending ()
 Disables blending (can also be done via BlendOperation()). More...
 
static bool DisableTexture ()
 Disables any bound texture (also via EnableTexture(0)). More...
 
static const gfx::CMaterial & GetDefaultMaterial ()
 
static gfx::CEffect & GetDefaultEffect ()
 
static const gfxcore::CTexture & GetDefaultTexture ()
 
static const math::matrix4x4_t & GetProjectionMatrix ()
 
static CVertexArray & GetFullscreenVBO ()
 
-

Detailed Description

-
Todo:

Add support for depth test toggling.

-

Document class in detail.

-
- -

Definition at line 56 of file Renderer.hpp.

-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
bool CRenderer::BlendOperation (const BlendFunc & Func)
- 		-inlinestatic
-
- -

Definition at line 32 of file Renderer.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool CRenderer::EnableTexture (const GLuint handle)
- 		-inlinestatic
-
- -

Definition at line 74 of file Renderer.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CRenderer::ToggleWireframe ()
- 		-inlinestatic
-
- -

Definition at line 80 of file Renderer.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CRenderer::ResetMaterialState ()
- 		-inlinestatic
-
- -

Definition at line 25 of file Renderer.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
static bool zen::gfxcore::CRenderer::DisableBlending ()
- 		-inlinestatic
-
- -
-
- -
-
- - - - - -
- - - - - - - -
bool CRenderer::DisableTexture ()
- 		-inlinestatic
-
- -

Definition at line 95 of file Renderer.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const gfx::CMaterial & CRenderer::GetDefaultMaterial ()
- 		-inlinestatic
-
- -

Definition at line 5 of file Renderer.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
gfx::CEffect & CRenderer::GetDefaultEffect ()
- 		-inlinestatic
-
- -

Definition at line 10 of file Renderer.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const gfxcore::CTexture & CRenderer::GetDefaultTexture ()
- 		-inlinestatic
-
- -

Definition at line 15 of file Renderer.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const math::matrix4x4_t & CRenderer::GetProjectionMatrix ()
- 		-inlinestatic
-
- -

Definition at line 20 of file Renderer.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
CVertexArray & CRenderer::GetFullscreenVBO ()
- 		-inlinestatic
-
- -

Definition at line 100 of file Renderer.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer.js b/docs/classzen_1_1gfxcore_1_1_c_renderer.js deleted file mode 100644 index f8728c01..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer.js +++ /dev/null @@ -1,14 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_renderer = -[ - [ "BlendOperation", "classzen_1_1gfxcore_1_1_c_renderer.html#a2b356e4ef3d3b41a279fed90a7fa6804", null ], - [ "EnableTexture", "classzen_1_1gfxcore_1_1_c_renderer.html#ab14ae2f572f0d2a405d8ebbee3e5bd52", null ], - [ "ToggleWireframe", "classzen_1_1gfxcore_1_1_c_renderer.html#a2c5991b52e9549267a1a3672e9d5bcd0", null ], - [ "ResetMaterialState", "classzen_1_1gfxcore_1_1_c_renderer.html#af9f6b37fdd6d81a96308f4433f5d33dc", null ], - [ "DisableBlending", "classzen_1_1gfxcore_1_1_c_renderer.html#abb3ee508010c41734d05713af4eeb461", null ], - [ "DisableTexture", "classzen_1_1gfxcore_1_1_c_renderer.html#ae184526b45d264101cc8e65186f8437e", null ], - [ "GetDefaultMaterial", "classzen_1_1gfxcore_1_1_c_renderer.html#a7c7b60ab0bc8edcf43af2339f2e2837a", null ], - [ "GetDefaultEffect", "classzen_1_1gfxcore_1_1_c_renderer.html#a9c30fb338b4e85403dbd749eb36f0843", null ], - [ "GetDefaultTexture", "classzen_1_1gfxcore_1_1_c_renderer.html#a132f203b3ea6a332abd9e5ae14c730ab", null ], - [ "GetProjectionMatrix", "classzen_1_1gfxcore_1_1_c_renderer.html#a8f2b14f4475f2773c75e63438b9f328b", null ], - [ "GetFullscreenVBO", "classzen_1_1gfxcore_1_1_c_renderer.html#a581ae9a207692ce6d466cbd06321a6c2", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a132f203b3ea6a332abd9e5ae14c730ab_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_renderer_a132f203b3ea6a332abd9e5ae14c730ab_icgraph.map deleted file mode 100644 index 8b22ac1f..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer_a132f203b3ea6a332abd9e5ae14c730ab_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a132f203b3ea6a332abd9e5ae14c730ab_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_renderer_a132f203b3ea6a332abd9e5ae14c730ab_icgraph.png deleted file mode 100644 index c7c1dd3f..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_renderer_a132f203b3ea6a332abd9e5ae14c730ab_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2b356e4ef3d3b41a279fed90a7fa6804_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_renderer_a2b356e4ef3d3b41a279fed90a7fa6804_icgraph.map deleted file mode 100644 index e575369f..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2b356e4ef3d3b41a279fed90a7fa6804_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2b356e4ef3d3b41a279fed90a7fa6804_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_renderer_a2b356e4ef3d3b41a279fed90a7fa6804_icgraph.png deleted file mode 100644 index 0b3a556d..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2b356e4ef3d3b41a279fed90a7fa6804_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2c5991b52e9549267a1a3672e9d5bcd0_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_renderer_a2c5991b52e9549267a1a3672e9d5bcd0_icgraph.map deleted file mode 100644 index 07c1f471..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2c5991b52e9549267a1a3672e9d5bcd0_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2c5991b52e9549267a1a3672e9d5bcd0_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_renderer_a2c5991b52e9549267a1a3672e9d5bcd0_icgraph.png deleted file mode 100644 index 7ff5c7b0..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_renderer_a2c5991b52e9549267a1a3672e9d5bcd0_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a8f2b14f4475f2773c75e63438b9f328b_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_renderer_a8f2b14f4475f2773c75e63438b9f328b_icgraph.map deleted file mode 100644 index 129652f9..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer_a8f2b14f4475f2773c75e63438b9f328b_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_a8f2b14f4475f2773c75e63438b9f328b_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_renderer_a8f2b14f4475f2773c75e63438b9f328b_icgraph.png deleted file mode 100644 index 713ba76b..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_renderer_a8f2b14f4475f2773c75e63438b9f328b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_ab14ae2f572f0d2a405d8ebbee3e5bd52_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_renderer_ab14ae2f572f0d2a405d8ebbee3e5bd52_icgraph.map deleted file mode 100644 index e2abb677..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer_ab14ae2f572f0d2a405d8ebbee3e5bd52_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_ab14ae2f572f0d2a405d8ebbee3e5bd52_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_renderer_ab14ae2f572f0d2a405d8ebbee3e5bd52_icgraph.png deleted file mode 100644 index 5fceb2d5..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_renderer_ab14ae2f572f0d2a405d8ebbee3e5bd52_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_af9f6b37fdd6d81a96308f4433f5d33dc_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_renderer_af9f6b37fdd6d81a96308f4433f5d33dc_icgraph.map deleted file mode 100644 index d57e564f..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_renderer_af9f6b37fdd6d81a96308f4433f5d33dc_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_renderer_af9f6b37fdd6d81a96308f4433f5d33dc_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_renderer_af9f6b37fdd6d81a96308f4433f5d33dc_icgraph.png deleted file mode 100644 index ebb560fa..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_renderer_af9f6b37fdd6d81a96308f4433f5d33dc_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader.html b/docs/classzen_1_1gfxcore_1_1_c_shader.html deleted file mode 100644 index 2f7fd9d7..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader.html +++ /dev/null @@ -1,480 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CShader Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfxcore::CShader Class Reference
CoreGraphics
-
-
- -

A wrapper for OpenGL shader objects. - More...

- -

#include "Shader.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CShader (const void *const ptr)
 
 ~CShader ()
 
bool LoadFromFile (const string_t &filename)
 Loads a shader from a file. More...
 
bool LoadFromExisting (const CAsset *const pCopyShader)
 
bool LoadFromRaw (const string_t &string)
 
bool Destroy ()
 Destroys the OpenGL shader object. More...
 
const void *const GetData () const
 Returns the OpenGL shader handle (cast it to GLuint to use). More...
 
GLuint GetShaderObject () const
 Returns the raw OpenGL shader handle. More...
 
const string_t & GetShaderLog () const
 Returns the shader log. More...
 
void SetType (const GLenum shader_type)
 One of GL_FRAGMENT_SHADER, GL_VERTEX_SHADER, GL_GEOMETRY_SHADER. More...
 
- Public Member Functions inherited from zen::asset::CAsset
virtual ~CAsset ()
 Logs some information. More...
 
virtual bool LoadFromExisting (const CAsset *const pCopy)
 Copies an asset from another. More...
 
virtual bool Reload ()
 Reloads oneself from whatever method it was loaded from originally. More...
 
uint32_t GetFilenameHash () const
 Returns the hashed filename for quicker comparison. More...
 
virtual assetid_t GetAssetID () const final
 Returns the unique asset ID. More...
 
const string_t & GetFilename () const
 Returns the filename used to load the asset. More...
 
const void *const GetOwner () const
 Returns address of asset owner. More...
 
const string_t & GetError () const
 Returns the last error string. More...
 
bool IsLoaded () const
 Has LoadFromFile() been called successfully? More...
 
void SetOwner (const void *const owner)
 Sets the asset owner. More...
 
void SetFilename (const string_t &filename)
 Overrides the asset filename. More...
 
- - - - - - - - - - - - - - - - - - - -

-Additional Inherited Members

- Protected Member Functions inherited from zen::asset::CAsset
 CAsset (const void *const owner=nullptr)
 Only asset::CAssetManager can create CAsset instances. More...
 
- Protected Attributes inherited from zen::asset::CAsset
util::CLog & m_Log
 
string_t m_filename
 
string_t m_error_str
 
uint32_t m_filename_hash
 
bool m_loaded
 
- Static Protected Attributes inherited from zen::asset::CAsset
static uint32_t s_seed = 0x6915BAD
 
-

Detailed Description

-

This is a managed zen::asset::CAsset child class that automatically frees the OpenGL shader handle and prevents it from being loaded multiple times from a file. The reason this is an asset rather than a zen::gfxcore::CGLSubsystem is because it requires being loaded from a file rather than typical initialization (via Init()).

-

This class is primarily used internally, and users should not stray toward it, preferring zen::gfx::CEffect or at least zen::gfxcore::CShaderSet if they need something slightly lower-level.

- -

Definition at line 41 of file Shader.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CShader::CShader (const void *const ptr)
-
- -

Definition at line 9 of file Shader.cpp.

- -
-
- -
-
- - - - - - - -
CShader::~CShader ()
-
- -

Definition at line 13 of file Shader.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
bool CShader::LoadFromFile (const string_t & filename)
- 		-virtual
-
-

The shader type is interpreted from the filename. Since this is a sub-class of asset::CAsset, you cannot pass any extra parameters to the object on creation. Filenames ending in .vs are interpreted to be vertex shaders, and those ending in .fs or .ps are interpreted to be fragment (or pixel) shaders.

-
Parameters
- - -
filenameFilename to load from
-
-
-
Returns
true if the file loaded and the shader compiled false otherwise.
- -

Implements zen::asset::CAsset.

- -

Definition at line 18 of file Shader.cpp.

- -
-
- -
-
- - - - - - - - -
bool CShader::LoadFromExisting (const CAsset *const pCopyShader)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 54 of file Shader.cpp.

- -
-
- -
-
- - - - - - - - -
bool CShader::LoadFromRaw (const string_t & string)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 71 of file Shader.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CShader::Destroy ()
- 		-virtual
-
- -

Implements zen::asset::CAsset.

- -

Definition at line 133 of file Shader.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const void *const CShader::GetData () const
- 		-virtual
-
- -

Implements zen::asset::CAsset.

- -

Definition at line 146 of file Shader.cpp.

- -
-
- -
-
- - - - - - - -
GLuint CShader::GetShaderObject () const
-
- -

Definition at line 151 of file Shader.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
const string_t & CShader::GetShaderLog () const
-
- -

Definition at line 156 of file Shader.cpp.

- -
-
- -
-
- - - - - - - - -
void CShader::SetType (const GLenum shader_type)
-
- -

Definition at line 161 of file Shader.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader.js b/docs/classzen_1_1gfxcore_1_1_c_shader.js deleted file mode 100644 index f1a0dbdc..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader.js +++ /dev/null @@ -1,13 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_shader = -[ - [ "CShader", "classzen_1_1gfxcore_1_1_c_shader.html#ad34c8139905b3c9b20225c03acd627fa", null ], - [ "~CShader", "classzen_1_1gfxcore_1_1_c_shader.html#a9961296e74a4c5a16701811fa67840b5", null ], - [ "LoadFromFile", "classzen_1_1gfxcore_1_1_c_shader.html#a3bf9d0ff70a5e7363dfdd51c8039fa1f", null ], - [ "LoadFromExisting", "classzen_1_1gfxcore_1_1_c_shader.html#a253256315aba27fb7ce909a3c025a22f", null ], - [ "LoadFromRaw", "classzen_1_1gfxcore_1_1_c_shader.html#a4d24242797f32704ece433ffbf06454f", null ], - [ "Destroy", "classzen_1_1gfxcore_1_1_c_shader.html#abce09e8b39114932f80b607fb2faced2", null ], - [ "GetData", "classzen_1_1gfxcore_1_1_c_shader.html#a6f27513fba2207d5911771046723ee89", null ], - [ "GetShaderObject", "classzen_1_1gfxcore_1_1_c_shader.html#a3dbb5b95d9819c8021f59f93fc14050b", null ], - [ "GetShaderLog", "classzen_1_1gfxcore_1_1_c_shader.html#a6e6efbfc45a5fb9203f65a3aec0cd1bf", null ], - [ "SetType", "classzen_1_1gfxcore_1_1_c_shader.html#aed3875e03a99f1868bd37c4fadc99712", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_a3dbb5b95d9819c8021f59f93fc14050b_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_a3dbb5b95d9819c8021f59f93fc14050b_icgraph.map deleted file mode 100644 index 5f6bea73..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_a3dbb5b95d9819c8021f59f93fc14050b_icgraph.map +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_a3dbb5b95d9819c8021f59f93fc14050b_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_a3dbb5b95d9819c8021f59f93fc14050b_icgraph.png deleted file mode 100644 index 57979187..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_a3dbb5b95d9819c8021f59f93fc14050b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_a4d24242797f32704ece433ffbf06454f_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_a4d24242797f32704ece433ffbf06454f_icgraph.map deleted file mode 100644 index e16b28e7..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_a4d24242797f32704ece433ffbf06454f_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_a4d24242797f32704ece433ffbf06454f_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_a4d24242797f32704ece433ffbf06454f_icgraph.png deleted file mode 100644 index ac80e00f..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_a4d24242797f32704ece433ffbf06454f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_abce09e8b39114932f80b607fb2faced2_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_abce09e8b39114932f80b607fb2faced2_icgraph.map deleted file mode 100644 index 8200cf10..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_abce09e8b39114932f80b607fb2faced2_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_abce09e8b39114932f80b607fb2faced2_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_abce09e8b39114932f80b607fb2faced2_icgraph.png deleted file mode 100644 index 4ff93ea9..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_abce09e8b39114932f80b607fb2faced2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_aed3875e03a99f1868bd37c4fadc99712_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_aed3875e03a99f1868bd37c4fadc99712_icgraph.map deleted file mode 100644 index c1c7752c..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_aed3875e03a99f1868bd37c4fadc99712_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_aed3875e03a99f1868bd37c4fadc99712_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_aed3875e03a99f1868bd37c4fadc99712_icgraph.png deleted file mode 100644 index c9ee4ba4..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_aed3875e03a99f1868bd37c4fadc99712_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set.html b/docs/classzen_1_1gfxcore_1_1_c_shader_set.html deleted file mode 100644 index e867784c..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set.html +++ /dev/null @@ -1,729 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CShaderSet Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfxcore::CShaderSet Class Reference
CoreGraphics
-
-
- -

A wrapper for a useable set of shaders (an OpenGL program). - More...

- -

#include "ShaderSet.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CShaderSet (asset::CAssetManager &Assets)
 
 ~CShaderSet ()
 
 CShaderSet (const CShaderSet &Copy)
 Shallow-copy of internal shader objects. More...
 
CShaderSet & operator= (const CShaderSet &Copy)
 
bool LoadFromFile (const string_t &vs, const string_t &fs)
 Loads a set of shader assets from a file. More...
 
bool LoadVertexShaderFromFile (const string_t &filename)
 Loads a vertex shader from a file. More...
 
bool LoadFragmentShaderFromFile (const string_t &filename)
 Loads a vertex shader from a file. More...
 
bool LoadFromStr (const string_t &vs, const string_t &fs)
 Loads a set of shader objects from a raw string. More...
 
bool LoadVertexShaderFromStr (const string_t &str)
 Loads a vertex shader from a raw string (no linking). More...
 
bool LoadFragmentShaderFromStr (const string_t &str)
 Loads a fragment shader from a raw string (no linking). More...
 
bool CreateShaderObject ()
 Links loaded shaders together into a useable program. More...
 
bool Bind () const
 Binds the shader program to the rendering context for use. More...
 
bool Unbind () const
 Removes any shader program from the rendering context. More...
 
bool Destroy ()
 Destroys the shader program. More...
 
uint16_t GetShaderObject () const
 Returns the shader program handle. More...
 
GLint GetUniformLocation (const string_t &name) const
 Returns the index of a shader uniform location in VRAM. More...
 
GLint GetAttributeLocation (const string_t &name) const
 Returns the index of a shader attribute location in VRAM. More...
 
const string_t & GetError () const
 Returns error string. More...
 
const string_t & GetLinkerLog () const
 Returns shader program link result. More...
 
uint16_t GetID () const
 Returns program ID (unique for different shader sets). More...
 
-

Detailed Description

-

This essentially a pair of shaders (vertex and fragment), in addition to some convenience methods allowing for access to the shader program's internal variables and attributes.

- -

Definition at line 41 of file ShaderSet.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CShaderSet::CShaderSet (asset::CAssetManager & Assets)
-
- -

Definition at line 12 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - -
CShaderSet::~CShaderSet ()
-
- -

Definition at line 18 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - - -
CShaderSet::CShaderSet (const CShaderSet & Copy)
-
- -

Definition at line 23 of file ShaderSet.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
CShaderSet & CShaderSet::operator= (const CShaderSet & Copy)
-
- -

Definition at line 34 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool CShaderSet::LoadFromFile (const string_t & vs,
const string_t & fs 
)
-
-

Unlike most of the other Load*() methods, this function WILL create a shader object, and thus a useable, bindable shader.

-

You can check for a linker error through GetError() and a generic log through GetLinkerLog() in order to test for warnings or other messages.

-
Parameters
- - - -
vsVertex shader filename
fsFragment (pixel) shader filename
-
-
-
Returns
true if the shader program compiled and linked, false otherwise.
-
See Also
GetError()
-
-GetLinkerLog()
- -

Definition at line 45 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - - -
bool CShaderSet::LoadVertexShaderFromFile (const string_t & filename)
-
-

This only loads a shader. The extension on the file is irrelevant, because the filename will be dynamically modified in order to fit the specification for dynamic shader type inferencing. See the docs for CShader for that.

-

This method doesn't create a shader program, so a call to the relevant method is required (CreateShaderObject()).

-
Parameters
- - -
filenameShader filename
-
-
-
Returns
true if the shader object loaded from the file, false otherwise.
-
See Also
GetError()
-
-CreateShaderObject()
- -

Definition at line 68 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CShaderSet::LoadFragmentShaderFromFile (const string_t & filename)
-
-

This only loads a shader. The extension on the file is irrelevant, because the filename will be dynamically modified in order to fit the specification for dynamic shader type inferencing. See the docs for CShader for that.

-

This method doesn't create a shader program, so a call to the relevant method is required (CreateShaderObject()).

-
Parameters
- - -
filenameShader filename
-
-
-
Returns
true if the shader object loaded from the file, false otherwise.
-
See Also
GetError()
-
-CreateShaderObject()
-

Loads a fragment (pixel) shader from a file.

- -

Definition at line 82 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool zen::gfxcore::CShaderSet::LoadFromStr (const string_t & vs,
const string_t & fs 
)
-
-

Unlike most of the other Load*() methods, this function WILL create a shader object, and thus a useable, bindable shader.

-

You can check for a linker error through GetError() and a generic log through GetLinkerLog() in order to test for warnings or other messages.

-
Parameters
- - - -
vsVertex shader filename
fsFragment (pixel) shader filename
-
-
-
Returns
true if the shader program compiled and linked, false otherwise.
-
See Also
GetError()
-
-GetLinkerLog()
- -
-
- -
-
- - - - - - - - -
bool CShaderSet::LoadVertexShaderFromStr (const string_t & str)
-
- -

Definition at line 96 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - - -
bool CShaderSet::LoadFragmentShaderFromStr (const string_t & str)
-
- -

Definition at line 105 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - -
bool CShaderSet::CreateShaderObject ()
-
-

This will take the loaded vertex and fragment shader objects and bring them together into an OpenGL shader program that can then be bound to a rendering context and used.

-

You can check for a linker error through GetError() and a generic log through GetLinkerLog() in order to test for warnings or other messages.

-
Returns
true if it linked successfully, false otherwise.
-
Precondition
A vertex and fragment shader was loaded successfully.
-
See Also
GetError()
-
-GetLinkerLog()
- -

Definition at line 114 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CShaderSet::Bind () const
-
- -

Definition at line 212 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CShaderSet::Unbind () const
-
- -

Definition at line 224 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CShaderSet::Destroy ()
-
- -

Definition at line 277 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
uint16_t CShaderSet::GetShaderObject () const
-
- -

Definition at line 236 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
GLint CShaderSet::GetUniformLocation (const string_t & name) const
-
- -

Definition at line 241 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
GLint CShaderSet::GetAttributeLocation (const string_t & name) const
-
- -

Definition at line 254 of file ShaderSet.cpp.

- -
-
- -
-
- - - - - - - -
const string_t & CShaderSet::GetError () const
-
- -

Definition at line 267 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
const string_t & CShaderSet::GetLinkerLog () const
-
- -

Definition at line 272 of file ShaderSet.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfxcore::CShaderSet::GetID () const
- 		-inline
-
- -

Definition at line 154 of file ShaderSet.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set.js b/docs/classzen_1_1gfxcore_1_1_c_shader_set.js deleted file mode 100644 index c46ed1f9..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set.js +++ /dev/null @@ -1,23 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_shader_set = -[ - [ "CShaderSet", "classzen_1_1gfxcore_1_1_c_shader_set.html#a84d5b9e9acadba1c2e6ca81efdba520a", null ], - [ "~CShaderSet", "classzen_1_1gfxcore_1_1_c_shader_set.html#af5a7a142cd8f8ecc04ccfee5447a75b4", null ], - [ "CShaderSet", "classzen_1_1gfxcore_1_1_c_shader_set.html#ad4ace38a9bf58a0928efa7c4787d467c", null ], - [ "operator=", "classzen_1_1gfxcore_1_1_c_shader_set.html#a85afd7dac987751482a07902c8c5a61b", null ], - [ "LoadFromFile", "classzen_1_1gfxcore_1_1_c_shader_set.html#acc6db9e44605d90b710f6262c367dc9f", null ], - [ "LoadVertexShaderFromFile", "classzen_1_1gfxcore_1_1_c_shader_set.html#a885a9a17817d5df582fc129cedcc7d68", null ], - [ "LoadFragmentShaderFromFile", "classzen_1_1gfxcore_1_1_c_shader_set.html#a80240d2c752cb50fc99fa0805228919e", null ], - [ "LoadFromStr", "classzen_1_1gfxcore_1_1_c_shader_set.html#a6879dbb14e43fe9041e9a3d03e3c9fc1", null ], - [ "LoadVertexShaderFromStr", "classzen_1_1gfxcore_1_1_c_shader_set.html#a8e898427d6728f87188254d8507034f5", null ], - [ "LoadFragmentShaderFromStr", "classzen_1_1gfxcore_1_1_c_shader_set.html#a1e7c9e3be644f5b7e1e53bf17e4edde5", null ], - [ "CreateShaderObject", "classzen_1_1gfxcore_1_1_c_shader_set.html#ac18b1dc09d69ddcb700eba2f1c72f401", null ], - [ "Bind", "classzen_1_1gfxcore_1_1_c_shader_set.html#a84db9a8a0b89ccc416936e8753b55238", null ], - [ "Unbind", "classzen_1_1gfxcore_1_1_c_shader_set.html#aef344e3ef9141d8460cfc0cfe5075112", null ], - [ "Destroy", "classzen_1_1gfxcore_1_1_c_shader_set.html#a5b59d547f6c9080d58292fd532855f76", null ], - [ "GetShaderObject", "classzen_1_1gfxcore_1_1_c_shader_set.html#a6072d2d3a77269ea40eeaa7d157cf8e8", null ], - [ "GetUniformLocation", "classzen_1_1gfxcore_1_1_c_shader_set.html#ae1640821acc07a4ce9f772a894e2c4ae", null ], - [ "GetAttributeLocation", "classzen_1_1gfxcore_1_1_c_shader_set.html#a8e62b3fd221feb916314d134885add00", null ], - [ "GetError", "classzen_1_1gfxcore_1_1_c_shader_set.html#ad9dc6e638b6fbc08cb0c7d24ebdb2984", null ], - [ "GetLinkerLog", "classzen_1_1gfxcore_1_1_c_shader_set.html#a9a2a779cd8db53bdad4f4dce5b9496cc", null ], - [ "GetID", "classzen_1_1gfxcore_1_1_c_shader_set.html#a8ffa30edb76b0d902354599abcf29068", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a1e7c9e3be644f5b7e1e53bf17e4edde5_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a1e7c9e3be644f5b7e1e53bf17e4edde5_icgraph.map deleted file mode 100644 index d46b532c..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a1e7c9e3be644f5b7e1e53bf17e4edde5_icgraph.map +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a1e7c9e3be644f5b7e1e53bf17e4edde5_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a1e7c9e3be644f5b7e1e53bf17e4edde5_icgraph.png deleted file mode 100644 index 77236639..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a1e7c9e3be644f5b7e1e53bf17e4edde5_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a5b59d547f6c9080d58292fd532855f76_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a5b59d547f6c9080d58292fd532855f76_icgraph.map deleted file mode 100644 index 90763d53..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a5b59d547f6c9080d58292fd532855f76_icgraph.map +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a5b59d547f6c9080d58292fd532855f76_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a5b59d547f6c9080d58292fd532855f76_icgraph.png deleted file mode 100644 index bbeeb8af..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a5b59d547f6c9080d58292fd532855f76_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a6072d2d3a77269ea40eeaa7d157cf8e8_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a6072d2d3a77269ea40eeaa7d157cf8e8_icgraph.map deleted file mode 100644 index a68b5ba4..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a6072d2d3a77269ea40eeaa7d157cf8e8_icgraph.map +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a6072d2d3a77269ea40eeaa7d157cf8e8_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a6072d2d3a77269ea40eeaa7d157cf8e8_icgraph.png deleted file mode 100644 index b273c6ca..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a6072d2d3a77269ea40eeaa7d157cf8e8_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a80240d2c752cb50fc99fa0805228919e_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a80240d2c752cb50fc99fa0805228919e_icgraph.map deleted file mode 100644 index 3fb03f60..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a80240d2c752cb50fc99fa0805228919e_icgraph.map +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a80240d2c752cb50fc99fa0805228919e_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a80240d2c752cb50fc99fa0805228919e_icgraph.png deleted file mode 100644 index ecfbf03a..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a80240d2c752cb50fc99fa0805228919e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a84db9a8a0b89ccc416936e8753b55238_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a84db9a8a0b89ccc416936e8753b55238_icgraph.map deleted file mode 100644 index 63f49df1..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a84db9a8a0b89ccc416936e8753b55238_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a84db9a8a0b89ccc416936e8753b55238_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a84db9a8a0b89ccc416936e8753b55238_icgraph.png deleted file mode 100644 index 51b6e058..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a84db9a8a0b89ccc416936e8753b55238_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a885a9a17817d5df582fc129cedcc7d68_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a885a9a17817d5df582fc129cedcc7d68_icgraph.map deleted file mode 100644 index ace37a80..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a885a9a17817d5df582fc129cedcc7d68_icgraph.map +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a885a9a17817d5df582fc129cedcc7d68_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a885a9a17817d5df582fc129cedcc7d68_icgraph.png deleted file mode 100644 index 97d40ffd..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a885a9a17817d5df582fc129cedcc7d68_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a8e898427d6728f87188254d8507034f5_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a8e898427d6728f87188254d8507034f5_icgraph.map deleted file mode 100644 index 11ef33d0..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a8e898427d6728f87188254d8507034f5_icgraph.map +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a8e898427d6728f87188254d8507034f5_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a8e898427d6728f87188254d8507034f5_icgraph.png deleted file mode 100644 index 6892280d..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a8e898427d6728f87188254d8507034f5_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a9a2a779cd8db53bdad4f4dce5b9496cc_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a9a2a779cd8db53bdad4f4dce5b9496cc_icgraph.map deleted file mode 100644 index cfa52675..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a9a2a779cd8db53bdad4f4dce5b9496cc_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a9a2a779cd8db53bdad4f4dce5b9496cc_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_a9a2a779cd8db53bdad4f4dce5b9496cc_icgraph.png deleted file mode 100644 index 3e4a2c83..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_a9a2a779cd8db53bdad4f4dce5b9496cc_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ac18b1dc09d69ddcb700eba2f1c72f401_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_ac18b1dc09d69ddcb700eba2f1c72f401_icgraph.map deleted file mode 100644 index 6cb7d653..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ac18b1dc09d69ddcb700eba2f1c72f401_icgraph.map +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ac18b1dc09d69ddcb700eba2f1c72f401_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_ac18b1dc09d69ddcb700eba2f1c72f401_icgraph.png deleted file mode 100644 index 3fc778c9..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ac18b1dc09d69ddcb700eba2f1c72f401_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ad9dc6e638b6fbc08cb0c7d24ebdb2984_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_ad9dc6e638b6fbc08cb0c7d24ebdb2984_icgraph.map deleted file mode 100644 index f2af5280..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ad9dc6e638b6fbc08cb0c7d24ebdb2984_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ad9dc6e638b6fbc08cb0c7d24ebdb2984_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_ad9dc6e638b6fbc08cb0c7d24ebdb2984_icgraph.png deleted file mode 100644 index 3caf081b..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ad9dc6e638b6fbc08cb0c7d24ebdb2984_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ae1640821acc07a4ce9f772a894e2c4ae_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_ae1640821acc07a4ce9f772a894e2c4ae_icgraph.map deleted file mode 100644 index 045ff8d8..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ae1640821acc07a4ce9f772a894e2c4ae_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ae1640821acc07a4ce9f772a894e2c4ae_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_ae1640821acc07a4ce9f772a894e2c4ae_icgraph.png deleted file mode 100644 index 3a499063..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_ae1640821acc07a4ce9f772a894e2c4ae_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_aef344e3ef9141d8460cfc0cfe5075112_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_shader_set_aef344e3ef9141d8460cfc0cfe5075112_icgraph.map deleted file mode 100644 index ad1514d3..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_shader_set_aef344e3ef9141d8460cfc0cfe5075112_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_shader_set_aef344e3ef9141d8460cfc0cfe5075112_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_shader_set_aef344e3ef9141d8460cfc0cfe5075112_icgraph.png deleted file mode 100644 index fcf3b16a..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_shader_set_aef344e3ef9141d8460cfc0cfe5075112_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_sorter.html b/docs/classzen_1_1gfxcore_1_1_c_sorter.html deleted file mode 100644 index 0146aada..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_sorter.html +++ /dev/null @@ -1,529 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CSorter Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Static Public Member Functions | -Static Public Attributes
-
-
zen::gfxcore::CSorter Class Reference
CoreGraphics
-
-
- -

A collection of sort methods to optimize rendering. - More...

- -

#include "Sorter.hpp"

- - - - - - - - - - -

-Static Public Member Functions

static const obj::CEntity * SortByMaterial (const obj::CEntity *pEnt1, const obj::CEntity *pEnt2)
 
static const obj::CEntity * SortByDepth (const obj::CEntity *pEnt1, const obj::CEntity *pEnt2)
 
static const obj::CEntity * SortByAlpha (const obj::CEntity *pEnt1, const obj::CEntity *pEnt2)
 
static uint32_t CreateSortFlag (const uint16_t material_id, const uint16_t depth_value, const uint8_t alpha_bit, const uint16_t unused=0)
 
- - - - - - - - - - - - - - - - - -

-Static Public Attributes

static const uint32_t MATERIAL_FLAG = 0xFFFF0000
 
static const uint32_t MATERIAL_OFFSET = 16
 
static const uint32_t DEPTH_FLAG = 0x0000FF00
 
static const uint32_t DEPTH_OFFSET = 8
 
static const uint32_t ALPHA_FLAG = 0x00000080
 
static const uint32_t ALPHA_OFFSET = 7
 
static const uint32_t UNUSED_FLAG = 0x0000007F
 
static const uint32_t UNUSED_OFFSET = 0
 
-

Detailed Description

-

This is a static class with no member functions, and contains tools to sort an entity by material, depth, and alpha value. It utilizes a high-speed, low-level bit comparison technique to make comparisons as fast as possible.

-

-Optimized Sorting Algorithm

-

-Explanation

-

In order to maximize rendering efficiency, it is important to make as little state changes as possible to the underlying rendering API. For this, Zenderer implements a high-speed sorting technique that operates at maximum performance.

-

Essentially, each entity internally stores a 32-bit integer consisted of various state flags describing material usage, depth, transparency, and other data.

-

This state flag is used for comparing the scene graph prior to rendering in order to, for example, group all entities with identical materials together in order to minimize texture swaps.

-

A material is defined as follows:

-

material = texture + vshader + fshader

-

And a thorough explanation of the state bit definitions are ahead.

-

We expect to have no more than 4096 materials in a single game. This can, of course, be easily expanded, but 4096 is more than enough for a standard 2D game. For this, we allocate 12 bits in the flag for storing a unique material ID (212 = 4096).

-

Thus: 32 - 16 = 16 bits remaining.

-

For depth information, we allocate 8 bits, giving us 256 different levels of depth for any entity in the game. Again this is perfectly acceptable for a 2D game.

-

Thus: 16 - 8 = 8 bits remaining.

-

For transparency, we only need a single bit. to compare if a

-

Thus: 8 - 1 = 7 bits remaining.

-

The remaining bits are reserved for any future sorting requirements. 7 bits gives 128 different values, surely large enough to accommodate any future requirements.

-

-Sorting

-

The actual sorting process works as follows:

-

The scene stores a list of entities for rendering. It also contains an internal dictionary associating the various sorting parameters (material, depth) with a list of entities that use that parameter.

-

On addition of an entity from the scene, it's inserted into the appropriate list based on its internal flags.

- -

Definition at line 34 of file Sorter.hpp.

-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
static const obj::CEntity* zen::gfxcore::CSorter::SortByMaterial (const obj::CEntity * pEnt1,
const obj::CEntity * pEnt2 
)
- 		-inlinestatic
-
- -

Definition at line 38 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
static const obj::CEntity* zen::gfxcore::CSorter::SortByDepth (const obj::CEntity * pEnt1,
const obj::CEntity * pEnt2 
)
- 		-inlinestatic
-
- -

Definition at line 44 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
static const obj::CEntity* zen::gfxcore::CSorter::SortByAlpha (const obj::CEntity * pEnt1,
const obj::CEntity * pEnt2 
)
- 		-inlinestatic
-
- -

Definition at line 50 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
static uint32_t zen::gfxcore::CSorter::CreateSortFlag (const uint16_t material_id,
const uint16_t depth_value,
const uint8_t alpha_bit,
const uint16_t unused = 0 
)
- 		-inlinestatic
-
- -

Definition at line 56 of file Sorter.hpp.

- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::MATERIAL_FLAG = 0xFFFF0000
- 		-static
-
- -

Definition at line 65 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::MATERIAL_OFFSET = 16
- 		-static
-
- -

Definition at line 66 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::DEPTH_FLAG = 0x0000FF00
- 		-static
-
- -

Definition at line 68 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::DEPTH_OFFSET = 8
- 		-static
-
- -

Definition at line 69 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::ALPHA_FLAG = 0x00000080
- 		-static
-
- -

Definition at line 71 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::ALPHA_OFFSET = 7
- 		-static
-
- -

Definition at line 72 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::UNUSED_FLAG = 0x0000007F
- 		-static
-
- -

Definition at line 74 of file Sorter.hpp.

- -
-
- -
-
- - - - - -
- - - - -
const uint32_t zen::gfxcore::CSorter::UNUSED_OFFSET = 0
- 		-static
-
- -

Definition at line 75 of file Sorter.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_sorter.js b/docs/classzen_1_1gfxcore_1_1_c_sorter.js deleted file mode 100644 index e74499c8..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_sorter.js +++ /dev/null @@ -1,15 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_sorter = -[ - [ "SortByMaterial", "classzen_1_1gfxcore_1_1_c_sorter.html#ab431df10250fd7c5c5481a3800597930", null ], - [ "SortByDepth", "classzen_1_1gfxcore_1_1_c_sorter.html#a3a5a8026244b14f3561ad3a4d1e94a6d", null ], - [ "SortByAlpha", "classzen_1_1gfxcore_1_1_c_sorter.html#a96b289555fcd6083257345d49239a3e4", null ], - [ "CreateSortFlag", "classzen_1_1gfxcore_1_1_c_sorter.html#a114b9838422d7cdbd052431a086c877d", null ], - [ "MATERIAL_FLAG", "classzen_1_1gfxcore_1_1_c_sorter.html#af73b46ffeb7cfe886a9300c6e85de8dd", null ], - [ "MATERIAL_OFFSET", "classzen_1_1gfxcore_1_1_c_sorter.html#a009f44ecfb0f63c468d03cc6383b4053", null ], - [ "DEPTH_FLAG", "classzen_1_1gfxcore_1_1_c_sorter.html#ade046c7c54f46a219f3b141edd2a58e0", null ], - [ "DEPTH_OFFSET", "classzen_1_1gfxcore_1_1_c_sorter.html#ae192e4509528039e0d5c345281289263", null ], - [ "ALPHA_FLAG", "classzen_1_1gfxcore_1_1_c_sorter.html#aabc96f79eaffee8fd00a10b2b3dfecaa", null ], - [ "ALPHA_OFFSET", "classzen_1_1gfxcore_1_1_c_sorter.html#a03f681912811c2fc3133f7cf12342a2c", null ], - [ "UNUSED_FLAG", "classzen_1_1gfxcore_1_1_c_sorter.html#ae69663c819dec868f0d1cb8f665ae056", null ], - [ "UNUSED_OFFSET", "classzen_1_1gfxcore_1_1_c_sorter.html#a4de7192dc04108ff5308fef7591916aa", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture.html b/docs/classzen_1_1gfxcore_1_1_c_texture.html deleted file mode 100644 index 690cf27f..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture.html +++ /dev/null @@ -1,630 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CTexture Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::gfxcore::CTexture Class Reference
CoreGraphics
-
-
- -

Low-level texture asset abstraction over OpenGL texture handles. - More...

- -

#include "Texture.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 ~CTexture ()
 
bool LoadFromFile (const string_t &filename)
 Loads an asset from the disk. More...
 
bool LoadFromExisting (const CAsset *const pCopy)
 
bool LoadFromExisting (const GLuint handle)
 
bool CopyFromExisting (const GLuint handle)
 
bool LoadFromRaw (const GLenum iformat, const GLenum format, const uint16_t w, const uint16_t h, const unsigned char *data)
 
const void *const GetData () const
 Returns raw asset data (usually for reloading). More...
 
bool Bind () const
 
bool Unbind () const
 
uint16_t GetWidth () const
 
uint16_t GetHeight () const
 
uint16_t GetID () const
 Returns program ID (unique for different textures). More...
 
- Public Member Functions inherited from zen::asset::CAsset
virtual ~CAsset ()
 Logs some information. More...
 
virtual bool LoadFromExisting (const CAsset *const pCopy)
 Copies an asset from another. More...
 
virtual bool Reload ()
 Reloads oneself from whatever method it was loaded from originally. More...
 
uint32_t GetFilenameHash () const
 Returns the hashed filename for quicker comparison. More...
 
virtual assetid_t GetAssetID () const final
 Returns the unique asset ID. More...
 
const string_t & GetFilename () const
 Returns the filename used to load the asset. More...
 
const void *const GetOwner () const
 Returns address of asset owner. More...
 
const string_t & GetError () const
 Returns the last error string. More...
 
bool IsLoaded () const
 Has LoadFromFile() been called successfully? More...
 
void SetOwner (const void *const owner)
 Sets the asset owner. More...
 
void SetFilename (const string_t &filename)
 Overrides the asset filename. More...
 
- - - -

-Static Public Member Functions

static CTexture & GetDefaultTexture ()
 
- - - - - - - - - - - - - - - - - - - -

-Additional Inherited Members

- Protected Member Functions inherited from zen::asset::CAsset
 CAsset (const void *const owner=nullptr)
 Only asset::CAssetManager can create CAsset instances. More...
 
- Protected Attributes inherited from zen::asset::CAsset
util::CLog & m_Log
 
string_t m_filename
 
string_t m_error_str
 
uint32_t m_filename_hash
 
bool m_loaded
 
- Static Protected Attributes inherited from zen::asset::CAsset
static uint32_t s_seed = 0x6915BAD
 
-

Detailed Description

-

Zenderer uses stb_image.c, a single-file light-weight C library, to load a variety of image formats. It has only been tested internally with 24-bit and 32-bit .png files. It will internally attempt force a conversion to a 32-bit RGBA format. If this doesn't succeed, it will obviously be apparent as soon as the texture is rendered.

-
Todo:
Add documentation.
- -

Definition at line 42 of file Texture.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
CTexture::~CTexture ()
-
- -

Definition at line 17 of file Texture.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
bool CTexture::LoadFromFile (const string_t & filename)
- 		-virtual
-
-
Parameters
- - -
filenameFilename to load asset from
-
-
-
Returns
true if loaded successfully, false otherwise.
- -

Implements zen::asset::CAsset.

- -

Definition at line 22 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CTexture::LoadFromExisting (const CAsset *const pCopy)
-
- -

Definition at line 57 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CTexture::LoadFromExisting (const GLuint handle)
-
- -

Definition at line 82 of file Texture.cpp.

- -
-
- -
-
- - - - - - - - -
bool CTexture::CopyFromExisting (const GLuint handle)
-
- -

Definition at line 98 of file Texture.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool CTexture::LoadFromRaw (const GLenum iformat,
const GLenum format,
const uint16_t w,
const uint16_t h,
const unsigned char * data 
)
-
- -

Definition at line 115 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const void *const CTexture::GetData () const
- 		-virtual
-
- -

Implements zen::asset::CAsset.

- -

Definition at line 144 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CTexture::Bind () const
-
- -

Definition at line 156 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CTexture::Unbind () const
-
- -

Definition at line 163 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfxcore::CTexture::GetWidth () const
- 		-inline
-
- -

Definition at line 60 of file Texture.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfxcore::CTexture::GetHeight () const
- 		-inline
-
- -

Definition at line 61 of file Texture.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gfxcore::CTexture::GetID () const
- 		-inline
-
- -

Definition at line 64 of file Texture.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CTexture & CTexture::GetDefaultTexture ()
- 		-static
-
- -

Definition at line 170 of file Texture.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture.js b/docs/classzen_1_1gfxcore_1_1_c_texture.js deleted file mode 100644 index d5d50d4d..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture.js +++ /dev/null @@ -1,16 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_texture = -[ - [ "~CTexture", "classzen_1_1gfxcore_1_1_c_texture.html#af240c8e09cc7cd641e2463e4e1c76e00", null ], - [ "LoadFromFile", "classzen_1_1gfxcore_1_1_c_texture.html#adfa741332f9226592d2eba3df65c2091", null ], - [ "LoadFromExisting", "classzen_1_1gfxcore_1_1_c_texture.html#aceae841cbe44f079418484a903deb4f2", null ], - [ "LoadFromExisting", "classzen_1_1gfxcore_1_1_c_texture.html#a1d3445e75ce86aaf4e3ad6e72a7eafae", null ], - [ "CopyFromExisting", "classzen_1_1gfxcore_1_1_c_texture.html#af5472796b6c88c4b6d8fcbc25b7714c4", null ], - [ "LoadFromRaw", "classzen_1_1gfxcore_1_1_c_texture.html#ac0a0a90599382782214dcd6ac22acc13", null ], - [ "GetData", "classzen_1_1gfxcore_1_1_c_texture.html#ae307f81aa21e97e68cab549d0f4d6b7b", null ], - [ "Bind", "classzen_1_1gfxcore_1_1_c_texture.html#a741d58d64ae800ff4851c27295801962", null ], - [ "Unbind", "classzen_1_1gfxcore_1_1_c_texture.html#a3b9ae915c98b731b41d19a74c15a1f49", null ], - [ "GetWidth", "classzen_1_1gfxcore_1_1_c_texture.html#af3e8e6c3c1f6bd0298ec293b7ca56f26", null ], - [ "GetHeight", "classzen_1_1gfxcore_1_1_c_texture.html#a799aec47cc79aa2fe767c9e87c7cc0dc", null ], - [ "GetID", "classzen_1_1gfxcore_1_1_c_texture.html#ac2b096539e6bd2422be0547c2ad392e0", null ], - [ "GetDefaultTexture", "classzen_1_1gfxcore_1_1_c_texture.html#a191a74863739177e5fe0d57e66192ea8", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a191a74863739177e5fe0d57e66192ea8_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_a191a74863739177e5fe0d57e66192ea8_icgraph.map deleted file mode 100644 index b256e671..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_a191a74863739177e5fe0d57e66192ea8_icgraph.map +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a191a74863739177e5fe0d57e66192ea8_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_a191a74863739177e5fe0d57e66192ea8_icgraph.png deleted file mode 100644 index fc4146c9..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_a191a74863739177e5fe0d57e66192ea8_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a3b9ae915c98b731b41d19a74c15a1f49_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_a3b9ae915c98b731b41d19a74c15a1f49_icgraph.map deleted file mode 100644 index 3308bb48..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_a3b9ae915c98b731b41d19a74c15a1f49_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a3b9ae915c98b731b41d19a74c15a1f49_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_a3b9ae915c98b731b41d19a74c15a1f49_icgraph.png deleted file mode 100644 index 2fedaa08..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_a3b9ae915c98b731b41d19a74c15a1f49_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a741d58d64ae800ff4851c27295801962_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_a741d58d64ae800ff4851c27295801962_icgraph.map deleted file mode 100644 index e044da06..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_a741d58d64ae800ff4851c27295801962_icgraph.map +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a741d58d64ae800ff4851c27295801962_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_a741d58d64ae800ff4851c27295801962_icgraph.png deleted file mode 100644 index a7886324..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_a741d58d64ae800ff4851c27295801962_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a799aec47cc79aa2fe767c9e87c7cc0dc_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_a799aec47cc79aa2fe767c9e87c7cc0dc_icgraph.map deleted file mode 100644 index 0fd81da9..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_a799aec47cc79aa2fe767c9e87c7cc0dc_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_a799aec47cc79aa2fe767c9e87c7cc0dc_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_a799aec47cc79aa2fe767c9e87c7cc0dc_icgraph.png deleted file mode 100644 index 20d54023..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_a799aec47cc79aa2fe767c9e87c7cc0dc_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_ac0a0a90599382782214dcd6ac22acc13_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_ac0a0a90599382782214dcd6ac22acc13_icgraph.map deleted file mode 100644 index 41c2b9b7..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_ac0a0a90599382782214dcd6ac22acc13_icgraph.map +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_ac0a0a90599382782214dcd6ac22acc13_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_ac0a0a90599382782214dcd6ac22acc13_icgraph.png deleted file mode 100644 index 802c3676..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_ac0a0a90599382782214dcd6ac22acc13_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_aceae841cbe44f079418484a903deb4f2_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_aceae841cbe44f079418484a903deb4f2_icgraph.map deleted file mode 100644 index 1da41da0..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_aceae841cbe44f079418484a903deb4f2_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_aceae841cbe44f079418484a903deb4f2_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_aceae841cbe44f079418484a903deb4f2_icgraph.png deleted file mode 100644 index 25ad9b58..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_aceae841cbe44f079418484a903deb4f2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_adfa741332f9226592d2eba3df65c2091_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_adfa741332f9226592d2eba3df65c2091_icgraph.map deleted file mode 100644 index 62352fed..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_adfa741332f9226592d2eba3df65c2091_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_adfa741332f9226592d2eba3df65c2091_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_adfa741332f9226592d2eba3df65c2091_icgraph.png deleted file mode 100644 index 92f6c97d..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_adfa741332f9226592d2eba3df65c2091_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_ae307f81aa21e97e68cab549d0f4d6b7b_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_ae307f81aa21e97e68cab549d0f4d6b7b_icgraph.map deleted file mode 100644 index 5f37857a..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_ae307f81aa21e97e68cab549d0f4d6b7b_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_ae307f81aa21e97e68cab549d0f4d6b7b_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_ae307f81aa21e97e68cab549d0f4d6b7b_icgraph.png deleted file mode 100644 index e1171f6d..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_ae307f81aa21e97e68cab549d0f4d6b7b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_af3e8e6c3c1f6bd0298ec293b7ca56f26_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_texture_af3e8e6c3c1f6bd0298ec293b7ca56f26_icgraph.map deleted file mode 100644 index 85fcfb41..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_texture_af3e8e6c3c1f6bd0298ec293b7ca56f26_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_texture_af3e8e6c3c1f6bd0298ec293b7ca56f26_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_texture_af3e8e6c3c1f6bd0298ec293b7ca56f26_icgraph.png deleted file mode 100644 index 609efc8e..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_texture_af3e8e6c3c1f6bd0298ec293b7ca56f26_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array.html b/docs/classzen_1_1gfxcore_1_1_c_vertex_array.html deleted file mode 100644 index 17a2e3b5..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array.html +++ /dev/null @@ -1,699 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::CVertexArray Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gfxcore::CVertexArray Class Reference
CoreGraphics
-
-
- -

A wrapper for OpenGL Vertex Array Objects. - More...

- -

#include "VertexArray.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CVertexArray (const GLenum vao_type=GL_STATIC_DRAW)
 
 ~CVertexArray ()
 
bool Init ()
 
bool Destroy ()
 
bool Bind () const
 
bool Unbind () const
 
index_t AddData (const DrawBatch &D)
 Adds data to the vertex buffer for drawing. More...
 
bool Offload ()
 Offloads local vertex data to the GPU. More...
 
bool Clear ()
 Deletes all vertex and index data from the GPU and locally. More...
 
GLuint GetObjectHandle () const
 
GLuint GetVBOHandle () const
 
GLuint GetIBOHandle () const
 
size_t GetVertexCount () const
 
size_t GetIndexCount () const
 
const vertex_t *const GetVerticesFromGPU () const
 
const index_t *const GetIndicesFromGPU () const
 
bool Offloaded () const
 
bool Draw ()
 
- Public Member Functions inherited from zen::gfxcore::CGLSubsystem
 CGLSubsystem (const string_t name="OpenGL")
 
virtual ~CGLSubsystem ()
 
bool IsInit ()
 
virtual const string_t & GetName () const
 
- - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::gfxcore::CGLSubsystem
bool m_init
 
-

Detailed Description

-

This manages offloading raw, low-level draw data to the GPU for efficient access and local memory consumption. It's used internally by the scene wrapper to store scene geometry.

-
Todo:
More documentation.
- -

Definition at line 61 of file VertexArray.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CVertexArray::CVertexArray (const GLenum vao_type = GL_STATIC_DRAW)
-
- -

Definition at line 5 of file VertexArray.cpp.

- -
-
- -
-
- - - - - - - -
CVertexArray::~CVertexArray ()
-
- -

Definition at line 15 of file VertexArray.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CVertexArray::Init ()
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 20 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CVertexArray::Destroy ()
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 38 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CVertexArray::Bind () const
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 53 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CVertexArray::Unbind () const
- 		-virtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 62 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
index_t CVertexArray::AddData (const DrawBatch & D)
-
-

This will append data to the internal buffers for processing. Nothing is actually offloaded to the GPU; this must be done with an explicit call to Offload(). It may be desirable to calculate where in the GPU the indices were placed, possibly in order to properly call glDrawElements later, so this is given as the return value. When using this value for that purpose, be sure to multiplty by sizeof(index_t) to get the accurate offset in bytes.

-
Parameters
- - -
DVertex and index data to store internally
-
-
-
Returns
Internal index buffer offset value.
- -

Definition at line 69 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CVertexArray::Offload ()
-
-

If there is existing buffer data on the GPU, this will copy the buffer locally and append any data that was added recently (via AddData()) to the end of the buffer. Then it will be sent off to the GPU again.

-

This will return false only in a release build, in debug builds any failed OpenGL operations will close the program.

-
Returns
true if everything was offloaded without errors; false otherwise.
-
See Also
zen::gfxcore::vertex_t
-
-Zenderer/CoreGraphics/OpenGL.hpp
-
-http://stackoverflow.com/questions/8923174/opengl-vao-best-practices
- -

Definition at line 91 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CVertexArray::Clear ()
-
- -

Definition at line 203 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
GLuint zen::gfxcore::CVertexArray::GetObjectHandle () const
- 		-inlinevirtual
-
- -

Implements zen::gfxcore::CGLSubsystem.

- -

Definition at line 111 of file VertexArray.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
GLuint zen::gfxcore::CVertexArray::GetVBOHandle () const
- 		-inline
-
- -

Definition at line 112 of file VertexArray.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
GLuint zen::gfxcore::CVertexArray::GetIBOHandle () const
- 		-inline
-
- -

Definition at line 113 of file VertexArray.hpp.

- -
-
- -
-
- - - - - - - -
size_t CVertexArray::GetVertexCount () const
-
- -

Definition at line 226 of file VertexArray.cpp.

- -
-
- -
-
- - - - - - - -
size_t CVertexArray::GetIndexCount () const
-
- -

Definition at line 231 of file VertexArray.cpp.

- -
-
- -
-
- - - - - - - -
const vertex_t *const CVertexArray::GetVerticesFromGPU () const
-
- -

Definition at line 216 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
const index_t *const CVertexArray::GetIndicesFromGPU () const
-
- -

Definition at line 221 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CVertexArray::Offloaded () const
-
- -

Definition at line 236 of file VertexArray.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::gfxcore::CVertexArray::Draw ()
- 		-inline
-
- -

Definition at line 123 of file VertexArray.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array.js b/docs/classzen_1_1gfxcore_1_1_c_vertex_array.js deleted file mode 100644 index a19ed2af..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array.js +++ /dev/null @@ -1,21 +0,0 @@ -var classzen_1_1gfxcore_1_1_c_vertex_array = -[ - [ "CVertexArray", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a72ea0442f66a8bb89d9fc07128400705", null ], - [ "~CVertexArray", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ad5c18d198b866efceae68f3e2d4b9eca", null ], - [ "Init", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a995dae2f3c1ef56ba717a5fa21f88438", null ], - [ "Destroy", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ae7564af792aa5dddaeee371141ce4e61", null ], - [ "Bind", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ad5fa502f379f8c2e3c10057ca3db3a59", null ], - [ "Unbind", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a7363f6b19699a918e04de8a132aaa390", null ], - [ "AddData", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ac4f0cb32e883a5d9780a8d3037aeac40", null ], - [ "Offload", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a47daca5c022f423c5892f8902a7cf9ae", null ], - [ "Clear", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a8d1ed05e370ea881ac19da8883e6dbd4", null ], - [ "GetObjectHandle", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ac32c693ba3e9b2aae670aba24de63653", null ], - [ "GetVBOHandle", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a70df5e1fc03235d797202dbb56beb4ea", null ], - [ "GetIBOHandle", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ab631a297d3f4e16412c4ec5d33c2a714", null ], - [ "GetVertexCount", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a564bd6dab654b924300f087ede631a93", null ], - [ "GetIndexCount", "classzen_1_1gfxcore_1_1_c_vertex_array.html#aeacbca6780c1d3f540759ff6fb4115f0", null ], - [ "GetVerticesFromGPU", "classzen_1_1gfxcore_1_1_c_vertex_array.html#a2a32139330aa0f8bbbaa2bd60d15cca2", null ], - [ "GetIndicesFromGPU", "classzen_1_1gfxcore_1_1_c_vertex_array.html#adc8a90162e7b53e381a4249f2253da9a", null ], - [ "Offloaded", "classzen_1_1gfxcore_1_1_c_vertex_array.html#aac52e3c55abe635464334942e4f3b52d", null ], - [ "Draw", "classzen_1_1gfxcore_1_1_c_vertex_array.html#ad386ce51c382b3588c1316bbddda5135", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a2a32139330aa0f8bbbaa2bd60d15cca2_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a2a32139330aa0f8bbbaa2bd60d15cca2_icgraph.map deleted file mode 100644 index 2baa8f8c..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a2a32139330aa0f8bbbaa2bd60d15cca2_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a2a32139330aa0f8bbbaa2bd60d15cca2_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a2a32139330aa0f8bbbaa2bd60d15cca2_icgraph.png deleted file mode 100644 index c842cf6e..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a2a32139330aa0f8bbbaa2bd60d15cca2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a47daca5c022f423c5892f8902a7cf9ae_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a47daca5c022f423c5892f8902a7cf9ae_icgraph.map deleted file mode 100644 index 7b43ac8c..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a47daca5c022f423c5892f8902a7cf9ae_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a47daca5c022f423c5892f8902a7cf9ae_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a47daca5c022f423c5892f8902a7cf9ae_icgraph.png deleted file mode 100644 index c7fc61a7..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a47daca5c022f423c5892f8902a7cf9ae_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a7363f6b19699a918e04de8a132aaa390_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a7363f6b19699a918e04de8a132aaa390_icgraph.map deleted file mode 100644 index 9b316480..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a7363f6b19699a918e04de8a132aaa390_icgraph.map +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a7363f6b19699a918e04de8a132aaa390_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a7363f6b19699a918e04de8a132aaa390_icgraph.png deleted file mode 100644 index 9ce6c3cd..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a7363f6b19699a918e04de8a132aaa390_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a8d1ed05e370ea881ac19da8883e6dbd4_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a8d1ed05e370ea881ac19da8883e6dbd4_icgraph.map deleted file mode 100644 index 610d1e62..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a8d1ed05e370ea881ac19da8883e6dbd4_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a8d1ed05e370ea881ac19da8883e6dbd4_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a8d1ed05e370ea881ac19da8883e6dbd4_icgraph.png deleted file mode 100644 index 4dd39c4a..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a8d1ed05e370ea881ac19da8883e6dbd4_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a995dae2f3c1ef56ba717a5fa21f88438_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a995dae2f3c1ef56ba717a5fa21f88438_icgraph.map deleted file mode 100644 index b28dfae1..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a995dae2f3c1ef56ba717a5fa21f88438_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a995dae2f3c1ef56ba717a5fa21f88438_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a995dae2f3c1ef56ba717a5fa21f88438_icgraph.png deleted file mode 100644 index 3979d8b7..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_a995dae2f3c1ef56ba717a5fa21f88438_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_aac52e3c55abe635464334942e4f3b52d_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_aac52e3c55abe635464334942e4f3b52d_icgraph.map deleted file mode 100644 index da1feae3..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_aac52e3c55abe635464334942e4f3b52d_icgraph.map +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_aac52e3c55abe635464334942e4f3b52d_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_aac52e3c55abe635464334942e4f3b52d_icgraph.png deleted file mode 100644 index 3e7e4adb..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_aac52e3c55abe635464334942e4f3b52d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ac4f0cb32e883a5d9780a8d3037aeac40_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ac4f0cb32e883a5d9780a8d3037aeac40_icgraph.map deleted file mode 100644 index a576ba11..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ac4f0cb32e883a5d9780a8d3037aeac40_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ac4f0cb32e883a5d9780a8d3037aeac40_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ac4f0cb32e883a5d9780a8d3037aeac40_icgraph.png deleted file mode 100644 index 76457455..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ac4f0cb32e883a5d9780a8d3037aeac40_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad386ce51c382b3588c1316bbddda5135_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad386ce51c382b3588c1316bbddda5135_icgraph.map deleted file mode 100644 index 46e55ac2..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad386ce51c382b3588c1316bbddda5135_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad386ce51c382b3588c1316bbddda5135_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad386ce51c382b3588c1316bbddda5135_icgraph.png deleted file mode 100644 index 9fc24d52..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad386ce51c382b3588c1316bbddda5135_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad5fa502f379f8c2e3c10057ca3db3a59_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad5fa502f379f8c2e3c10057ca3db3a59_icgraph.map deleted file mode 100644 index 3c1fb7ed..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad5fa502f379f8c2e3c10057ca3db3a59_icgraph.map +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad5fa502f379f8c2e3c10057ca3db3a59_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad5fa502f379f8c2e3c10057ca3db3a59_icgraph.png deleted file mode 100644 index 48ecb0f4..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ad5fa502f379f8c2e3c10057ca3db3a59_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_adc8a90162e7b53e381a4249f2253da9a_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_adc8a90162e7b53e381a4249f2253da9a_icgraph.map deleted file mode 100644 index 271f04e5..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_adc8a90162e7b53e381a4249f2253da9a_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_adc8a90162e7b53e381a4249f2253da9a_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_adc8a90162e7b53e381a4249f2253da9a_icgraph.png deleted file mode 100644 index 8aa5adfd..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_adc8a90162e7b53e381a4249f2253da9a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ae7564af792aa5dddaeee371141ce4e61_icgraph.map b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ae7564af792aa5dddaeee371141ce4e61_icgraph.map deleted file mode 100644 index 4452c525..00000000 --- a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ae7564af792aa5dddaeee371141ce4e61_icgraph.map +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ae7564af792aa5dddaeee371141ce4e61_icgraph.png b/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ae7564af792aa5dddaeee371141ce4e61_icgraph.png deleted file mode 100644 index 5a1ef686..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1_c_vertex_array_ae7564af792aa5dddaeee371141ce4e61_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable.html b/docs/classzen_1_1gfxcore_1_1z_drawable.html deleted file mode 100644 index 37191814..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_drawable.html +++ /dev/null @@ -1,726 +0,0 @@ - - - - - - -Zenderer Engine: zen::gfxcore::zDrawable Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Protected Attributes
-
-
zen::gfxcore::zDrawable Class Referenceabstract
CoreGraphics
-
-
- -

An abstract base class for all drawable primitives. - More...

- -

#include "Drawable.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 zDrawable (asset::zAssetManager &)
 
 zDrawable (const zDrawable &Copy)
 Creates an instance from another instance. More...
 
 zDrawable (zDrawable &&Copy)
 
virtual ~zDrawable ()
 
virtual zDrawable & Create ()=0
 Creates initial vertex structure. More...
 
void Move (const math::vector_t &Position)
 Moves the drawable to a certain location. More...
 
void Move (const real_t x, const real_t y, const real_t z=1.0)
 This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
 
void AttachMaterial (gfx::zMaterial &Material)
 Attaches a material to render on top of the primitive. More...
 
void RemoveMaterial ()
 Reverts to using the default material. More...
 
virtual void SetColor (const color4f_t &Color)
 Sets all vertices to have a given color value. More...
 
bool Draw (const bool is_bound=false)
 Draws the primitive on-screen. More...
 
bool IsModifiable () const
 Request to see if we can change the internal vertices or not. More...
 
const math::vector_t & GetPosition () const
 
real_t GetX () const
 
real_t GetY () const
 
void LoadIntoVAO (gfxcore::zVertexArray &VAO, const bool preserve=true)
 Shortcut to prevent loading simple objects manually. More...
 
- - - - - - - - - -

-Protected Attributes

gfx::zMaterial m_Material
 
math::vector_t m_Position
 
DrawBatch m_DrawData
 
bool m_internal
 
-

Detailed Description

-

There are two ways to create renderable objects in Zenderer.

-

Firstly is through the zen::gfx::zScene class and its respective AddPrimitive() or AddEntity() methods. This will attach an internal zen::gfxcore::zVertexArray object that stores scene geometry. The scene itself takes care of the actual drawing, but the user can still call the Drawable::Draw() method if they want to do it again, post-render.

-

The other way is to simply create a drawable object instance and call Draw() on it. This will implicitly create a vertex array object internally the first time, and will just use it every subsequent call. Keep in mind that this object now can NOT be added to a scene. This functionality may be supported in future revisions.

- -

Definition at line 40 of file Drawable.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
zen::gfxcore::zDrawable::zDrawable (asset::zAssetManager & )
-
- -
-
- -
-
- - - - - - - - -
zDrawable::zDrawable (const zDrawable & Copy)
-
-

This only copies internal vertex/index data, as well as model-view matrix data (thus position). Material and internal GPU buffer references are NOT copied. These must be explicitly set later, be it with Draw() or through a friend class or through AttachMaterial.

-
Parameters
- - -
CopyPrimitive to copy draw data from
-
-
-
Warning
There can be no assignment of one primitive to another.
-
-Material info is not transferred.
-
See Also
gfxcore::DrawBatch
- -

Definition at line 19 of file Drawable.cpp.

- -
-
- -
-
- - - - - - - - -
zDrawable::zDrawable (zDrawable && Copy)
-
- -

Definition at line 45 of file Drawable.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zDrawable::~zDrawable ()
- 		-virtual
-
- -

Definition at line 65 of file Drawable.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
virtual zDrawable& zen::gfxcore::zDrawable::Create ()
- 		-pure virtual
-
-
Returns
Reference to itself for easy chaining.
- -

Implemented in zen::gfx::zPolygon, and zen::gfx::zQuad.

- -
-
- -
-
- - - - - - - - -
void zDrawable::Move (const math::vector_t & Position)
-
-

This doesn't rely on any vertex data, but rather uses the model-view matrix to translate the object, thus there is a default implementation.

-
Parameters
- - -
Position(x, y, z) coordinates where you want the object
-
-
- -

Definition at line 70 of file Drawable.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
void zen::gfxcore::zDrawable::Move (const real_t x,
const real_t y,
const real_t z = 1.0 
)
-
-
Todo:
Make it work properly when zQuad is inverted.
- -
-
- -
-
- - - - - - - - -
void zDrawable::AttachMaterial (gfx::zMaterial & Material)
-
-

This really shouldn't be allowed on simple primitives, but it's here if you need it. Keep in mind that this will override any color settings you've made. Likely this will only work well on quadrilateral primitives due to difficulties setting texture coordinates on other shapes.

-
Parameters
- - -
MaterialThe texture you want rendered
-
-
-
Precondition
Create() or Draw() haven't been called yet.
-
Note
I promise the given material won't be modified.
- -

Definition at line 80 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
void zDrawable::RemoveMaterial ()
-
- -

Definition at line 86 of file Drawable.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void zDrawable::SetColor (const color4f_t & Color)
- 		-virtual
-
- -

Reimplemented in zen::gfx::zPolygon.

- -

Definition at line 92 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool zDrawable::Draw (const bool is_bound = false)
-
-

This implements the technique described above. If there is no "owner" of the primitive (meaning no scene has set the internal data), it will automatically create a zVertexArray instance, a model-view matrix, and will use the default shader set. This data will be re-used time after time on subsequent Draw() calls, not recreated every time.

-
Parameters
- - -
is_boundHave we bound things? (VAO, material, etc.)
-
-
-
Returns
true if drawing was successful, false otherwise.
- -

Definition at line 100 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool zDrawable::IsModifiable () const
-
- -

Definition at line 172 of file Drawable.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const math::vector_t& zen::gfxcore::zDrawable::GetPosition () const
- 		-inline
-
- -

Definition at line 128 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::gfxcore::zDrawable::GetX () const
- 		-inline
-
- -

Definition at line 131 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::gfxcore::zDrawable::GetY () const
- 		-inline
-
- -

Definition at line 132 of file Drawable.hpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void zDrawable::LoadIntoVAO (gfxcore::zVertexArray & VAO,
const bool preserve = true 
)
-
-

This DOES NOT delete any internal vertex data unless explicitly specified. Thus, this can be called multiple times with various vertex settings to set up different primitives in the given vertex array.

-
Parameters
- - - -
VAOThe vertex array to store data into
preserveShould we keep our local vertex data?
-
-
- -

Definition at line 155 of file Drawable.cpp.

- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
gfx::zMaterial zen::gfxcore::zDrawable::m_Material
- 		-protected
-
- -

Definition at line 157 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - -
math::vector_t zen::gfxcore::zDrawable::m_Position
- 		-protected
-
- -

Definition at line 158 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - -
DrawBatch zen::gfxcore::zDrawable::m_DrawData
- 		-protected
-
- -

Definition at line 159 of file Drawable.hpp.

- -
-
- -
-
- - - - - -
- - - - -
bool zen::gfxcore::zDrawable::m_internal
- 		-protected
-
- -

Definition at line 160 of file Drawable.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable.js b/docs/classzen_1_1gfxcore_1_1z_drawable.js deleted file mode 100644 index ff9cfe8b..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_drawable.js +++ /dev/null @@ -1,23 +0,0 @@ -var classzen_1_1gfxcore_1_1z_drawable = -[ - [ "zDrawable", "classzen_1_1gfxcore_1_1z_drawable.html#a821da5e795f47a477faec60383136999", null ], - [ "zDrawable", "classzen_1_1gfxcore_1_1z_drawable.html#a41960f6e8b86064d748284b35e710cc0", null ], - [ "zDrawable", "classzen_1_1gfxcore_1_1z_drawable.html#ab9d93709b2a4805e4e4c300d680b5698", null ], - [ "~zDrawable", "classzen_1_1gfxcore_1_1z_drawable.html#ad82de764cef5372d84c429d0d81d7d60", null ], - [ "Create", "classzen_1_1gfxcore_1_1z_drawable.html#a46e42caeffe2a89e1b85f682aaa2618f", null ], - [ "Move", "classzen_1_1gfxcore_1_1z_drawable.html#acd6561638456140378e498fed541ac06", null ], - [ "Move", "classzen_1_1gfxcore_1_1z_drawable.html#a34096f29b7c6869ea17ba563486e163e", null ], - [ "AttachMaterial", "classzen_1_1gfxcore_1_1z_drawable.html#a5af80cce1b8b0efd053fce6a30584824", null ], - [ "RemoveMaterial", "classzen_1_1gfxcore_1_1z_drawable.html#a8bd37f91fbde1aa9a27bb5f3daabfa93", null ], - [ "SetColor", "classzen_1_1gfxcore_1_1z_drawable.html#a2c29cd4cd894a4617cad515ee6eaa1ba", null ], - [ "Draw", "classzen_1_1gfxcore_1_1z_drawable.html#af86c4a6f7fcc2d95b937623e56400828", null ], - [ "IsModifiable", "classzen_1_1gfxcore_1_1z_drawable.html#a1c49a956725f8eb413d3dad97fe72947", null ], - [ "GetPosition", "classzen_1_1gfxcore_1_1z_drawable.html#a6cc85332c0cf1966cbce470cdb7182f8", null ], - [ "GetX", "classzen_1_1gfxcore_1_1z_drawable.html#a534cd71903cee0481ef25a3b0955a340", null ], - [ "GetY", "classzen_1_1gfxcore_1_1z_drawable.html#ad480ee18ea6d2a340cc20570dbf47a3f", null ], - [ "LoadIntoVAO", "classzen_1_1gfxcore_1_1z_drawable.html#a41d0c179a69414be9d180abf91763eed", null ], - [ "m_Material", "classzen_1_1gfxcore_1_1z_drawable.html#ac8fa89f7a3b499190bb5c1b418b1b472", null ], - [ "m_Position", "classzen_1_1gfxcore_1_1z_drawable.html#a6492eccf5d6e6e73c0ed660aab10b501", null ], - [ "m_DrawData", "classzen_1_1gfxcore_1_1z_drawable.html#a2e73b23b9fb405e67ade68ed96590064", null ], - [ "m_internal", "classzen_1_1gfxcore_1_1z_drawable.html#a4fd6f8dcec4c5a2ff2fcc3b249750791", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_a1c49a956725f8eb413d3dad97fe72947_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_drawable_a1c49a956725f8eb413d3dad97fe72947_icgraph.map deleted file mode 100644 index fa801c32..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_drawable_a1c49a956725f8eb413d3dad97fe72947_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_a1c49a956725f8eb413d3dad97fe72947_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_drawable_a1c49a956725f8eb413d3dad97fe72947_icgraph.png deleted file mode 100644 index 5b968fb1..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1z_drawable_a1c49a956725f8eb413d3dad97fe72947_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_a2c29cd4cd894a4617cad515ee6eaa1ba_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_drawable_a2c29cd4cd894a4617cad515ee6eaa1ba_icgraph.map deleted file mode 100644 index a4a28345..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_drawable_a2c29cd4cd894a4617cad515ee6eaa1ba_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_a2c29cd4cd894a4617cad515ee6eaa1ba_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_drawable_a2c29cd4cd894a4617cad515ee6eaa1ba_icgraph.png deleted file mode 100644 index 075ec146..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1z_drawable_a2c29cd4cd894a4617cad515ee6eaa1ba_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_a5af80cce1b8b0efd053fce6a30584824_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_drawable_a5af80cce1b8b0efd053fce6a30584824_icgraph.map deleted file mode 100644 index 4768caff..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_drawable_a5af80cce1b8b0efd053fce6a30584824_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_a5af80cce1b8b0efd053fce6a30584824_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_drawable_a5af80cce1b8b0efd053fce6a30584824_icgraph.png deleted file mode 100644 index 612e87f3..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1z_drawable_a5af80cce1b8b0efd053fce6a30584824_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_af86c4a6f7fcc2d95b937623e56400828_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_drawable_af86c4a6f7fcc2d95b937623e56400828_icgraph.map deleted file mode 100644 index 980f7b1e..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_drawable_af86c4a6f7fcc2d95b937623e56400828_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_drawable_af86c4a6f7fcc2d95b937623e56400828_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_drawable_af86c4a6f7fcc2d95b937623e56400828_icgraph.png deleted file mode 100644 index 65396f84..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1z_drawable_af86c4a6f7fcc2d95b937623e56400828_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_g_l_subsystem.html b/docs/classzen_1_1gfxcore_1_1z_g_l_subsystem.html index dfd29fef..021e048a 100644 --- a/docs/classzen_1_1gfxcore_1_1z_g_l_subsystem.html +++ b/docs/classzen_1_1gfxcore_1_1z_g_l_subsystem.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -155,7 +155,7 @@

Detailed Description

Similar to zen::zSubsystem, this acts as a managed wrapper around various OpenGL object instances. Anything registered with this as a base class will automatically be Destroy()-ed when the engine is quit.

-

Definition at line 104 of file OpenGL.hpp.

+

Definition at line 109 of file OpenGL.hpp.

Constructor & Destructor Documentation

@@ -347,7 +347,7 @@

Member Function Documentation

-

Definition at line 118 of file OpenGL.hpp.

+

Definition at line 123 of file OpenGL.hpp.

@@ -372,7 +372,7 @@

Member Function Documentation

-

Definition at line 120 of file OpenGL.hpp.

+

Definition at line 125 of file OpenGL.hpp.

@@ -419,7 +419,7 @@

Field Documentation

-

Definition at line 127 of file OpenGL.hpp.

+

Definition at line 132 of file OpenGL.hpp.

diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer.html b/docs/classzen_1_1gfxcore_1_1z_renderer.html index b832d3ee..f2108c45 100644 --- a/docs/classzen_1_1gfxcore_1_1z_renderer.html +++ b/docs/classzen_1_1gfxcore_1_1z_renderer.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -246,7 +246,7 @@
- +

@@ -428,7 +428,7 @@
- +

diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.map index bda3b5a6..b5c39f85 100644 --- a/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.map @@ -1,7 +1,8 @@ - - - - + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.png index 9de212ed..7fefb13b 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_renderer_a1e101eb52b27cb1f4d37a30f1bce6c14_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_a9d01f746eaac52b27b6a66255ba48c5a_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_renderer_a9d01f746eaac52b27b6a66255ba48c5a_icgraph.map deleted file mode 100644 index b330ec0a..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_renderer_a9d01f746eaac52b27b6a66255ba48c5a_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_a9d01f746eaac52b27b6a66255ba48c5a_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_renderer_a9d01f746eaac52b27b6a66255ba48c5a_icgraph.png deleted file mode 100644 index 32c1e1e4..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1z_renderer_a9d01f746eaac52b27b6a66255ba48c5a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.map index e64347c9..8dd2d94a 100644 --- a/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.png index dca8e5bf..328eb856 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_renderer_abaa0f662c8194a506b48c5c5197eb764_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_aded5bbe605b3fe49ae5ee7ff6df12ec7_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_renderer_aded5bbe605b3fe49ae5ee7ff6df12ec7_icgraph.map deleted file mode 100644 index 6b0e594f..00000000 --- a/docs/classzen_1_1gfxcore_1_1z_renderer_aded5bbe605b3fe49ae5ee7ff6df12ec7_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gfxcore_1_1z_renderer_aded5bbe605b3fe49ae5ee7ff6df12ec7_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_renderer_aded5bbe605b3fe49ae5ee7ff6df12ec7_icgraph.png deleted file mode 100644 index bdbc573e..00000000 Binary files a/docs/classzen_1_1gfxcore_1_1z_renderer_aded5bbe605b3fe49ae5ee7ff6df12ec7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader.html b/docs/classzen_1_1gfxcore_1_1z_shader.html index b4f555cd..0ecfe6e7 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader.html +++ b/docs/classzen_1_1gfxcore_1_1z_shader.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -411,7 +411,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.map index db198ded..b9d67282 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.map @@ -1,27 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.png index 0503a4d9..8a842958 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_a44ed16374b36daeace4e9e2baab1c726_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set.html b/docs/classzen_1_1gfxcore_1_1z_shader_set.html index d347c1ce..7cc3ad50 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set.html +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -269,7 +269,7 @@

Member Function Documentation

-

Definition at line 36 of file ShaderSet.cpp.

+

Definition at line 33 of file ShaderSet.cpp.

@@ -310,7 +310,7 @@

Member Function Documentation

GetLinkerLog()
-

Definition at line 47 of file ShaderSet.cpp.

+

Definition at line 44 of file ShaderSet.cpp.

@@ -340,14 +340,14 @@

Member Function Documentation

CreateShaderObject()
-

Definition at line 70 of file ShaderSet.cpp.

+

Definition at line 67 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -380,14 +380,14 @@

Member Function Documentation

CreateShaderObject()

Loads a fragment (pixel) shader from a file.

-

Definition at line 84 of file ShaderSet.cpp.

+

Definition at line 81 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -446,7 +446,7 @@

Member Function Documentation

-

Definition at line 98 of file ShaderSet.cpp.

+

Definition at line 95 of file ShaderSet.cpp.

@@ -464,7 +464,7 @@

Member Function Documentation

-

Definition at line 107 of file ShaderSet.cpp.

+

Definition at line 104 of file ShaderSet.cpp.

@@ -488,14 +488,14 @@

Member Function Documentation

GetLinkerLog()
-

Definition at line 116 of file ShaderSet.cpp.

+

Definition at line 113 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -524,14 +524,14 @@

Member Function Documentation

Implements zen::gfxcore::zGLSubsystem.

-

Definition at line 216 of file ShaderSet.cpp.

+

Definition at line 213 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -560,14 +560,14 @@

Member Function Documentation

Implements zen::gfxcore::zGLSubsystem.

-

Definition at line 228 of file ShaderSet.cpp.

+

Definition at line 225 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -596,14 +596,14 @@

Member Function Documentation

Implements zen::gfxcore::zGLSubsystem.

-

Definition at line 286 of file ShaderSet.cpp.

+

Definition at line 283 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -622,14 +622,14 @@

Member Function Documentation

-

Definition at line 240 of file ShaderSet.cpp.

+

Definition at line 237 of file ShaderSet.cpp.

Here is the caller graph for this function:
- +

@@ -658,7 +658,7 @@

Member Function Documentation

Implements zen::gfxcore::zGLSubsystem.

-

Definition at line 245 of file ShaderSet.cpp.

+

Definition at line 242 of file ShaderSet.cpp.

@@ -676,7 +676,7 @@

Member Function Documentation

-

Definition at line 250 of file ShaderSet.cpp.

+

Definition at line 247 of file ShaderSet.cpp.

Here is the caller graph for this function:
@@ -703,7 +703,7 @@

Member Function Documentation

-

Definition at line 263 of file ShaderSet.cpp.

+

Definition at line 260 of file ShaderSet.cpp.

@@ -720,7 +720,7 @@

Member Function Documentation

-

Definition at line 276 of file ShaderSet.cpp.

+

Definition at line 273 of file ShaderSet.cpp.

Here is the caller graph for this function:
@@ -746,7 +746,7 @@

Member Function Documentation

-

Definition at line 281 of file ShaderSet.cpp.

+

Definition at line 278 of file ShaderSet.cpp.

Here is the caller graph for this function:
diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.map index 053b8eb5..0bba5680 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.map @@ -1,25 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.png index da73400d..6fc054e0 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_a13b0e61cd657bb61da2b606452e74a19_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.map index c57a58be..70f46242 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.map @@ -1,32 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.png index f5484b0c..a8eaef71 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_a16fff3cf9f0b95c199a7c77366cc71c5_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.map index 601c1909..8d1064c8 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.map @@ -1,21 +1,22 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.png index decf5b67..c31146cd 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_a39366b27ad5cd50ae38c7f12a952707a_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.map index 000e04e7..7532c32b 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.map @@ -1,25 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.png index 83eb7ebd..c8e5afe2 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3a6244f4374e53a36772e24de1c21efc_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.map index 438a320e..7d729b38 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.map @@ -1,26 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.png index 074465a9..468e0f7b 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_a3dfcee25bfda15b88549e798a9ac9009_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.map index ccbecc44..9b2a6906 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.map @@ -1,7 +1,9 @@ - - + + - + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.png index afdf5796..77f2e91b 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_aa3fd70014f9bbfd301e09200c51767cd_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.map index 0e532b0d..d7a1363d 100644 --- a/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.map @@ -1,7 +1,9 @@ - - + + - + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.png index d414e523..aa8a870d 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_shader_set_aaa29ca6b2f56b8fd9be3cbbcb6ce99c3_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_sorter.html b/docs/classzen_1_1gfxcore_1_1z_sorter.html index 460155b5..90bc5b84 100644 --- a/docs/classzen_1_1gfxcore_1_1z_sorter.html +++ b/docs/classzen_1_1gfxcore_1_1z_sorter.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1gfxcore_1_1z_texture.html b/docs/classzen_1_1gfxcore_1_1z_texture.html index aa0d80fc..667cb109 100644 --- a/docs/classzen_1_1gfxcore_1_1z_texture.html +++ b/docs/classzen_1_1gfxcore_1_1z_texture.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -214,7 +214,7 @@

Zenderer uses stb_image.c, a single-file light-weight C library, to load a variety of image formats. It has only been tested internally with 24-bit and 32-bit .png files. It will internally attempt force a conversion to a 32-bit RGBA format. If this doesn't succeed, it will obviously be apparent as soon as the texture is rendered.

Todo:
Add documentation.
-

Definition at line 42 of file Texture.hpp.

+

Definition at line 43 of file Texture.hpp.

Constructor & Destructor Documentation

@@ -292,7 +292,7 @@

Member Function Documentation

-

Definition at line 57 of file Texture.cpp.

+

Definition at line 58 of file Texture.cpp.

Here is the caller graph for this function:
@@ -319,7 +319,7 @@

Member Function Documentation

-

Definition at line 82 of file Texture.cpp.

+

Definition at line 83 of file Texture.cpp.

@@ -337,7 +337,7 @@

Member Function Documentation

-

Definition at line 98 of file Texture.cpp.

+

Definition at line 99 of file Texture.cpp.

@@ -383,14 +383,14 @@

Member Function Documentation

-

Definition at line 115 of file Texture.cpp.

+

Definition at line 116 of file Texture.cpp.

Here is the caller graph for this function:
- +

@@ -419,7 +419,7 @@

Member Function Documentation

Implements zen::asset::zAsset.

-

Definition at line 144 of file Texture.cpp.

+

Definition at line 145 of file Texture.cpp.

@@ -436,14 +436,14 @@

Member Function Documentation

-

Definition at line 156 of file Texture.cpp.

+

Definition at line 157 of file Texture.cpp.

Here is the caller graph for this function:
- +

@@ -462,7 +462,7 @@

Member Function Documentation

-

Definition at line 163 of file Texture.cpp.

+

Definition at line 164 of file Texture.cpp.

Here is the caller graph for this function:
@@ -496,14 +496,14 @@

Member Function Documentation

-

Definition at line 60 of file Texture.hpp.

+

Definition at line 61 of file Texture.hpp.

Here is the caller graph for this function:
- +

@@ -530,14 +530,14 @@

Member Function Documentation

-

Definition at line 61 of file Texture.hpp.

+

Definition at line 62 of file Texture.hpp.

Here is the caller graph for this function:
- +

@@ -564,7 +564,7 @@

Member Function Documentation

-

Definition at line 64 of file Texture.hpp.

+

Definition at line 65 of file Texture.hpp.

@@ -589,14 +589,14 @@

Member Function Documentation

-

Definition at line 170 of file Texture.cpp.

+

Definition at line 171 of file Texture.cpp.

Here is the caller graph for this function:
- +

diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.map index 4756a255..447b1eec 100644 --- a/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.map @@ -1,7 +1,9 @@ - - - - - + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.png index 578afbd3..4a514551 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_texture_a23cb398f680bd7dd2f4a7451207469e5_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.map index 94d412e5..5f6e9d70 100644 --- a/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.map @@ -1,25 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.png index 5f5c59e1..181a5f1c 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_texture_a34ce25f6efa6199e516aa7114f0f7c6c_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.map index 1bb76e09..1b05f87a 100644 --- a/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.map @@ -1,18 +1,19 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.png index 014772c5..6e2f18e9 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_texture_a8d471c8e32a3184e2f0b64744d1d9f4b_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.map index 233c8615..99c6537f 100644 --- a/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.map @@ -1,6 +1,8 @@ - - - - + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.png index 4f0efb27..d87757db 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_texture_a91e86e33c712961c54016b06505bf9c5_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.map index a8e4e7df..43324263 100644 --- a/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.map @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.png index 5841c191..2a6f18dc 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_texture_af7f837f6d633927a47e983f348663353_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array.html b/docs/classzen_1_1gfxcore_1_1z_vertex_array.html index 832031d5..78efc77e 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array.html +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -248,7 +248,7 @@

Member Function Documentation

- +

@@ -284,7 +284,7 @@

Member Function Documentation

- +

@@ -320,7 +320,7 @@

Member Function Documentation

- +

@@ -356,7 +356,7 @@

Member Function Documentation

- +

@@ -391,7 +391,7 @@

Member Function Documentation

- +

@@ -425,7 +425,7 @@

Member Function Documentation

- +

@@ -444,14 +444,14 @@

Member Function Documentation

-

Definition at line 203 of file VertexArray.cpp.

+

Definition at line 188 of file VertexArray.cpp.

Here is the caller graph for this function:
- +

@@ -547,7 +547,7 @@

Member Function Documentation

-

Definition at line 226 of file VertexArray.cpp.

+

Definition at line 211 of file VertexArray.cpp.

@@ -564,7 +564,7 @@

Member Function Documentation

-

Definition at line 231 of file VertexArray.cpp.

+

Definition at line 216 of file VertexArray.cpp.

@@ -581,14 +581,14 @@

Member Function Documentation

-

Definition at line 216 of file VertexArray.cpp.

+

Definition at line 201 of file VertexArray.cpp.

Here is the caller graph for this function:
- +

@@ -607,14 +607,14 @@

Member Function Documentation

-

Definition at line 221 of file VertexArray.cpp.

+

Definition at line 206 of file VertexArray.cpp.

Here is the caller graph for this function:
- +

@@ -633,14 +633,14 @@

Member Function Documentation

-

Definition at line 236 of file VertexArray.cpp.

+

Definition at line 221 of file VertexArray.cpp.

Here is the caller graph for this function:
- +

@@ -674,7 +674,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.map index 4c87be1a..526949c5 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.map @@ -2,7 +2,7 @@ - + - + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.png index d215f8fb..5c1881e2 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a034bba15bf34566d6f45358ca78d91c5_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.map index 8b97318b..129c18e7 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.map @@ -2,7 +2,7 @@ - + - + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.png index bdb24e8b..ba755f01 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a0a8b169d0b4d812b3cdee332a135de59_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.map index 0398998c..35679dea 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.map @@ -3,7 +3,7 @@ - + - + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.png index 7ca100bc..5946d24b 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a3d368e58af1958da194c5c85e7086285_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.map index 5fa544d6..e197901e 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.map @@ -3,7 +3,7 @@ - + - + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.png index 1605dc89..a972ba27 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a64ea4e035b4e5c77a6d8f495cace39af_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.map index b77a3cec..c425540f 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.png index 71dbe1db..343a584a 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_a8b153d9cc48a11886f9b75a7ed9438ec_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.map index 53dde55c..9bd3df5e 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.map @@ -6,5 +6,5 @@ - + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.png index 65d991ad..659ffce1 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ab7fa4653cb7e9483e4d5bf1ad97b402e_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.map index a81f28af..4cba0b20 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.map @@ -1,6 +1,5 @@ - - - - + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.png index 52ab45c4..153a429b 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_abed0d7bac0ba13bfc9f6357a937cfcfd_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.map index 4aa451fe..e8c8fc60 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.map @@ -1,14 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.png index 7a5edae3..70222619 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_ad4a61a0430954edf60dc076f06c36397_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.map index a271131a..eff47a29 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.map @@ -1,13 +1,13 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.png index 27c18862..b90c89dc 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_adff6089ab94ca152c6977c52bfd13613_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.map index f63e6abc..79cff1b5 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.map @@ -1,11 +1,9 @@ - - - - - - - - - + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.png index f0ac6a16..4358e400 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_af2a2172d019cdbf8318e4c95fa545065_icgraph.png differ diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.map b/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.map index 0a5080f4..fbb98fed 100644 --- a/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.map +++ b/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.map @@ -1,14 +1,14 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.png b/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.png index 161d37b6..ef2de633 100644 Binary files a/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.png and b/docs/classzen_1_1gfxcore_1_1z_vertex_array_aff85064c9f36ceca4eb485e84963deef_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1_c_button.html b/docs/classzen_1_1gui_1_1_c_button.html deleted file mode 100644 index 3dcd5054..00000000 --- a/docs/classzen_1_1gui_1_1_c_button.html +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - -Zenderer Engine: zen::gui::CButton Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gui::CButton Class Reference
GUI
-
-
- -

#include "Button.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CButton (gfx::CScene &MenuScene)
 
 ~CButton ()
 
void Place (const math::vector_t &Pos)
 
void Place (const real_t x, const real_t y)
 
bool Prepare (const string_t &text)
 
bool IsOver (const math::vector_t &Pos)
 
bool IsOver (const math::aabb_t &Box)
 
void SetActive ()
 
void SetDefault ()
 
void SetFont (CFont &Font)
 
void SetActiveColor (const color4f_t &active)
 
void SetNormalColor (const color4f_t &normal)
 
void SetBackground (const obj::CEntity &Bg)
 
-

Detailed Description

-

A wrapper for a menu button that allows for text to be easily rendered on top of a background, and to easily add effects when some sort of event occurs, like mouse-over. This is used internally by zen::gui::CMenu to easily create dynamic and clean menus, and likely shouldn't really be touched on its own.

- -

Definition at line 33 of file Button.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CButton::CButton (gfx::CScene & MenuScene)
-
- -

Definition at line 6 of file Button.cpp.

- -
-
- -
-
- - - - - - - -
CButton::~CButton ()
-
- -

Definition at line 13 of file Button.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
void CButton::Place (const math::vector_t & Pos)
-
- -

Definition at line 19 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void CButton::Place (const real_t x,
const real_t y 
)
-
- -

Definition at line 25 of file Button.cpp.

- -
-
- -
-
- - - - - - - - -
bool CButton::Prepare (const string_t & text)
-
- -

Definition at line 31 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CButton::IsOver (const math::vector_t & Pos)
-
- -

Definition at line 42 of file Button.cpp.

- -
-
- -
-
- - - - - - - - -
bool CButton::IsOver (const math::aabb_t & Box)
-
- -

Definition at line 49 of file Button.cpp.

- -
-
- -
-
- - - - - - - -
void CButton::SetActive ()
-
- -

Definition at line 55 of file Button.cpp.

- -
-
- -
-
- - - - - - - -
void CButton::SetDefault ()
-
- -

Definition at line 64 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CButton::SetFont (gui::CFont & Font)
-
- -

Definition at line 73 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CButton::SetActiveColor (const color4f_t & active)
-
- -

Definition at line 79 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CButton::SetNormalColor (const color4f_t & normal)
-
- -

Definition at line 84 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CButton::SetBackground (const obj::CEntity & Bg)
-
- -

Definition at line 89 of file Button.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gui_1_1_c_button.js b/docs/classzen_1_1gui_1_1_c_button.js deleted file mode 100644 index 66e30f1d..00000000 --- a/docs/classzen_1_1gui_1_1_c_button.js +++ /dev/null @@ -1,16 +0,0 @@ -var classzen_1_1gui_1_1_c_button = -[ - [ "CButton", "classzen_1_1gui_1_1_c_button.html#a15e7db6f87f46a14e3cfa0aa22035c68", null ], - [ "~CButton", "classzen_1_1gui_1_1_c_button.html#a3d99e84962ec5626f6d4863acf4f5dbb", null ], - [ "Place", "classzen_1_1gui_1_1_c_button.html#a83ba68c51656d8197f84a6ea5bd7c461", null ], - [ "Place", "classzen_1_1gui_1_1_c_button.html#af67257b5033b37de2b1f7aca7e4d1e6f", null ], - [ "Prepare", "classzen_1_1gui_1_1_c_button.html#a4a314bae5681152c2e9d7e62c027c906", null ], - [ "IsOver", "classzen_1_1gui_1_1_c_button.html#a50801c1e8b7daf027903b19718a07ac1", null ], - [ "IsOver", "classzen_1_1gui_1_1_c_button.html#a2ee73b8473eb4476ea4204d1b06e0ac3", null ], - [ "SetActive", "classzen_1_1gui_1_1_c_button.html#a04ad5448b6513d860f75a1986c981490", null ], - [ "SetDefault", "classzen_1_1gui_1_1_c_button.html#a63558b308cbae31f8e4f4e8d132021e4", null ], - [ "SetFont", "classzen_1_1gui_1_1_c_button.html#a9cb7b22a6ee45b202b8c40106b4cdd2f", null ], - [ "SetActiveColor", "classzen_1_1gui_1_1_c_button.html#aed4a01efb9936a0cf6faa90f63061124", null ], - [ "SetNormalColor", "classzen_1_1gui_1_1_c_button.html#a7c8d82637c2bee209de150f521933e63", null ], - [ "SetBackground", "classzen_1_1gui_1_1_c_button.html#aa4165c2363eef8f791ca901d62bc9fd9", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gui_1_1_c_button_a4a314bae5681152c2e9d7e62c027c906_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_a4a314bae5681152c2e9d7e62c027c906_icgraph.map deleted file mode 100644 index d2c71d7f..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_a4a314bae5681152c2e9d7e62c027c906_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_a4a314bae5681152c2e9d7e62c027c906_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_a4a314bae5681152c2e9d7e62c027c906_icgraph.png deleted file mode 100644 index 20474b61..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_a4a314bae5681152c2e9d7e62c027c906_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_button_a63558b308cbae31f8e4f4e8d132021e4_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_a63558b308cbae31f8e4f4e8d132021e4_icgraph.map deleted file mode 100644 index 5c348ad7..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_a63558b308cbae31f8e4f4e8d132021e4_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_a63558b308cbae31f8e4f4e8d132021e4_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_a63558b308cbae31f8e4f4e8d132021e4_icgraph.png deleted file mode 100644 index d6d20209..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_a63558b308cbae31f8e4f4e8d132021e4_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_button_a7c8d82637c2bee209de150f521933e63_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_a7c8d82637c2bee209de150f521933e63_icgraph.map deleted file mode 100644 index 03be8062..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_a7c8d82637c2bee209de150f521933e63_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_a7c8d82637c2bee209de150f521933e63_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_a7c8d82637c2bee209de150f521933e63_icgraph.png deleted file mode 100644 index 62dc9250..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_a7c8d82637c2bee209de150f521933e63_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_button_a83ba68c51656d8197f84a6ea5bd7c461_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_a83ba68c51656d8197f84a6ea5bd7c461_icgraph.map deleted file mode 100644 index aa2f8221..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_a83ba68c51656d8197f84a6ea5bd7c461_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_a83ba68c51656d8197f84a6ea5bd7c461_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_a83ba68c51656d8197f84a6ea5bd7c461_icgraph.png deleted file mode 100644 index 9b54ae6e..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_a83ba68c51656d8197f84a6ea5bd7c461_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_button_a9cb7b22a6ee45b202b8c40106b4cdd2f_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_a9cb7b22a6ee45b202b8c40106b4cdd2f_icgraph.map deleted file mode 100644 index 7237db68..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_a9cb7b22a6ee45b202b8c40106b4cdd2f_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_a9cb7b22a6ee45b202b8c40106b4cdd2f_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_a9cb7b22a6ee45b202b8c40106b4cdd2f_icgraph.png deleted file mode 100644 index ca4a6f6f..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_a9cb7b22a6ee45b202b8c40106b4cdd2f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_button_aa4165c2363eef8f791ca901d62bc9fd9_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_aa4165c2363eef8f791ca901d62bc9fd9_icgraph.map deleted file mode 100644 index 2a07440b..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_aa4165c2363eef8f791ca901d62bc9fd9_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_aa4165c2363eef8f791ca901d62bc9fd9_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_aa4165c2363eef8f791ca901d62bc9fd9_icgraph.png deleted file mode 100644 index 1a43e4fc..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_aa4165c2363eef8f791ca901d62bc9fd9_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_button_aed4a01efb9936a0cf6faa90f63061124_icgraph.map b/docs/classzen_1_1gui_1_1_c_button_aed4a01efb9936a0cf6faa90f63061124_icgraph.map deleted file mode 100644 index 2eed3c8b..00000000 --- a/docs/classzen_1_1gui_1_1_c_button_aed4a01efb9936a0cf6faa90f63061124_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_button_aed4a01efb9936a0cf6faa90f63061124_icgraph.png b/docs/classzen_1_1gui_1_1_c_button_aed4a01efb9936a0cf6faa90f63061124_icgraph.png deleted file mode 100644 index 6d5d6ee7..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_button_aed4a01efb9936a0cf6faa90f63061124_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font.html b/docs/classzen_1_1gui_1_1_c_font.html deleted file mode 100644 index 7f863b17..00000000 --- a/docs/classzen_1_1gui_1_1_c_font.html +++ /dev/null @@ -1,703 +0,0 @@ - - - - - - -Zenderer Engine: zen::gui::CFont Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gui::CFont Class Reference
-
-
- -

A TrueType font wrapper class. -

- -

#include "Font.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 ~CFont ()
 
template<typename T >
CFont & operator<< (const T &data)
 Streams data for rendering as a string later. More...
 
bool LoadFromFile (const string_t &filename)
 Loads a TrueType font from disk. More...
 
bool LoadFromExisting (const asset::CAsset *const pCopy)
 Loads a font from an existing instance. More...
 
const void *const GetData () const
 Returns raw font glyph bitmap data. More...
 
bool Render (obj::CEntity &Ent, const string_t &text="") const
 Stores render data in the provided for easy rendering. More...
 
bool Render (gfxcore::CTexture &Texture, const string_t &text="") const
 
void ClearString ()
 Clears the internal string stream. More...
 
bool AttachManager (asset::CAssetManager &Assets)
 Attaches an asset manager to the font for loading textures. More...
 
void SetColor (const color4f_t &Color)
 Sets the font color. More...
 
void SetSize (const uint16_t size)
 Sets the font size. More...
 
void SetStacking (const bool flag)
 Enables / Disables rendering on top of existing entity data. More...
 
uint16_t GetTextWidth (const string_t &text) const
 
uint16_t GetTextHeight (const string_t &text) const
 
uint16_t GetLineHeight () const
 
- Public Member Functions inherited from zen::asset::CAsset
virtual ~CAsset ()
 Logs some information. More...
 
virtual bool Reload ()
 Reloads oneself from whatever method it was loaded from originally. More...
 
uint32_t GetFilenameHash () const
 Returns the hashed filename for quicker comparison. More...
 
virtual assetid_t GetAssetID () const final
 Returns the unique asset ID. More...
 
const string_t & GetFilename () const
 Returns the filename used to load the asset. More...
 
const void *const GetOwner () const
 Returns address of asset owner. More...
 
const string_t & GetError () const
 Returns the last error string. More...
 
bool IsLoaded () const
 Has LoadFromFile() been called successfully? More...
 
void SetOwner (const void *const owner)
 Sets the asset owner. More...
 
void SetFilename (const string_t &filename)
 Overrides the asset filename. More...
 
- - - - - - - - - - - - - - - - - - - -

-Additional Inherited Members

- Protected Member Functions inherited from zen::asset::CAsset
 CAsset (const void *const owner=nullptr)
 Only asset::CAssetManager can create CAsset instances. More...
 
- Protected Attributes inherited from zen::asset::CAsset
util::CLog & m_Log
 
string_t m_filename
 
string_t m_error_str
 
uint32_t m_filename_hash
 
bool m_loaded
 
- Static Protected Attributes inherited from zen::asset::CAsset
static uint32_t s_seed = 0x6915BAD
 
-

Detailed Description

-
-

Definition at line 43 of file Font.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
CFont::~CFont ()
-
- -

Definition at line 17 of file Font.cpp.

- -
-
-

Member Function Documentation

- -
-
-
-template<typename T >
- - - - - -
- - - - - - - - -
CFont& zen::gui::CFont::operator<< (const T & data)
- 		-inline
-
-

This allows for direct rendering of a variety of data types (anything supporting operator<<(std::ostream&))

-
Template Parameters
- - -
TArgument type is implicitly determined
-
-
-
Parameters
- - -
dataData to write out to the stream
-
-
-
See Also
Font Examples
- -

Definition at line 59 of file Font.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool CFont::LoadFromFile (const string_t & filename)
- 		-virtual
-
-

Here, all of the printable characters in the ASCII table are loaded as bitmaps, then are turned into render-able textures in GPU memory. Their dimensions are stored for rendering later on. Since this inherits from zen::asset::CAsset, it's impossible to specify font size when using an asset manager and Create<>()'ing from a filename. Thus the recommended approach for this is Create<>()'ing without a filename (thus creating a raw asset), and then calling SetSize() prior to a LoadFromFile() call.

-
Parameters
- - -
filenameFont filename
-
-
-
Precondition
CFontLibrary::Init() must have been called.
-
Returns
true if everything went smoothly, false otherwise.
-
See Also
Font Examples
- -

Implements zen::asset::CAsset.

- -

Definition at line 22 of file Font.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool zen::gui::CFont::LoadFromExisting (const asset::CAsset *const pCopy)
- 		-inlinevirtual
-
-

There is no way (without enabling RTTI) to check if the given parameter is indeed a valid CFont instance, therefore this is dependent on the user of this API. This creates a deep copy of internal glyph texture data and all relevant asset metadata.

-
Parameters
- - -
pCopyFont asset to copy from.
-
-
- -

Reimplemented from zen::asset::CAsset.

- -

Definition at line 99 of file Font.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const void *const CFont::GetData () const
- 		-virtual
-
- -

Implements zen::asset::CAsset.

- -

Definition at line 95 of file Font.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool zen::gui::CFont::Render (obj::CEntity & Ent,
const string_t & text = "" 
) const
-
-

The text to render is optional; if it's not provided the internally streamed data will be rendered, and if it is, it will be rendered. The parameter takes precedence over the stream, so if they both exist, the parameter is used.

-
Parameters
- - - -
EntThe entity to store render data in
textThe string to render (optional)
-
-
-
Returns
true if Ent has the rendered data, false otherwise, or there was nothing to render.
-
Precondition
The font has been initialized.
-
Postcondition
Ent contains a renderable string using this font.
-
Warning
Any existing data in the entity is deleted.
- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool zen::gui::CFont::Render (gfxcore::CTexture & Texture,
const string_t & text = "" 
) const
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -
-
- -
-
- - - - - - - -
void CFont::ClearString ()
-
- -

Definition at line 307 of file Font.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CFont::AttachManager (asset::CAssetManager & Assets)
-
-

It's absolutely essential to perform a call to this method after constructing a font instance, because it is impossible for the font to load and create texture assets without a manager. This cannot be done through the constructor, either because the manager is in itself an asset, so it must be created with a manager :)

-

Please reference the font loading example to see proper techniques for using the font API.

-
Parameters
- - -
AssetsThe asset manager to attach.
-
-
-
Returns
true if the internal font rendering effect loaded successfully, false otherwise.
-
Precondition
The given manager must be initialized.
- -

Definition at line 377 of file Font.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CFont::SetColor (const color4f_t & Color)
-
- -

Definition at line 399 of file Font.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
void zen::gui::CFont::SetSize (const uint16_t size)
- 		-inline
-
- -

Definition at line 159 of file Font.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CFont::SetStacking (const bool flag)
-
- -

Definition at line 404 of file Font.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
uint16_t CFont::GetTextWidth (const string_t & text) const
-
- -

Definition at line 409 of file Font.cpp.

- -
-
- -
-
- - - - - - - - -
uint16_t CFont::GetTextHeight (const string_t & text) const
-
- -

Definition at line 437 of file Font.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
uint16_t zen::gui::CFont::GetLineHeight () const
- 		-inline
-
- -

Definition at line 166 of file Font.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gui_1_1_c_font.js b/docs/classzen_1_1gui_1_1_c_font.js deleted file mode 100644 index 0cc68824..00000000 --- a/docs/classzen_1_1gui_1_1_c_font.js +++ /dev/null @@ -1,18 +0,0 @@ -var classzen_1_1gui_1_1_c_font = -[ - [ "~CFont", "classzen_1_1gui_1_1_c_font.html#a1e1d2d4b4d14c7004289291785d75728", null ], - [ "operator<<", "classzen_1_1gui_1_1_c_font.html#a27f1789e67e2ee331b2f588f91e38db2", null ], - [ "LoadFromFile", "classzen_1_1gui_1_1_c_font.html#a6bd137b36c357eccb1c87efc0d5931f3", null ], - [ "LoadFromExisting", "classzen_1_1gui_1_1_c_font.html#a5204f75c45eb8078b881f049ab0752ee", null ], - [ "GetData", "classzen_1_1gui_1_1_c_font.html#a47e5fcc173bf07896c9929ac6437d0e1", null ], - [ "Render", "classzen_1_1gui_1_1_c_font.html#aa50c1fd782063837efffbb7bed1e6841", null ], - [ "Render", "classzen_1_1gui_1_1_c_font.html#a4a9d1e0e472754dfec4a3f1965026e33", null ], - [ "ClearString", "classzen_1_1gui_1_1_c_font.html#aecd552d0ce1527f7ebc37f764029ab7f", null ], - [ "AttachManager", "classzen_1_1gui_1_1_c_font.html#a715e34b6c9dc659be418170f7873eacd", null ], - [ "SetColor", "classzen_1_1gui_1_1_c_font.html#a3bf76a0c4cff9f878a422f9336b65d04", null ], - [ "SetSize", "classzen_1_1gui_1_1_c_font.html#a28a9a49d3ab9feb6595cd6e4a8468f26", null ], - [ "SetStacking", "classzen_1_1gui_1_1_c_font.html#a2a38afde5e128835d1e92e707313ebb1", null ], - [ "GetTextWidth", "classzen_1_1gui_1_1_c_font.html#a659a117b4f8da639b7bc25fee79d1cdb", null ], - [ "GetTextHeight", "classzen_1_1gui_1_1_c_font.html#a1eb79d2679e08b3b85df0281bd8d8fee", null ], - [ "GetLineHeight", "classzen_1_1gui_1_1_c_font.html#ad31a2ed5991e0fd75a82e7626ef260bc", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gui_1_1_c_font_a28a9a49d3ab9feb6595cd6e4a8468f26_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_a28a9a49d3ab9feb6595cd6e4a8468f26_icgraph.map deleted file mode 100644 index 80413592..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_a28a9a49d3ab9feb6595cd6e4a8468f26_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_a28a9a49d3ab9feb6595cd6e4a8468f26_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_a28a9a49d3ab9feb6595cd6e4a8468f26_icgraph.png deleted file mode 100644 index 652cbcda..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_a28a9a49d3ab9feb6595cd6e4a8468f26_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_a2a38afde5e128835d1e92e707313ebb1_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_a2a38afde5e128835d1e92e707313ebb1_icgraph.map deleted file mode 100644 index 0f250b9c..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_a2a38afde5e128835d1e92e707313ebb1_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_a2a38afde5e128835d1e92e707313ebb1_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_a2a38afde5e128835d1e92e707313ebb1_icgraph.png deleted file mode 100644 index 69d93830..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_a2a38afde5e128835d1e92e707313ebb1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_a3bf76a0c4cff9f878a422f9336b65d04_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_a3bf76a0c4cff9f878a422f9336b65d04_icgraph.map deleted file mode 100644 index a9c6af1a..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_a3bf76a0c4cff9f878a422f9336b65d04_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_a3bf76a0c4cff9f878a422f9336b65d04_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_a3bf76a0c4cff9f878a422f9336b65d04_icgraph.png deleted file mode 100644 index c9165c08..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_a3bf76a0c4cff9f878a422f9336b65d04_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_a6bd137b36c357eccb1c87efc0d5931f3_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_a6bd137b36c357eccb1c87efc0d5931f3_icgraph.map deleted file mode 100644 index 749316d7..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_a6bd137b36c357eccb1c87efc0d5931f3_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_a6bd137b36c357eccb1c87efc0d5931f3_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_a6bd137b36c357eccb1c87efc0d5931f3_icgraph.png deleted file mode 100644 index 82afb539..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_a6bd137b36c357eccb1c87efc0d5931f3_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_a715e34b6c9dc659be418170f7873eacd_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_a715e34b6c9dc659be418170f7873eacd_icgraph.map deleted file mode 100644 index 096937aa..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_a715e34b6c9dc659be418170f7873eacd_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_a715e34b6c9dc659be418170f7873eacd_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_a715e34b6c9dc659be418170f7873eacd_icgraph.png deleted file mode 100644 index 9f9674b8..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_a715e34b6c9dc659be418170f7873eacd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_aa50c1fd782063837efffbb7bed1e6841_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_aa50c1fd782063837efffbb7bed1e6841_icgraph.map deleted file mode 100644 index 77e14d1d..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_aa50c1fd782063837efffbb7bed1e6841_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_aa50c1fd782063837efffbb7bed1e6841_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_aa50c1fd782063837efffbb7bed1e6841_icgraph.png deleted file mode 100644 index 3223eae9..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_aa50c1fd782063837efffbb7bed1e6841_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_ad31a2ed5991e0fd75a82e7626ef260bc_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_ad31a2ed5991e0fd75a82e7626ef260bc_icgraph.map deleted file mode 100644 index 67b4be8b..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_ad31a2ed5991e0fd75a82e7626ef260bc_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_ad31a2ed5991e0fd75a82e7626ef260bc_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_ad31a2ed5991e0fd75a82e7626ef260bc_icgraph.png deleted file mode 100644 index ce4b2acd..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_ad31a2ed5991e0fd75a82e7626ef260bc_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_aecd552d0ce1527f7ebc37f764029ab7f_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_aecd552d0ce1527f7ebc37f764029ab7f_icgraph.map deleted file mode 100644 index a24c7766..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_aecd552d0ce1527f7ebc37f764029ab7f_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_aecd552d0ce1527f7ebc37f764029ab7f_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_aecd552d0ce1527f7ebc37f764029ab7f_icgraph.png deleted file mode 100644 index ccf4b15f..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_aecd552d0ce1527f7ebc37f764029ab7f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_atlas.html b/docs/classzen_1_1gui_1_1_c_font_atlas.html index e26f46bb..ed2bb845 100644 --- a/docs/classzen_1_1gui_1_1_c_font_atlas.html +++ b/docs/classzen_1_1gui_1_1_c_font_atlas.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1gui_1_1_c_font_library.html b/docs/classzen_1_1gui_1_1_c_font_library.html deleted file mode 100644 index aa704a37..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_library.html +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - -Zenderer Engine: zen::gui::CFontLibrary Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::gui::CFontLibrary Class Reference
GUI
-
-
- -

Initializes the core FreeType2 library. - More...

- -

#include "FontCore.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 ~CFontLibrary ()
 
bool Init ()
 Initializes the FreeType library. More...
 
bool Destroy ()
 Cleans up the subsystem completely. More...
 
const FT_Library GetLibrary () const
 
- Public Member Functions inherited from zen::CSubsystem
 CSubsystem (const string_t name="Subsystem")
 Sets subsystem to an uninitialized state. More...
 
virtual ~CSubsystem ()
 Destructor does absolutely nothing. More...
 
bool IsInit () const
 Returns the sub-system initialization status. More...
 
void SetLog (util::CLog &Log)
 Sets a custom output log. More...
 
const string_t & GetName () const
 Retrieves the subsystem name. More...
 
- - - -

-Static Public Member Functions

static CFontLibrary & InitFreetype ()
 
- - - - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::CSubsystem
util::CLog & m_Log
 
string_t m_name
 
bool m_init
 
- Static Protected Attributes inherited from zen::CSubsystem
static std::vector< CSubsystem * > sp_allSystems
 No copying subsystems. More...
 
-

Detailed Description

-

This is a wrapper class around the FreeType API that is at the core of rendering text in Zenderer. It will initialize the library a single time and track its state, cleaning up when necessary.

-
See Also
zen::Init()
- -

Definition at line 42 of file FontCore.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - -
zen::gui::CFontLibrary::~CFontLibrary ()
- 		-inline
-
- -

Definition at line 45 of file FontCore.hpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool zen::gui::CFontLibrary::Init ()
- 		-inlinevirtual
-
-

This should be called prior to ANY other font operations, preferably by the Zenderer initialization function.

-
Returns
true on success, false on failure.
-
See Also
zen::Init()
-
Note
Initialization is guaranteed to only occur one time despite multiple potential calls to this method.
- -

Implements zen::CSubsystem.

- -

Definition at line 63 of file FontCore.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::gui::CFontLibrary::Destroy ()
- 		-inlinevirtual
-
-

Typically, a subsystem can be re-initialized by setting new parameters via various Set*() methods and calling Init() again, but this is specific to the inheriting class.

- -

Implements zen::CSubsystem.

- -

Definition at line 69 of file FontCore.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
static CFontLibrary& zen::gui::CFontLibrary::InitFreetype ()
- 		-inlinestatic
-
- -

Definition at line 76 of file FontCore.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const FT_Library zen::gui::CFontLibrary::GetLibrary () const
- 		-inline
-
- -

Definition at line 83 of file FontCore.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following file: -
-
- - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_library.js b/docs/classzen_1_1gui_1_1_c_font_library.js deleted file mode 100644 index 1d5b4072..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_library.js +++ /dev/null @@ -1,8 +0,0 @@ -var classzen_1_1gui_1_1_c_font_library = -[ - [ "~CFontLibrary", "classzen_1_1gui_1_1_c_font_library.html#a53d1af8cabd84b8909269e2e40dad9bc", null ], - [ "Init", "classzen_1_1gui_1_1_c_font_library.html#ad84c7b87450289c90f94a2fe99c0e2a7", null ], - [ "Destroy", "classzen_1_1gui_1_1_c_font_library.html#a6a2ede7cf93ccfa9af2d29ea5d5fec18", null ], - [ "InitFreetype", "classzen_1_1gui_1_1_c_font_library.html#a6c34466bb119c5b24ce5ec28d329c059", null ], - [ "GetLibrary", "classzen_1_1gui_1_1_c_font_library.html#adec1abdc4f7e6a1b483d76e44b5514fd", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gui_1_1_c_font_library_a6c34466bb119c5b24ce5ec28d329c059_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_library_a6c34466bb119c5b24ce5ec28d329c059_icgraph.map deleted file mode 100644 index 7426f631..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_library_a6c34466bb119c5b24ce5ec28d329c059_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_library_a6c34466bb119c5b24ce5ec28d329c059_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_library_a6c34466bb119c5b24ce5ec28d329c059_icgraph.png deleted file mode 100644 index 5e28e46b..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_library_a6c34466bb119c5b24ce5ec28d329c059_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_library_ad84c7b87450289c90f94a2fe99c0e2a7_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_library_ad84c7b87450289c90f94a2fe99c0e2a7_icgraph.map deleted file mode 100644 index cec7af97..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_library_ad84c7b87450289c90f94a2fe99c0e2a7_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_library_ad84c7b87450289c90f94a2fe99c0e2a7_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_library_ad84c7b87450289c90f94a2fe99c0e2a7_icgraph.png deleted file mode 100644 index 20c542ba..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_library_ad84c7b87450289c90f94a2fe99c0e2a7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_font_library_adec1abdc4f7e6a1b483d76e44b5514fd_icgraph.map b/docs/classzen_1_1gui_1_1_c_font_library_adec1abdc4f7e6a1b483d76e44b5514fd_icgraph.map deleted file mode 100644 index 92aa8bf8..00000000 --- a/docs/classzen_1_1gui_1_1_c_font_library_adec1abdc4f7e6a1b483d76e44b5514fd_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1gui_1_1_c_font_library_adec1abdc4f7e6a1b483d76e44b5514fd_icgraph.png b/docs/classzen_1_1gui_1_1_c_font_library_adec1abdc4f7e6a1b483d76e44b5514fd_icgraph.png deleted file mode 100644 index b77ecb76..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_font_library_adec1abdc4f7e6a1b483d76e44b5514fd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu.html b/docs/classzen_1_1gui_1_1_c_menu.html deleted file mode 100644 index 27166475..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu.html +++ /dev/null @@ -1,608 +0,0 @@ - - - - - - -Zenderer Engine: zen::gui::CMenu Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::gui::CMenu Class Reference
GUI
-
-
- -

#include "Menu.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CMenu (gfx::CWindow &Window, asset::CAssetManager &Assets)
 
virtual ~CMenu ()
 
virtual bool HandleEvent (const evt::event_t &Evt)
 
virtual uint16_t AddButton (const string_t &text, std::function< void(size_t)> handler)
 
virtual obj::CEntity & AddEntity ()
 
virtual bool RenderWithFont (obj::CEntity &Obj, const string_t &str)
 
virtual void Update ()
 
bool SetFont (const string_t &filename, const uint16_t size=18)
 
void SetButtonBackground (const obj::CEntity &Bg)
 
void SetNormalButtonTextColor (const color4f_t &Color)
 
void SetActiveButtonTextColor (const color4f_t &Color)
 
void SetInitialButtonPosition (const math::vector_t &Pos)
 
void SetTitle (const string_t &Title, const math::vector_t &Pos)
 
void SetSpacing (const uint16_t vertical_spacing)
 
-

Detailed Description

-

A high-level wrapper that facilitates a simple method of creating fairly customizable and high-quality menus with custom buttons, fonts, backgrounds, and other sections.

-
Todo:
Document the API.
- -

Definition at line 39 of file Menu.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
CMenu::CMenu (gfx::CWindow & Window,
asset::CAssetManager & Assets 
)
-
- -

Definition at line 6 of file Menu.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CMenu::~CMenu ()
- 		-virtual
-
- -

Definition at line 18 of file Menu.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
bool CMenu::HandleEvent (const evt::event_t & Evt)
- 		-virtual
-
- -

Definition at line 25 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
uint16_t CMenu::AddButton (const string_t & text,
std::function< void(size_t)> handler 
)
- 		-virtual
-
- -

Definition at line 68 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
obj::CEntity & CMenu::AddEntity ()
- 		-virtual
-
- -

Definition at line 90 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
bool CMenu::RenderWithFont (obj::CEntity & Obj,
const string_t & str 
)
- 		-virtual
-
- -

Definition at line 95 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
void CMenu::Update ()
- 		-virtual
-
- -

Definition at line 100 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool CMenu::SetFont (const string_t & filename,
const uint16_t size = 18 
)
-
- -

Definition at line 105 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CMenu::SetButtonBackground (const obj::CEntity & Bg)
-
- -

Definition at line 113 of file Menu.cpp.

- -
-
- -
-
- - - - - - - - -
void CMenu::SetNormalButtonTextColor (const color4f_t & Color)
-
- -

Definition at line 118 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CMenu::SetActiveButtonTextColor (const color4f_t & Color)
-
- -

Definition at line 123 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CMenu::SetInitialButtonPosition (const math::vector_t & Pos)
-
- -

Definition at line 128 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void zen::gui::CMenu::SetTitle (const string_t & Title,
const math::vector_t & Pos 
)
-
- -
-
- -
-
- - - - - - - - -
void CMenu::SetSpacing (const uint16_t vertical_spacing)
-
- -

Definition at line 133 of file Menu.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu.js b/docs/classzen_1_1gui_1_1_c_menu.js deleted file mode 100644 index 27b42dd5..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu.js +++ /dev/null @@ -1,17 +0,0 @@ -var classzen_1_1gui_1_1_c_menu = -[ - [ "CMenu", "classzen_1_1gui_1_1_c_menu.html#a28f8f1f055ea88f403855ac3de380afa", null ], - [ "~CMenu", "classzen_1_1gui_1_1_c_menu.html#ab2ab7e24e646bcb61ad0b9d8484f2604", null ], - [ "HandleEvent", "classzen_1_1gui_1_1_c_menu.html#a1056e360f408ebd11153275ad8a30e89", null ], - [ "AddButton", "classzen_1_1gui_1_1_c_menu.html#afe6cf555588c62c0bfd1266964738fb4", null ], - [ "AddEntity", "classzen_1_1gui_1_1_c_menu.html#ae0733fc98531ae0192937f87ffab1f5b", null ], - [ "RenderWithFont", "classzen_1_1gui_1_1_c_menu.html#a710e614f6705ef730d53780c1864aa2b", null ], - [ "Update", "classzen_1_1gui_1_1_c_menu.html#a50c980590fefd1412c905366ad788639", null ], - [ "SetFont", "classzen_1_1gui_1_1_c_menu.html#aef42a74422a3d63ddfaf073269833472", null ], - [ "SetButtonBackground", "classzen_1_1gui_1_1_c_menu.html#a3db35e7b3990601712bf3fcec8f1e67b", null ], - [ "SetNormalButtonTextColor", "classzen_1_1gui_1_1_c_menu.html#a5765bd4b4bcf821cf68783195e67fe8d", null ], - [ "SetActiveButtonTextColor", "classzen_1_1gui_1_1_c_menu.html#ab54af6d3448d85ea3693e0d20244af1e", null ], - [ "SetInitialButtonPosition", "classzen_1_1gui_1_1_c_menu.html#ae1d6bd48b5fe23604b1d3752b1b12868", null ], - [ "SetTitle", "classzen_1_1gui_1_1_c_menu.html#ac4d5ad75e344c1140dfc32506dc2fd6e", null ], - [ "SetSpacing", "classzen_1_1gui_1_1_c_menu.html#a0e54f4a703d93cdeba184dbc737fa04b", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1gui_1_1_c_menu_a0e54f4a703d93cdeba184dbc737fa04b_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_a0e54f4a703d93cdeba184dbc737fa04b_icgraph.map deleted file mode 100644 index ebd0bbe6..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_a0e54f4a703d93cdeba184dbc737fa04b_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_a0e54f4a703d93cdeba184dbc737fa04b_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_a0e54f4a703d93cdeba184dbc737fa04b_icgraph.png deleted file mode 100644 index e51e30bd..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_a0e54f4a703d93cdeba184dbc737fa04b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_a1056e360f408ebd11153275ad8a30e89_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_a1056e360f408ebd11153275ad8a30e89_icgraph.map deleted file mode 100644 index 449ca8c7..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_a1056e360f408ebd11153275ad8a30e89_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_a1056e360f408ebd11153275ad8a30e89_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_a1056e360f408ebd11153275ad8a30e89_icgraph.png deleted file mode 100644 index 3e637a67..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_a1056e360f408ebd11153275ad8a30e89_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_a50c980590fefd1412c905366ad788639_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_a50c980590fefd1412c905366ad788639_icgraph.map deleted file mode 100644 index 0d740f3c..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_a50c980590fefd1412c905366ad788639_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_a50c980590fefd1412c905366ad788639_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_a50c980590fefd1412c905366ad788639_icgraph.png deleted file mode 100644 index 0487271a..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_a50c980590fefd1412c905366ad788639_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_a5765bd4b4bcf821cf68783195e67fe8d_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_a5765bd4b4bcf821cf68783195e67fe8d_icgraph.map deleted file mode 100644 index ca9af40b..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_a5765bd4b4bcf821cf68783195e67fe8d_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_a5765bd4b4bcf821cf68783195e67fe8d_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_a5765bd4b4bcf821cf68783195e67fe8d_icgraph.png deleted file mode 100644 index 64057554..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_a5765bd4b4bcf821cf68783195e67fe8d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_a710e614f6705ef730d53780c1864aa2b_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_a710e614f6705ef730d53780c1864aa2b_icgraph.map deleted file mode 100644 index 09101b0f..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_a710e614f6705ef730d53780c1864aa2b_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_a710e614f6705ef730d53780c1864aa2b_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_a710e614f6705ef730d53780c1864aa2b_icgraph.png deleted file mode 100644 index d7cb964c..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_a710e614f6705ef730d53780c1864aa2b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_ab54af6d3448d85ea3693e0d20244af1e_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_ab54af6d3448d85ea3693e0d20244af1e_icgraph.map deleted file mode 100644 index c910864b..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_ab54af6d3448d85ea3693e0d20244af1e_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_ab54af6d3448d85ea3693e0d20244af1e_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_ab54af6d3448d85ea3693e0d20244af1e_icgraph.png deleted file mode 100644 index 637a161f..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_ab54af6d3448d85ea3693e0d20244af1e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_ae0733fc98531ae0192937f87ffab1f5b_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_ae0733fc98531ae0192937f87ffab1f5b_icgraph.map deleted file mode 100644 index 86dffff2..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_ae0733fc98531ae0192937f87ffab1f5b_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_ae0733fc98531ae0192937f87ffab1f5b_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_ae0733fc98531ae0192937f87ffab1f5b_icgraph.png deleted file mode 100644 index 2248d1ac..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_ae0733fc98531ae0192937f87ffab1f5b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_ae1d6bd48b5fe23604b1d3752b1b12868_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_ae1d6bd48b5fe23604b1d3752b1b12868_icgraph.map deleted file mode 100644 index 91c6fd25..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_ae1d6bd48b5fe23604b1d3752b1b12868_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_ae1d6bd48b5fe23604b1d3752b1b12868_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_ae1d6bd48b5fe23604b1d3752b1b12868_icgraph.png deleted file mode 100644 index 894e9c48..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_ae1d6bd48b5fe23604b1d3752b1b12868_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_aef42a74422a3d63ddfaf073269833472_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_aef42a74422a3d63ddfaf073269833472_icgraph.map deleted file mode 100644 index 1ff81e14..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_aef42a74422a3d63ddfaf073269833472_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_aef42a74422a3d63ddfaf073269833472_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_aef42a74422a3d63ddfaf073269833472_icgraph.png deleted file mode 100644 index ee4a9c93..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_aef42a74422a3d63ddfaf073269833472_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1_c_menu_afe6cf555588c62c0bfd1266964738fb4_icgraph.map b/docs/classzen_1_1gui_1_1_c_menu_afe6cf555588c62c0bfd1266964738fb4_icgraph.map deleted file mode 100644 index 22562866..00000000 --- a/docs/classzen_1_1gui_1_1_c_menu_afe6cf555588c62c0bfd1266964738fb4_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1gui_1_1_c_menu_afe6cf555588c62c0bfd1266964738fb4_icgraph.png b/docs/classzen_1_1gui_1_1_c_menu_afe6cf555588c62c0bfd1266964738fb4_icgraph.png deleted file mode 100644 index 432613b3..00000000 Binary files a/docs/classzen_1_1gui_1_1_c_menu_afe6cf555588c62c0bfd1266964738fb4_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1gui_1_1z_button.html b/docs/classzen_1_1gui_1_1z_button.html index c1aa6175..2d9d8084 100644 --- a/docs/classzen_1_1gui_1_1z_button.html +++ b/docs/classzen_1_1gui_1_1z_button.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -207,7 +207,7 @@

Member Function Documentation

- +

@@ -262,7 +262,7 @@

Member Function Documentation

- +

@@ -341,7 +341,7 @@

Member Function Documentation

- +

@@ -368,7 +368,7 @@

Member Function Documentation

- +

@@ -395,7 +395,7 @@

Member Function Documentation

- +

@@ -422,7 +422,7 @@

Member Function Documentation

- +

@@ -449,7 +449,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.map b/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.map index 44ba6e5f..3c4b946c 100644 --- a/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.png b/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.png index bbaf6004..d42c93c0 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_a0cb61a9e5c11d230e8c9e6fa3dd20c39_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.map b/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.map index 7a8d0106..1832dfa5 100644 --- a/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.png b/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.png index 2fe19f5f..cfbb01f0 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_a5652cc6a2b8ff9ea9a365260a8eb0898_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.map b/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.map index 0a83bee5..67938bfb 100644 --- a/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.png b/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.png index 3e49647e..694ff2a8 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_a7241adecac3cf81a29df42e870850399_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.map b/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.map index 9f508f42..4444261b 100644 --- a/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.png b/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.png index c79d97e0..91c83de0 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_ab4be21f09c996b8c247c24c3c1611443_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.map b/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.map index 18ad270a..9eee993d 100644 --- a/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.png b/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.png index f7463d10..bebf3b58 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_adfab2e4573c0b91323b9461b09574eaa_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.map b/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.map index 29debe80..145e7e35 100644 --- a/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.png b/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.png index b8f76cc0..c378e710 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_aec51e4c4215268466e6c49b06d33cd86_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.map b/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.map index f3434ccd..ff4e0925 100644 --- a/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.png b/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.png index 2f7edbb7..fdb01a64 100644 Binary files a/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.png and b/docs/classzen_1_1gui_1_1z_button_af82c10df023cbfda8b404a0f3d6fcbb3_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font.html b/docs/classzen_1_1gui_1_1z_font.html index e262781f..c539f428 100644 --- a/docs/classzen_1_1gui_1_1z_font.html +++ b/docs/classzen_1_1gui_1_1z_font.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -150,6 +150,8 @@ void SetColor (const color4f_t &Color)  Sets the font color. More...
  +void SetColor (const real_t r, const real_t g, const real_t b) +  void SetSize (const uint16_t size)  Sets the font size. More...
  @@ -320,7 +322,7 @@

Member Function Documentation

- +

@@ -429,7 +431,7 @@

Member Function Documentation

- +

@@ -475,14 +477,14 @@

Member Function Documentation

-

Definition at line 313 of file Font.cpp.

+

Definition at line 311 of file Font.cpp.

Here is the caller graph for this function:
- +

@@ -512,14 +514,14 @@

Member Function Documentation

Returns
true if the internal font rendering effect loaded successfully, false otherwise.
Precondition
The given manager must be initialized.
-

Definition at line 384 of file Font.cpp.

+

Definition at line 382 of file Font.cpp.

Here is the caller graph for this function:
- +

@@ -539,17 +541,52 @@

Member Function Documentation

-

Definition at line 406 of file Font.cpp.

+

Definition at line 404 of file Font.cpp.

Here is the caller graph for this function:
- +

+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
void zFont::SetColor (const real_t r,
const real_t g,
const real_t b 
)
+
+

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

+ +

Definition at line 409 of file Font.cpp.

+
@@ -574,14 +611,14 @@

Member Function Documentation

-

Definition at line 159 of file Font.hpp.

+

Definition at line 160 of file Font.hpp.

Here is the caller graph for this function:
- +

@@ -601,14 +638,14 @@

Member Function Documentation

-

Definition at line 411 of file Font.cpp.

+

Definition at line 416 of file Font.cpp.

Here is the caller graph for this function:
- +

@@ -628,7 +665,7 @@

Member Function Documentation

-

Definition at line 416 of file Font.cpp.

+

Definition at line 421 of file Font.cpp.

@@ -646,7 +683,7 @@

Member Function Documentation

-

Definition at line 444 of file Font.cpp.

+

Definition at line 449 of file Font.cpp.

@@ -671,14 +708,14 @@

Member Function Documentation

-

Definition at line 166 of file Font.hpp.

+

Definition at line 167 of file Font.hpp.

Here is the caller graph for this function:
- +

diff --git a/docs/classzen_1_1gui_1_1z_font.js b/docs/classzen_1_1gui_1_1z_font.js index b6b299f8..0ff14b48 100644 --- a/docs/classzen_1_1gui_1_1z_font.js +++ b/docs/classzen_1_1gui_1_1z_font.js @@ -10,6 +10,7 @@ var classzen_1_1gui_1_1z_font = [ "ClearString", "classzen_1_1gui_1_1z_font.html#a9805153394f3cd01041ccfa51eacc8b9", null ], [ "AttachManager", "classzen_1_1gui_1_1z_font.html#a7b62160ec76e8daccc2a199b9fc71777", null ], [ "SetColor", "classzen_1_1gui_1_1z_font.html#a8cd1236470fb602bbe20237a8a44398b", null ], + [ "SetColor", "classzen_1_1gui_1_1z_font.html#aabe8618c807f1830296c293387a07f95", null ], [ "SetSize", "classzen_1_1gui_1_1z_font.html#a3ab8b4e8391ba35b398935bb727ab5f2", null ], [ "SetStacking", "classzen_1_1gui_1_1z_font.html#a75c0aba3263ef5c4e305a1a821c5142b", null ], [ "GetTextWidth", "classzen_1_1gui_1_1z_font.html#a80e2b87420d997b627faab2c41bdc6f1", null ], diff --git a/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.map index 54f7ba59..a1a974e9 100644 --- a/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.png index 4583179e..1b28c2f2 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a2ff0c9cff415a035b0e38855d7c25cc5_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.map index f8acc238..010c8a2a 100644 --- a/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.png index 8ef3ee6b..7ef56a24 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a3ab8b4e8391ba35b398935bb727ab5f2_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.map index 5e4ed6e5..f4038032 100644 --- a/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.map @@ -1,5 +1,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.png index e2c69297..26475a21 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a5aa68ad2c5f6d57b8cfca1d6fcc5db5e_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.map index 7c70cf0a..991b7a14 100644 --- a/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.png index d81407e0..e1eb9e57 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a75c0aba3263ef5c4e305a1a821c5142b_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.map index 740cc4ef..2a692408 100644 --- a/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.map @@ -2,6 +2,6 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.png index a3286657..b7c9ce58 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a7727aa647d1a37a921cc0b03c20079f9_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.map index 7c5aa7cf..2799b502 100644 --- a/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.map @@ -1,5 +1,6 @@ - + + diff --git a/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.png index e9ee4dde..2b1f423f 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a7b62160ec76e8daccc2a199b9fc71777_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.map index e009107e..d62e20f2 100644 --- a/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.map @@ -1,6 +1,6 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.png index 4f0dec10..66fe3119 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a8cd1236470fb602bbe20237a8a44398b_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.map b/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.map index 94561c8b..94e965b4 100644 --- a/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.png b/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.png index 8186ee69..b0165ea7 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_a9805153394f3cd01041ccfa51eacc8b9_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_library.html b/docs/classzen_1_1gui_1_1z_font_library.html index 89784194..6fde37c7 100644 --- a/docs/classzen_1_1gui_1_1z_font_library.html +++ b/docs/classzen_1_1gui_1_1z_font_library.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -234,7 +234,7 @@

Member Function Documentation

- +

@@ -296,7 +296,7 @@

Member Function Documentation

- +

@@ -330,7 +330,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.map b/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.map index b76ef671..50e29c42 100644 --- a/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.png b/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.png index 2f702bc1..dd0b6ee5 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_library_a1cf14f5723c1975db84691ee7896b3be_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.map b/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.map index e0353af6..98f4950d 100644 --- a/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.map @@ -3,5 +3,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.png b/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.png index 747c97bf..502cd840 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_library_a4842a6941f1680aaa49a6852c8b08d54_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.map b/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.map index ffa89402..2baf7da5 100644 --- a/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.map @@ -2,5 +2,5 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.png b/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.png index aa790200..df14e1f1 100644 Binary files a/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.png and b/docs/classzen_1_1gui_1_1z_font_library_aeafc692f64655ec31a3b0dac69d74924_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu.html b/docs/classzen_1_1gui_1_1z_menu.html index b419dbd6..7e7481ce 100644 --- a/docs/classzen_1_1gui_1_1z_menu.html +++ b/docs/classzen_1_1gui_1_1z_menu.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -236,7 +236,7 @@

Member Function Documentation

- +

@@ -281,7 +281,7 @@

Member Function Documentation

- +

@@ -315,7 +315,7 @@

Member Function Documentation

- +

@@ -360,7 +360,7 @@

Member Function Documentation

- +

@@ -394,7 +394,7 @@

Member Function Documentation

- +

@@ -431,7 +431,7 @@

Member Function Documentation

- +

@@ -476,7 +476,7 @@

Member Function Documentation

- +

@@ -503,7 +503,7 @@

Member Function Documentation

- +

@@ -530,7 +530,7 @@

Member Function Documentation

- +

@@ -583,7 +583,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.map index 880d9970..0652bc41 100644 --- a/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.png index 23bb02a6..008c4df6 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_a32705a29a503823e30e0de126de32080_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.map index 0d4e9a1c..cbdc3a75 100644 --- a/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.png index dd048b69..f6401db2 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_a453ad6ebe7f7c78f32e8d532f926998f_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.map index 94332a73..4ccc3ff2 100644 --- a/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.png index 7388d13b..a2d22731 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_a7be1c48eef079485c50eab0ede493fad_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.map index 867db402..3d38ec5d 100644 --- a/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.png index b8169365..88f49ed0 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_a86695ae0ba374986d191973d36ecfe52_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.map index e8a4103b..eb8abccb 100644 --- a/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.png index 7d12e949..0a474bf7 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_a883d3e718cd0bc184a6c54e1654f4728_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.map index 52f00f53..acfd0694 100644 --- a/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.png index 0ea30308..0aeb2fc6 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_a91f65e62cff6b72a1c49a821cac4e91b_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.map index a1a4de21..80256bf9 100644 --- a/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.png index bce7d946..13921756 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_aa592f2f62c9de613ebba8398272b7738_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.map index 1bebb199..1055603d 100644 --- a/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.png index 82598a56..4624cfef 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_aa5b5b8c50bee2a1c707ff991bab7d302_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.map index f4abd2bf..95aa4e6c 100644 --- a/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.png index fd90b14c..bcf3f113 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_ad003fe5a5f45d0d54f6d82d15aeb56f9_icgraph.png differ diff --git a/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.map b/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.map index bb64bc0e..31904b55 100644 --- a/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.map +++ b/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.png b/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.png index bcc4dc17..5ced7a8d 100644 Binary files a/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.png and b/docs/classzen_1_1gui_1_1z_menu_ad6c29f94e4b0916da9908cb40c48255c_icgraph.png differ diff --git a/docs/classzen_1_1lua_1_1_c_lua_a_p_i.html b/docs/classzen_1_1lua_1_1_c_lua_a_p_i.html deleted file mode 100644 index a703e1d8..00000000 --- a/docs/classzen_1_1lua_1_1_c_lua_a_p_i.html +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - -Zenderer Engine: zen::lua::CLuaAPI Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::lua::CLuaAPI Class Reference
Scripting
-
-
- -

Wrapper for the core Lua interpreter. - More...

- -

#include "Lua.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CLuaAPI (const luaLibs_t &libraries)
 Constructs a Lua interpreter instance. More...
 
 ~CLuaAPI ()
 Cleans up the interpreter instance. More...
 
 operator lua_State * ()
 Implicitly covert to lua_State* for lua_ API calls. More...
 
bool Init ()
 Loads the Lua interpreter with the given libraries. More...
 
bool Destroy ()
 Cleans up the Lua interpreter instance. More...
 
bool LoadFile (const string_t &filename)
 Loads and executes a Lua script. More...
 
bool ResetStack ()
 Empties the Lua virtual stack. More...
 
string_t GetError ()
 Retrieves the latest Lua error, if any. More...
 
- Public Member Functions inherited from zen::CSubsystem
 CSubsystem (const string_t name="Subsystem")
 Sets subsystem to an uninitialized state. More...
 
virtual ~CSubsystem ()
 Destructor does absolutely nothing. More...
 
bool IsInit () const
 Returns the sub-system initialization status. More...
 
void SetLog (util::CLog &Log)
 Sets a custom output log. More...
 
const string_t & GetName () const
 Retrieves the subsystem name. More...
 
- - - - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::CSubsystem
util::CLog & m_Log
 
string_t m_name
 
bool m_init
 
- Static Protected Attributes inherited from zen::CSubsystem
static std::vector< CSubsystem * > sp_allSystems
 No copying subsystems. More...
 
-

Detailed Description

-

This class provides a simple convenience wrapper around the lua_State variable required for the Lua intepreter. It automatically takes care of resource allocation and freeing of the interpreter instance. Scripting is merely a feature of the engine, and is not actually used in its core (yet). Thus, the file is not included by default in Zenderer.hpp. If you wish to include it, be sure to add the appropriate linker commands to your compilation routine.

-

This API does not allow for complete abstraction away from Lua, but still requires working knowledge of Lua and the process of embedding it in a C program. It's a fairly simple and straightfoward API, and there is a variety of resources available in the "See Also" section below.

-
Note
By default, the Visual Studio 11 library is linked when _WIN32 is defined.
-
See Also
http://www.lua.org/manual/5.2/manual.html
-
-http://blog.acamara.es/2012/08/19/calling-c-functions-from-lua-5-2/
-
-http://csl.name/lua/
-
Examples:
Scripting.
-
-

Definition at line 49 of file Lua.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - - -
zen::lua::CLuaAPI::CLuaAPI (const luaLibs_t & libraries)
- 		-inline
-
-

This will set up the configuration for the private Lua interpreter instance, storing the necessary libraries locally.

-
Parameters
- - -
librariesLibraries to use
-
-
- -

Definition at line 60 of file Lua.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zen::lua::CLuaAPI::~CLuaAPI ()
- 		-inline
-
- -

Definition at line 64 of file Lua.hpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
zen::lua::CLuaAPI::operator lua_State * ()
- 		-inline
-
- -

Definition at line 70 of file Lua.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::lua::CLuaAPI::Init ()
- 		-inlinevirtual
-
-
Returns
true if loaded successfully, false if already initialized.
-
See Also
IsInit()
- -

Implements zen::CSubsystem.

- -

Definition at line 79 of file Lua.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::lua::CLuaAPI::Destroy ()
- 		-inlinevirtual
-
- -

Implements zen::CSubsystem.

- -

Definition at line 99 of file Lua.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool zen::lua::CLuaAPI::LoadFile (const string_t & filename)
- 		-inline
-
-

This will execute the Lua script just as if you ran it from the command line using lua filename. Any function calls and other interactions can only be done after this has been run, but the setting of any variables must be done beforehand.

-
Parameters
- - -
filenameLua script path / filename
-
-
-
Returns
true if the script ran without errors, false otherwise.
-
See Also
GetError()
- -

Definition at line 123 of file Lua.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::lua::CLuaAPI::ResetStack ()
- 		-inline
-
- -

Definition at line 130 of file Lua.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
string_t zen::lua::CLuaAPI::GetError ()
- 		-inline
-
-
Returns
The error string if it exists, a custom error if the interpreter has not been loaded, and a blank string if there is no error.
-
Warning
This should only be called if you are absolutely positive that the interpreter has generated an error, otherwise this may mess up the stack or conversion may fail.
- -

Definition at line 148 of file Lua.hpp.

- -
-
-
The documentation for this class was generated from the following file:
    -
  • Zenderer/include/Zenderer/Scripting/Lua.hpp
    • -
-
-
- - - - diff --git a/docs/classzen_1_1lua_1_1_c_lua_a_p_i.js b/docs/classzen_1_1lua_1_1_c_lua_a_p_i.js deleted file mode 100644 index 65d5305b..00000000 --- a/docs/classzen_1_1lua_1_1_c_lua_a_p_i.js +++ /dev/null @@ -1,11 +0,0 @@ -var classzen_1_1lua_1_1_c_lua_a_p_i = -[ - [ "CLuaAPI", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a292d76f3773e954b006c6b5d9a4ce88e", null ], - [ "~CLuaAPI", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a54359f6bc242737297f2ea0e0cdb5649", null ], - [ "operator lua_State *", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a9d2bd72573e43919192cff63747f8921", null ], - [ "Init", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a4884a5a3cff7ad87b984a90d051461d9", null ], - [ "Destroy", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a0466b91b55b6542d4ff5c766f3333b27", null ], - [ "LoadFile", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a41197a92912fca9306993b41cd6062d9", null ], - [ "ResetStack", "classzen_1_1lua_1_1_c_lua_a_p_i.html#ac05ea021f672968a32eba9946eed524e", null ], - [ "GetError", "classzen_1_1lua_1_1_c_lua_a_p_i.html#a5c6980d793d7831788c7880e1c4e896d", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1lua_1_1z_lua.html b/docs/classzen_1_1lua_1_1z_lua.html index 658a0a30..34295af0 100644 --- a/docs/classzen_1_1lua_1_1z_lua.html +++ b/docs/classzen_1_1lua_1_1z_lua.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1lvl_1_1z_level_loader.html b/docs/classzen_1_1lvl_1_1z_level_loader.html index f5598ab2..2e4ce036 100644 --- a/docs/classzen_1_1lvl_1_1z_level_loader.html +++ b/docs/classzen_1_1lvl_1_1z_level_loader.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -132,7 +132,7 @@

Detailed Description

-

Definition at line 37 of file LevelLoader.hpp.

+

Definition at line 39 of file LevelLoader.hpp.

Constructor & Destructor Documentation

@@ -166,7 +166,7 @@
-

Definition at line 40 of file LevelLoader.hpp.

+

Definition at line 50 of file LevelLoader.hpp.

@@ -191,7 +191,7 @@
-

Definition at line 46 of file LevelLoader.hpp.

+

Definition at line 57 of file LevelLoader.hpp.

@@ -219,10 +219,21 @@

Member Function Documentation

Todo:
Error checking.
Todo:
-
Todo:
-
Todo:
Differentiate between player and enemy spawns.
+
Todo:
Polygons vs. Entities differentiation.
+
Todo:
+
Todo:
+
Todo:
-

Definition at line 63 of file LevelLoader.hpp.

+

Definition at line 74 of file LevelLoader.hpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

@@ -248,7 +259,16 @@

Member Function Documentation

-

Definition at line 207 of file LevelLoader.hpp.

+

Definition at line 273 of file LevelLoader.hpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

diff --git a/docs/classzen_1_1lvl_1_1z_level_loader_abbdb81078346ea39b698975ff9b77c59_icgraph.map b/docs/classzen_1_1lvl_1_1z_level_loader_abbdb81078346ea39b698975ff9b77c59_icgraph.map new file mode 100644 index 00000000..5c0b6125 --- /dev/null +++ b/docs/classzen_1_1lvl_1_1z_level_loader_abbdb81078346ea39b698975ff9b77c59_icgraph.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/classzen_1_1lvl_1_1z_level_loader_abbdb81078346ea39b698975ff9b77c59_icgraph.png b/docs/classzen_1_1lvl_1_1z_level_loader_abbdb81078346ea39b698975ff9b77c59_icgraph.png new file mode 100644 index 00000000..35ba7d1d Binary files /dev/null and b/docs/classzen_1_1lvl_1_1z_level_loader_abbdb81078346ea39b698975ff9b77c59_icgraph.png differ diff --git a/docs/classzen_1_1lvl_1_1z_level_loader_ad28f2e3349d0e3ec55d6bd0e3ff1a02d_icgraph.map b/docs/classzen_1_1lvl_1_1z_level_loader_ad28f2e3349d0e3ec55d6bd0e3ff1a02d_icgraph.map new file mode 100644 index 00000000..4d216fd5 --- /dev/null +++ b/docs/classzen_1_1lvl_1_1z_level_loader_ad28f2e3349d0e3ec55d6bd0e3ff1a02d_icgraph.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/classzen_1_1lvl_1_1z_level_loader_ad28f2e3349d0e3ec55d6bd0e3ff1a02d_icgraph.png b/docs/classzen_1_1lvl_1_1z_level_loader_ad28f2e3349d0e3ec55d6bd0e3ff1a02d_icgraph.png new file mode 100644 index 00000000..556c6216 Binary files /dev/null and b/docs/classzen_1_1lvl_1_1z_level_loader_ad28f2e3349d0e3ec55d6bd0e3ff1a02d_icgraph.png differ diff --git a/docs/classzen_1_1math_1_1matrix4x4__t.html b/docs/classzen_1_1math_1_1matrix4x4__t.html index d8001acd..6fd92634 100644 --- a/docs/classzen_1_1math_1_1matrix4x4__t.html +++ b/docs/classzen_1_1math_1_1matrix4x4__t.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -192,7 +192,7 @@
-

Definition at line 6 of file Matrix.cpp.

+

Definition at line 7 of file Matrix.cpp.

@@ -210,7 +210,7 @@
-

Definition at line 11 of file Matrix.cpp.

+

Definition at line 12 of file Matrix.cpp.

@@ -228,7 +228,7 @@
-

Definition at line 18 of file Matrix.cpp.

+

Definition at line 19 of file Matrix.cpp.

@@ -246,7 +246,7 @@
-

Definition at line 25 of file Matrix.cpp.

+

Definition at line 26 of file Matrix.cpp.

@@ -265,7 +265,7 @@

Member Function Documentation

-

Definition at line 30 of file Matrix.cpp.

+

Definition at line 31 of file Matrix.cpp.

@@ -295,7 +295,7 @@

Member Function Documentation

Returns
The real_t array at that index.
-

Definition at line 37 of file Matrix.cpp.

+

Definition at line 38 of file Matrix.cpp.

@@ -314,7 +314,7 @@

Member Function Documentation

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 43 of file Matrix.cpp.

+

Definition at line 44 of file Matrix.cpp.

@@ -332,7 +332,7 @@

Member Function Documentation

-

Definition at line 49 of file Matrix.cpp.

+

Definition at line 50 of file Matrix.cpp.

@@ -429,7 +429,7 @@

Member Function Documentation

Note
Only 2D shears are supported (X and Y directions).
-
Todo:
Add 3D shearing.
+
Todo:
Add 3D shearing.

Definition at line 94 of file Matrix.hpp.

@@ -511,7 +511,7 @@

Member Function Documentation

Note
Only rotations on the 2D xy-plane are supported; this is rotation about the Z axis.
Multiplying matrix transformations performs the operations in the reverse order in which they are multiplied.
-
See Also
zVector::Rotate
+
See Also
zVector::Rotate
http://people.cs.clemson.edu/~dhouse/courses/401/notes/affines-matrices.pdf
@@ -666,7 +666,7 @@

Member Function Documentation

- +

@@ -693,14 +693,14 @@

Member Function Documentation

-

Definition at line 61 of file Matrix.cpp.

+

Definition at line 62 of file Matrix.cpp.

Here is the caller graph for this function:
- +

@@ -727,14 +727,14 @@

Member Function Documentation

-

Definition at line 68 of file Matrix.cpp.

+

Definition at line 69 of file Matrix.cpp.

Here is the caller graph for this function:
- +

diff --git a/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.map b/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.map index 472e91b6..5d18c263 100644 --- a/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.map +++ b/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.map @@ -1,9 +1,10 @@ - - - - - - - + + + + + + + + diff --git a/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.png b/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.png index 3f709b8d..32219162 100644 Binary files a/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.png and b/docs/classzen_1_1math_1_1matrix4x4__t_a34e711ca24bb3b8e365934bc391a3dcd_icgraph.png differ diff --git a/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.map b/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.map index 6b239afe..51a6fc00 100644 --- a/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.map +++ b/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.map @@ -3,5 +3,5 @@ - + diff --git a/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.png b/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.png index 22e32af8..6e85cc2c 100644 Binary files a/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.png and b/docs/classzen_1_1math_1_1matrix4x4__t_aaeaa55d84be7cf41d7eb81fed0b36e38_icgraph.png differ diff --git a/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.map b/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.map index f6707856..b847d2c1 100644 --- a/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.map +++ b/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.map @@ -1,10 +1,11 @@ - - - - - - - - + + + + + + + + + diff --git a/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.png b/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.png index f6266ad7..3dbc3454 100644 Binary files a/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.png and b/docs/classzen_1_1math_1_1matrix4x4__t_afd5ac2890e4956d80553a9539e20ea5a_icgraph.png differ diff --git a/docs/classzen_1_1net_1_1_c_socket.html b/docs/classzen_1_1net_1_1_c_socket.html deleted file mode 100644 index 0db8d0cd..00000000 --- a/docs/classzen_1_1net_1_1_c_socket.html +++ /dev/null @@ -1,577 +0,0 @@ - - - - - - -Zenderer Engine: zen::net::CSocket Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::net::CSocket Class Reference
Network
-
-
- -

A low-level socket wrapper. - More...

- -

#include "Socket.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CSocket (const SocketType &Type)
 
virtual ~CSocket ()
 
bool Init (const string_t &host, const string_t &port)
 
bool Destroy ()
 
string_t RecvFrom (const size_t size, string_t &address, string_t &port)
 Receives any incoming data on the socket. More...
 
int SendTo (const std::string &addr, const std::string &port, const std::string &data)
 Sends a message to an IP:port address. More...
 
int SendBroadcast (const string_t &message, const string_t &port="")
 
bool Ping ()
 
bool SetSocketOption (const int type, const int option, const bool flag)
 
bool SetNonblocking (const bool flag)
 Enables or disables blocking for socket operations. More...
 
int GetError () const
 Retrieves the last error number. More...
 
- - - -

-Static Public Member Functions

static bool InitializeLibrary ()
 
-

Detailed Description

-

This API provides a low-level abstraction layer over a lot of unwieldy and OS-dependant socket I/O operations.

-
Note
There is currently only support for UDP communication via sendto() and recvfrom().
-
Todo:
Support for TCP, connect(), etc.
-
Examples:
Sockets.
-
-

Definition at line 105 of file Socket.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - - -
zen::net::CSocket::CSocket (const SocketType & Type)
- 		-inline
-
- -

Definition at line 108 of file Socket.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual zen::net::CSocket::~CSocket ()
- 		-inlinevirtual
-
- -

Definition at line 111 of file Socket.hpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CSocket::InitializeLibrary ()
- 		-static
-
- -

Definition at line 10 of file Socket.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
bool CSocket::Init (const string_t & host,
const string_t & port 
)
-
- -

Definition at line 24 of file Socket.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CSocket::Destroy ()
-
- -

Definition at line 70 of file Socket.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
string_t CSocket::RecvFrom (const size_t size,
string_t & address,
string_t & port 
)
-
-

This call will block the process until some amount of data is received, unless SetNonblocking() is called.

-
Parameters
- - - - -
sizeThe maximum size of the data to receive
addressString to store the IP address of the sender
addressString to store the port of the sender
-
-
-
Returns
Data that was received from the socket, if any.
-
Warning
Packets less than size will NOT be removed from the socket queue.
- -

Definition at line 81 of file Socket.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
int CSocket::SendTo (const std::string & addr,
const std::string & port,
const std::string & data 
)
-
-
Parameters
- - - - -
addrThe IP address to send to
portThe port to send to
dataThe data to send
-
-
-
Returns
The number of bytes sent, or -1 on error.
-
Warning
This is only available for UDP sockets.
-
See Also
GetError()
-
-SendAll()
-
-SocketType
- -

Definition at line 117 of file Socket.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
int CSocket::SendBroadcast (const string_t & message,
const string_t & port = "" 
)
-
- -

Definition at line 137 of file Socket.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CSocket::Ping ()
-
- -

Definition at line 153 of file Socket.cpp.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool CSocket::SetSocketOption (const int type,
const int option,
const bool flag 
)
-
- -

Definition at line 159 of file Socket.cpp.

- -
-
- -
-
- - - - - - - - -
bool CSocket::SetNonblocking (const bool flag)
-
-
Parameters
- - -
flagSet blocking mode, or no?
-
-
-
Returns
true if the non-blocking flag could be set, false otherwise, or if a socket hasn't been created.
- -

Definition at line 167 of file Socket.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
int CSocket::GetError () const
-
-
Returns
The last error code, if any.
-
Warning
This is platform dependant.
-
See Also
http://linux.die.net/man/3/errno
-
-http://msdn.microsoft.com/en-us/library/aa924071.aspx
- -

Definition at line 180 of file Socket.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1net_1_1_c_socket.js b/docs/classzen_1_1net_1_1_c_socket.js deleted file mode 100644 index c2333c0e..00000000 --- a/docs/classzen_1_1net_1_1_c_socket.js +++ /dev/null @@ -1,15 +0,0 @@ -var classzen_1_1net_1_1_c_socket = -[ - [ "CSocket", "classzen_1_1net_1_1_c_socket.html#aadda732a0df14e4b06d4386476b3c899", null ], - [ "~CSocket", "classzen_1_1net_1_1_c_socket.html#a83bd5bd7e19ba5ee120acd40a375b686", null ], - [ "InitializeLibrary", "classzen_1_1net_1_1_c_socket.html#a0768ecfdaaaeda1e949f1e46f0b44dac", null ], - [ "Init", "classzen_1_1net_1_1_c_socket.html#a91c5200490294beca76d90b68a5b4c36", null ], - [ "Destroy", "classzen_1_1net_1_1_c_socket.html#a2016666dc19a840a034fcf803d0c0054", null ], - [ "RecvFrom", "classzen_1_1net_1_1_c_socket.html#a3e336dc2c399e7d54100683678c810f3", null ], - [ "SendTo", "classzen_1_1net_1_1_c_socket.html#afa19113138a004e4c2ab06addbdbce7f", null ], - [ "SendBroadcast", "classzen_1_1net_1_1_c_socket.html#a8709897a5b3d05a7e4f881c2550f396c", null ], - [ "Ping", "classzen_1_1net_1_1_c_socket.html#afe867536a5b9d70c579a489cee597ea2", null ], - [ "SetSocketOption", "classzen_1_1net_1_1_c_socket.html#abf39b391c80e53361b7635cea8bf22ad", null ], - [ "SetNonblocking", "classzen_1_1net_1_1_c_socket.html#ac7060ccec94d8de61d88f5fe54d6a5d8", null ], - [ "GetError", "classzen_1_1net_1_1_c_socket.html#a38adda5444501d13b6d7164df62e02cb", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1net_1_1_c_socket_a38adda5444501d13b6d7164df62e02cb_icgraph.map b/docs/classzen_1_1net_1_1_c_socket_a38adda5444501d13b6d7164df62e02cb_icgraph.map deleted file mode 100644 index 06aa0858..00000000 --- a/docs/classzen_1_1net_1_1_c_socket_a38adda5444501d13b6d7164df62e02cb_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1net_1_1_c_socket_a38adda5444501d13b6d7164df62e02cb_icgraph.png b/docs/classzen_1_1net_1_1_c_socket_a38adda5444501d13b6d7164df62e02cb_icgraph.png deleted file mode 100644 index 3a0640d0..00000000 Binary files a/docs/classzen_1_1net_1_1_c_socket_a38adda5444501d13b6d7164df62e02cb_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1net_1_1_c_socket_a3e336dc2c399e7d54100683678c810f3_icgraph.map b/docs/classzen_1_1net_1_1_c_socket_a3e336dc2c399e7d54100683678c810f3_icgraph.map deleted file mode 100644 index 4d84894e..00000000 --- a/docs/classzen_1_1net_1_1_c_socket_a3e336dc2c399e7d54100683678c810f3_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1net_1_1_c_socket_a3e336dc2c399e7d54100683678c810f3_icgraph.png b/docs/classzen_1_1net_1_1_c_socket_a3e336dc2c399e7d54100683678c810f3_icgraph.png deleted file mode 100644 index 884474bd..00000000 Binary files a/docs/classzen_1_1net_1_1_c_socket_a3e336dc2c399e7d54100683678c810f3_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1net_1_1_c_socket_a8709897a5b3d05a7e4f881c2550f396c_icgraph.map b/docs/classzen_1_1net_1_1_c_socket_a8709897a5b3d05a7e4f881c2550f396c_icgraph.map deleted file mode 100644 index 7bcd639d..00000000 --- a/docs/classzen_1_1net_1_1_c_socket_a8709897a5b3d05a7e4f881c2550f396c_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1net_1_1_c_socket_a8709897a5b3d05a7e4f881c2550f396c_icgraph.png b/docs/classzen_1_1net_1_1_c_socket_a8709897a5b3d05a7e4f881c2550f396c_icgraph.png deleted file mode 100644 index 079b731a..00000000 Binary files a/docs/classzen_1_1net_1_1_c_socket_a8709897a5b3d05a7e4f881c2550f396c_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1net_1_1_c_socket_a91c5200490294beca76d90b68a5b4c36_icgraph.map b/docs/classzen_1_1net_1_1_c_socket_a91c5200490294beca76d90b68a5b4c36_icgraph.map deleted file mode 100644 index 4184a73e..00000000 --- a/docs/classzen_1_1net_1_1_c_socket_a91c5200490294beca76d90b68a5b4c36_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1net_1_1_c_socket_a91c5200490294beca76d90b68a5b4c36_icgraph.png b/docs/classzen_1_1net_1_1_c_socket_a91c5200490294beca76d90b68a5b4c36_icgraph.png deleted file mode 100644 index 9e309920..00000000 Binary files a/docs/classzen_1_1net_1_1_c_socket_a91c5200490294beca76d90b68a5b4c36_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1net_1_1_c_socket_ac7060ccec94d8de61d88f5fe54d6a5d8_icgraph.map b/docs/classzen_1_1net_1_1_c_socket_ac7060ccec94d8de61d88f5fe54d6a5d8_icgraph.map deleted file mode 100644 index 59dd638e..00000000 --- a/docs/classzen_1_1net_1_1_c_socket_ac7060ccec94d8de61d88f5fe54d6a5d8_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1net_1_1_c_socket_ac7060ccec94d8de61d88f5fe54d6a5d8_icgraph.png b/docs/classzen_1_1net_1_1_c_socket_ac7060ccec94d8de61d88f5fe54d6a5d8_icgraph.png deleted file mode 100644 index 965e426d..00000000 Binary files a/docs/classzen_1_1net_1_1_c_socket_ac7060ccec94d8de61d88f5fe54d6a5d8_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1net_1_1_c_socket_afa19113138a004e4c2ab06addbdbce7f_icgraph.map b/docs/classzen_1_1net_1_1_c_socket_afa19113138a004e4c2ab06addbdbce7f_icgraph.map deleted file mode 100644 index f8a6df13..00000000 --- a/docs/classzen_1_1net_1_1_c_socket_afa19113138a004e4c2ab06addbdbce7f_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1net_1_1_c_socket_afa19113138a004e4c2ab06addbdbce7f_icgraph.png b/docs/classzen_1_1net_1_1_c_socket_afa19113138a004e4c2ab06addbdbce7f_icgraph.png deleted file mode 100644 index 5d1febb5..00000000 Binary files a/docs/classzen_1_1net_1_1_c_socket_afa19113138a004e4c2ab06addbdbce7f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1net_1_1z_socket.html b/docs/classzen_1_1net_1_1z_socket.html index ec82a812..8c56f7f4 100644 --- a/docs/classzen_1_1net_1_1z_socket.html +++ b/docs/classzen_1_1net_1_1z_socket.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -157,10 +157,10 @@

Detailed Description

This API provides a low-level abstraction layer over a lot of unwieldy and OS-dependant socket I/O operations.

Note
There is currently only support for UDP communication via sendto() and recvfrom().
-
Todo:
Support for TCP, connect(), etc.
+
Todo:
Support for TCP, connect(), etc.
Examples:
Sockets.
-

Definition at line 105 of file Socket.hpp.

+

Definition at line 115 of file Socket.hpp.

Constructor & Destructor Documentation

@@ -184,7 +184,7 @@
-

Definition at line 108 of file Socket.hpp.

+

Definition at line 118 of file Socket.hpp.

@@ -209,7 +209,7 @@
-

Definition at line 111 of file Socket.hpp.

+

Definition at line 122 of file Socket.hpp.

@@ -270,7 +270,7 @@

Member Function Documentation

- +

@@ -341,7 +341,7 @@

Member Function Documentation

- +

@@ -399,7 +399,7 @@

Member Function Documentation

- +

@@ -436,7 +436,7 @@

Member Function Documentation

- +

@@ -521,7 +521,7 @@

Member Function Documentation

- +

@@ -552,7 +552,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.map b/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.map index 04423f56..bb3324d4 100644 --- a/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.map +++ b/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.png b/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.png index c813f170..80adcdc0 100644 Binary files a/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.png and b/docs/classzen_1_1net_1_1z_socket_a0eadf75533c4f4441896063f6f1ad43b_icgraph.png differ diff --git a/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.map b/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.map index 08b3ca0a..6f0390c0 100644 --- a/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.map +++ b/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.png b/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.png index c00bdd79..cb5a26dc 100644 Binary files a/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.png and b/docs/classzen_1_1net_1_1z_socket_a2400bbe83b9f4417246073d31bf294d4_icgraph.png differ diff --git a/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.map b/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.map index 76a6d99d..5772a8f5 100644 --- a/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.map +++ b/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.png b/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.png index 8f7f5690..20bee2a1 100644 Binary files a/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.png and b/docs/classzen_1_1net_1_1z_socket_a24fbcc65908ca3ea2e8c9ca3e3c301dd_icgraph.png differ diff --git a/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.map b/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.map index 02c5519f..7e9c0729 100644 --- a/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.map +++ b/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.png b/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.png index 5c7369b7..b932721f 100644 Binary files a/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.png and b/docs/classzen_1_1net_1_1z_socket_a302ba87aad46ba671f1e5059238e479e_icgraph.png differ diff --git a/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.map b/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.map index 7ea3d61d..c81990a6 100644 --- a/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.map +++ b/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.png b/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.png index 4aedb521..699f005b 100644 Binary files a/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.png and b/docs/classzen_1_1net_1_1z_socket_a57703ef78e748877079de834f05850b8_icgraph.png differ diff --git a/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.map b/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.map index 4e9c0207..87b019d1 100644 --- a/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.map +++ b/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.png b/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.png index 12f50dad..1d46ee38 100644 Binary files a/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.png and b/docs/classzen_1_1net_1_1z_socket_a8ff0189e585fdbe0b1545e315e6b1986_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1_c_entity.html b/docs/classzen_1_1obj_1_1_c_entity.html deleted file mode 100644 index 7629cf20..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity.html +++ /dev/null @@ -1,1508 +0,0 @@ - - - - - - -Zenderer Engine: zen::obj::CEntity Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Protected Member Functions | -Protected Attributes
-
-
zen::obj::CEntity Class Reference
Objects
-
-
- -

A base class for all "in-game" objects. - More...

- -

#include "Entity.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CEntity (asset::CAssetManager &Assets)
 
virtual ~CEntity ()
 
bool LoadFromFile (const string_t &filename)
 Creates an entity mesh from a file. More...
 
bool LoadFromTexture (const string_t &filename)
 Creates an entity from a texture file. More...
 
bool AddPrimitive (const gfx::CQuad &Prim)
 Creates an entity from an existing primitive, or adds it. More...
 
bool Optimize ()
 Merges primitive data with shared materials. More...
 
bool Draw (bool is_bound=false)
 Draws the entity on-screen. More...
 
void Move (const math::vector_t &Pos)
 Moves the entity to the specified position. More...
 
void Move (const real_t x, const real_t y, const real_t z=1.0)
 
void Adjust (const real_t dx, const real_t dy, const real_t dz=0.0)
 Adjusts an entity's position based on some values. More...
 
void Adjust (const math::vector_t &delta)
 
void Shear (const math::vector_t &Angles)
 Transforms the entity with a shear. More...
 
void Scale (const math::vector_t &Factors)
 Transforms the entity with scaling factors. More...
 
void Rotate (const real_t degrees)
 Rotate the entity in 2-dimensions (on the Z-axis). More...
 
void Invert ()
 Inverts the vertex and texture coordinates of internal primitives. More...
 
void Offload (gfxcore::CVertexArray &VAO, const bool keep=true)
 Offloads the internal primitives to the given GPU buffer. More...
 
bool Offloaded () const
 Checks if the entity has offloaded any vertex data to a GPU buffer. More...
 
void SetDepth (uint16_t depth)
 Sets the depth of the entity, for shadows or masking later on. More...
 
const math::matrix4x4_t & GetTransformation () const
 Retrieves an immutable reference to the transformation matrix. More...
 
const math::aabb_t & GetBox () const
 
math::vector_t GetPosition () const
 
real_t GetX () const
 
real_t GetY () const
 
real_t GetW () const
 
real_t GetH () const
 
uint32_t GetSortFlag () const
 
std::vector< gfx::CQuad * >
-::const_iterator 		cbegin () const
 Returns an iterator to the start of the internal primitive list. More...
 
std::vector< gfx::CQuad * >
-::const_iterator 		cend () const
 Returns an iterator to the end of the internal primitive list. More...
 
void Enable ()
 
void Disable ()
 
- - - - - - - - - -

-Protected Member Functions

 CEntity (const CEntity &)
 
CEntity & operator= (const CEntity &)
 
void Destroy ()
 
bool FileError (const string_t &filename, const string_t &line, const uint32_t line_no, const ErrorType &Err=ErrorType::BAD_PAIR)
 
- - - - - - - - - - - - - - - - - - - - - -

-Protected Attributes

asset::CAssetManager & m_Assets
 
util::CLog & m_Log
 
math::matrix4x4_t m_MV
 
math::aabb_t m_Box
 
std::vector< gfx::CQuad * > mp_allPrims
 
string_t m_filename
 
uint16_t m_depth
 
uint32_t m_sort
 
bool m_inv
 
bool m_enabled
 
-

Detailed Description

-

These differ from generic primitives in the sense that they have a lot more functionality abstracted away, as well as additional functions like animation and physics reactions (in inheriting classes). They do use the zen::gfx::CQuad class at their core, but function at a much higher level.

-

They can also be loaded from files (see the spec) and can contain multiple primitive instances.

-

When creating an entity from multiple primitives, a copy of the primitive data will be stored internally in order to prevent a bad reference later. Thus it's recommended that if you will be creating via AddPrimitive() that you either dynamically allocate the primitives and then delete later, or you ensure that they go out of scope soon to prevent useless data duplication.

-

The call to Optimize() is not necessary, but is recommended to merge identical primitives together if they use the same material, especially if you've got some CPU cycles to spare, because it will save render state switches down the road.

-
See Also
Entity Specification
-
Todo:
Allow for additional primitives not to stack up.
- -

Definition at line 49 of file Entity.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - - -
CEntity::CEntity (asset::CAssetManager & Assets)
- 		-explicit
-
- -

Definition at line 9 of file Entity.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CEntity::~CEntity ()
- 		-virtual
-
- -

Definition at line 16 of file Entity.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
zen::obj::CEntity::CEntity (const CEntity & )
- 		-protected
-
- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
bool CEntity::LoadFromFile (const string_t & filename)
-
-

There is a detailed specification for well-formed loading of single and multi-primitive entity loading with unique material attachments for each. This will implicitly call Optimize() when loading is complete.

-
Parameters
- - -
filenameThe path to the entity file.
-
-
-
Returns
true if loaded successfully, and false otherwise. There is no retrievable error, but something appropriate will be logged.
-
See Also
The entity file specification page here
- -

Definition at line 21 of file Entity.cpp.

- -
-
- -
-
- - - - - - - - -
bool CEntity::LoadFromTexture (const string_t & filename)
-
-

This will simply make a quad entity the exact width and height as the provided texture returns.

-
Parameters
- - -
filenamePath to texture
-
-
-
Returns
true if the image and entity loaded successfully, false otherwise. There is no retrievable error, but something appropriate will be logged.
- -

Definition at line 121 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CEntity::AddPrimitive (const gfx::CQuad & Prim)
-
-

This will store a copy of the primitive locally, to prevent bad references occuring later. Thus it's advisable to delete heap memory when done here, or ensure that the given primitive will go off the stack soon, to prevent uneccessary memory duplication.

-
Parameters
- - -
PrimA primitive with a non-default material attached
-
-
-
Returns
true if the primitive loaded with a valid textre, and false otherwise.
-
Note
Currently, multiple calls to this method will stack primitive on top of one another, since there is no position specification on them.
- -

Definition at line 144 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
bool CEntity::Optimize ()
-
-

If multiple internal quads share the same material data, this will merge their vertex buffer data together in order to minimize draw calls and state changes later when rendering.

-
Returns
true if any optimization was done, false otherwise.
-
Warning
Not implemented.
- -

Definition at line 165 of file Entity.cpp.

- -
-
- -
-
- - - - - - - - -
bool CEntity::Draw (bool is_bound = false)
-
-

Since entities are just collections of one or more primitives, this will simply call gfx::CQuad::Draw on each individual internal primitive.

-

If is_bound is true, the draw call will only do drawing (go figure). Otherwise, it will create an internal vertex array (on first draw), bind its local material, set up the model-view matrix, etc, and then do drawing. This allows for various scenarios and prevents the user from having to set up this data on their own if they just want to get something on-screen.

-
Parameters
- - -
is_boundIs there already buffer / material data bound?
-
-
- -

Definition at line 217 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CEntity::Move (const math::vector_t & Pos)
-
-

In future revisions, this will adjust all internal primitives accordingly, once the default primitive stacking behavior is removed.

-
Parameters
- - -
PosThe coordinate to place the entity at
-
-
-
Todo:
Support a variety of primitive depths.
- -

Definition at line 227 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
void zen::obj::CEntity::Move (const real_t x,
const real_t y,
const real_t z = 1.0 
)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
void zen::obj::CEntity::Adjust (const real_t dx,
const real_t dy,
const real_t dz = 0.0 
)
-
-
Parameters
- - - - -
dxChange in the x-direction
dyChange in the y-direction
dzChange in the z-direction
-
-
-
Note
This is equivalent to calling Move(GetPosition() + math::vector_t(dx, dy, dz));
- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
void CEntity::Adjust (const math::vector_t & delta)
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 246 of file Entity.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void zen::obj::CEntity::Shear (const math::vector_t & Angles)
- 		-inline
-
- -

Definition at line 173 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
void zen::obj::CEntity::Scale (const math::vector_t & Factors)
- 		-inline
-
- -

Definition at line 176 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void zen::obj::CEntity::Rotate (const real_t degrees)
- 		-inline
-
- -

Definition at line 179 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::obj::CEntity::Invert ()
- 		-inline
-
-

This will do nothing for existing primitives and data, and only applies to things that will be loaded after this call.

-
Precondition
Nothing has been loaded into the entity.
-
See Also
zen::gfx::CQuad::SetInverted()
- -

Definition at line 190 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - -
void CEntity::Offload (gfxcore::CVertexArray & VAO,
const bool keep = true 
)
-
-

If keep is specified (the default), the primitives will maintain their data and just offload a copy of it. Otherwise, local data will be permanently deleted until more data is added.

-
Parameters
- - - -
VAOThe vertex array to offload data to
keepKeep the vertex data locally? (optional=true)
-
-
-
Note
When permanently offloaded with keep=false, later adding more primitives or reloading more data is untested and may cause problems.
-
Warning
The data will stay on the GPU, occupying precious video memory, until the gfxcore::CVertexArray is cleared.
-
See Also
zen::gfxcore::CVertexArray::Clear()
- -

Definition at line 251 of file Entity.cpp.

- -
-
- -
-
- - - - - - - -
bool CEntity::Offloaded () const
-
- -

Definition at line 257 of file Entity.cpp.

- -
-
- -
-
- - - - - - - - -
void CEntity::SetDepth (uint16_t depth)
-
- -

Definition at line 271 of file Entity.cpp.

- -
-
- -
-
- - - - - - - -
const math::matrix4x4_t & CEntity::GetTransformation () const
-
- -

Definition at line 280 of file Entity.cpp.

- -
-
- -
-
- - - - - - - -
const math::aabb_t & CEntity::GetBox () const
-
- -

Definition at line 290 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
math::vector_t CEntity::GetPosition () const
-
- -

Definition at line 285 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::obj::CEntity::GetX () const
- 		-inline
-
- -

Definition at line 223 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::obj::CEntity::GetY () const
- 		-inline
-
- -

Definition at line 224 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::obj::CEntity::GetW () const
- 		-inline
-
- -

Definition at line 225 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
real_t zen::obj::CEntity::GetH () const
- 		-inline
-
- -

Definition at line 226 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
uint32_t CEntity::GetSortFlag () const
-
- -

Definition at line 295 of file Entity.cpp.

- -
-
- -
-
- - - - - - - -
std::vector< gfx::CQuad * >::const_iterator CEntity::cbegin () const
-
- -

Definition at line 300 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
std::vector< gfx::CQuad * >::const_iterator CEntity::cend () const
-
- -

Definition at line 305 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::obj::CEntity::Enable ()
- 		-inline
-
- -

Definition at line 236 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
void zen::obj::CEntity::Disable ()
- 		-inline
-
- -

Definition at line 237 of file Entity.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
CEntity& zen::obj::CEntity::operator= (const CEntity & )
- 		-protected
-
- -
-
- -
-
- - - - - -
- - - - - - - -
void CEntity::Destroy ()
- 		-protected
-
- -

Definition at line 171 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool CEntity::FileError (const string_t & filename,
const string_t & line,
const uint32_t line_no,
const ErrorType & Err = ErrorType::BAD_PAIR 
)
- 		-protected
-
- -

Definition at line 182 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
asset::CAssetManager& zen::obj::CEntity::m_Assets
- 		-protected
-
- -

Definition at line 251 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
util::CLog& zen::obj::CEntity::m_Log
- 		-protected
-
- -

Definition at line 252 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
math::matrix4x4_t zen::obj::CEntity::m_MV
- 		-protected
-
- -

Definition at line 254 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
math::aabb_t zen::obj::CEntity::m_Box
- 		-protected
-
- -

Definition at line 255 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
std::vector<gfx::CQuad*> zen::obj::CEntity::mp_allPrims
- 		-protected
-
- -

Definition at line 256 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
string_t zen::obj::CEntity::m_filename
- 		-protected
-
- -

Definition at line 257 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
uint16_t zen::obj::CEntity::m_depth
- 		-protected
-
- -

Definition at line 258 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
uint32_t zen::obj::CEntity::m_sort
- 		-protected
-
- -

Definition at line 259 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
bool zen::obj::CEntity::m_inv
- 		-protected
-
- -

Definition at line 260 of file Entity.hpp.

- -
-
- -
-
- - - - - -
- - - - -
bool zen::obj::CEntity::m_enabled
- 		-protected
-
- -

Definition at line 260 of file Entity.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity.js b/docs/classzen_1_1obj_1_1_c_entity.js deleted file mode 100644 index e04d5277..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity.js +++ /dev/null @@ -1,47 +0,0 @@ -var classzen_1_1obj_1_1_c_entity = -[ - [ "CEntity", "classzen_1_1obj_1_1_c_entity.html#a671c6ef43261b9c0deed7ec4a8451e33", null ], - [ "~CEntity", "classzen_1_1obj_1_1_c_entity.html#a11b9405b57ca1b32d270c6a661c11683", null ], - [ "CEntity", "classzen_1_1obj_1_1_c_entity.html#a26e8be4b1b406b27191d6a4c9630940d", null ], - [ "LoadFromFile", "classzen_1_1obj_1_1_c_entity.html#a566cefb83ad8fd96e459e69e7881c821", null ], - [ "LoadFromTexture", "classzen_1_1obj_1_1_c_entity.html#aeb1b9ade210dbb66e7e0c23042e7aa3a", null ], - [ "AddPrimitive", "classzen_1_1obj_1_1_c_entity.html#a63e5f09fdd8171e4a8f783b78eb3e430", null ], - [ "Optimize", "classzen_1_1obj_1_1_c_entity.html#ad5a5f5d9f1874acdbb44bcb4379ec87c", null ], - [ "Draw", "classzen_1_1obj_1_1_c_entity.html#a69719a869c3b6a8dd4d587236f5c82e1", null ], - [ "Move", "classzen_1_1obj_1_1_c_entity.html#a670a1ae47b5e60e281382c6a5c21e53d", null ], - [ "Move", "classzen_1_1obj_1_1_c_entity.html#a12398e18f6d83b2a32875b005ccf81c9", null ], - [ "Adjust", "classzen_1_1obj_1_1_c_entity.html#ab05281376e5c79e009306aff065abc07", null ], - [ "Adjust", "classzen_1_1obj_1_1_c_entity.html#a5b4a9fff87254d468462e82229bd7490", null ], - [ "Shear", "classzen_1_1obj_1_1_c_entity.html#a429ec24cc0bc58e796dda3c9be6bfb72", null ], - [ "Scale", "classzen_1_1obj_1_1_c_entity.html#add396dcb93edb4abadfde2b5845143c5", null ], - [ "Rotate", "classzen_1_1obj_1_1_c_entity.html#a29af9606f3ee96900399360b68c40325", null ], - [ "Invert", "classzen_1_1obj_1_1_c_entity.html#a76cd1ef51b44c3e58ba8e3c4c19a92d1", null ], - [ "Offload", "classzen_1_1obj_1_1_c_entity.html#a6aeebacf52678e8605e02bc818e2cb50", null ], - [ "Offloaded", "classzen_1_1obj_1_1_c_entity.html#a2478458913355ccb8cbb93040f27468c", null ], - [ "SetDepth", "classzen_1_1obj_1_1_c_entity.html#a98f661afcfe6c8ff5da6f4d5646563b4", null ], - [ "GetTransformation", "classzen_1_1obj_1_1_c_entity.html#a1eae20ab0ada82a7d558957059f28463", null ], - [ "GetBox", "classzen_1_1obj_1_1_c_entity.html#aa0421c82d46697cf7b3742ad7b8531c5", null ], - [ "GetPosition", "classzen_1_1obj_1_1_c_entity.html#af814d19c507e3c5e1034385818c865c2", null ], - [ "GetX", "classzen_1_1obj_1_1_c_entity.html#a7c238293a40ddbcb391e1395a0122944", null ], - [ "GetY", "classzen_1_1obj_1_1_c_entity.html#af641d54d43954900d2431fef469fb1b2", null ], - [ "GetW", "classzen_1_1obj_1_1_c_entity.html#a0ba6ac30af819c882cecd0e6fe69c25d", null ], - [ "GetH", "classzen_1_1obj_1_1_c_entity.html#a33ec43ba45077bcfcbce780403d78ca9", null ], - [ "GetSortFlag", "classzen_1_1obj_1_1_c_entity.html#a8b961d24230991eea86c734be525ba48", null ], - [ "cbegin", "classzen_1_1obj_1_1_c_entity.html#a50320d838ac9db5d3c2cba05ad75970a", null ], - [ "cend", "classzen_1_1obj_1_1_c_entity.html#a5e70cf86da7e4b0af6277f5c45716828", null ], - [ "Enable", "classzen_1_1obj_1_1_c_entity.html#a05a89c01da497112d99b0cdd8af36134", null ], - [ "Disable", "classzen_1_1obj_1_1_c_entity.html#ab252e7b7fb213c8047ef46651478990c", null ], - [ "operator=", "classzen_1_1obj_1_1_c_entity.html#ae2d7a35ffa0d1127c1d6cc164a0681f6", null ], - [ "Destroy", "classzen_1_1obj_1_1_c_entity.html#af6670334ed481cf27b779969711d45dd", null ], - [ "FileError", "classzen_1_1obj_1_1_c_entity.html#afe01427442323f71ab2e20174a71a12c", null ], - [ "m_Assets", "classzen_1_1obj_1_1_c_entity.html#a1e0602295558bc4f3b9bf106c6994798", null ], - [ "m_Log", "classzen_1_1obj_1_1_c_entity.html#af795614f802cfaf2418678b75ad2d074", null ], - [ "m_MV", "classzen_1_1obj_1_1_c_entity.html#af8b5ac0aec9223944aa96cddc4b40333", null ], - [ "m_Box", "classzen_1_1obj_1_1_c_entity.html#afaea03f9ace2d3a6521f5be9475602c4", null ], - [ "mp_allPrims", "classzen_1_1obj_1_1_c_entity.html#a9716e68cd74d264fc980294621fabbff", null ], - [ "m_filename", "classzen_1_1obj_1_1_c_entity.html#a0ea5ae5d40e12e5d5c1d9bfd9ff1893a", null ], - [ "m_depth", "classzen_1_1obj_1_1_c_entity.html#abb871fd28ffebcf62fd41d8c32da4933", null ], - [ "m_sort", "classzen_1_1obj_1_1_c_entity.html#a1430c60e31989987755c2174cd495c45", null ], - [ "m_inv", "classzen_1_1obj_1_1_c_entity.html#af1d0b75e8eab0f6c36bbbc5f6c68535a", null ], - [ "m_enabled", "classzen_1_1obj_1_1_c_entity.html#a34594239ebc364b8275f9a4578e02abb", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1obj_1_1_c_entity_a05a89c01da497112d99b0cdd8af36134_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a05a89c01da497112d99b0cdd8af36134_icgraph.map deleted file mode 100644 index ade72eb3..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a05a89c01da497112d99b0cdd8af36134_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a05a89c01da497112d99b0cdd8af36134_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a05a89c01da497112d99b0cdd8af36134_icgraph.png deleted file mode 100644 index 8d2c4ca4..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a05a89c01da497112d99b0cdd8af36134_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a0ba6ac30af819c882cecd0e6fe69c25d_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a0ba6ac30af819c882cecd0e6fe69c25d_icgraph.map deleted file mode 100644 index 53227f5b..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a0ba6ac30af819c882cecd0e6fe69c25d_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a0ba6ac30af819c882cecd0e6fe69c25d_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a0ba6ac30af819c882cecd0e6fe69c25d_icgraph.png deleted file mode 100644 index 5b1eb5f7..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a0ba6ac30af819c882cecd0e6fe69c25d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a33ec43ba45077bcfcbce780403d78ca9_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a33ec43ba45077bcfcbce780403d78ca9_icgraph.map deleted file mode 100644 index e05bd704..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a33ec43ba45077bcfcbce780403d78ca9_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a33ec43ba45077bcfcbce780403d78ca9_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a33ec43ba45077bcfcbce780403d78ca9_icgraph.png deleted file mode 100644 index 86344e22..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a33ec43ba45077bcfcbce780403d78ca9_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a429ec24cc0bc58e796dda3c9be6bfb72_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a429ec24cc0bc58e796dda3c9be6bfb72_icgraph.map deleted file mode 100644 index f0476bbd..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a429ec24cc0bc58e796dda3c9be6bfb72_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a429ec24cc0bc58e796dda3c9be6bfb72_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a429ec24cc0bc58e796dda3c9be6bfb72_icgraph.png deleted file mode 100644 index fab10d0a..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a429ec24cc0bc58e796dda3c9be6bfb72_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a50320d838ac9db5d3c2cba05ad75970a_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a50320d838ac9db5d3c2cba05ad75970a_icgraph.map deleted file mode 100644 index 46fe8def..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a50320d838ac9db5d3c2cba05ad75970a_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a50320d838ac9db5d3c2cba05ad75970a_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a50320d838ac9db5d3c2cba05ad75970a_icgraph.png deleted file mode 100644 index bea256d6..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a50320d838ac9db5d3c2cba05ad75970a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a5e70cf86da7e4b0af6277f5c45716828_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a5e70cf86da7e4b0af6277f5c45716828_icgraph.map deleted file mode 100644 index 007d44cd..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a5e70cf86da7e4b0af6277f5c45716828_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a5e70cf86da7e4b0af6277f5c45716828_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a5e70cf86da7e4b0af6277f5c45716828_icgraph.png deleted file mode 100644 index 1e7aed9a..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a5e70cf86da7e4b0af6277f5c45716828_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a63e5f09fdd8171e4a8f783b78eb3e430_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a63e5f09fdd8171e4a8f783b78eb3e430_icgraph.map deleted file mode 100644 index f2fa41e6..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a63e5f09fdd8171e4a8f783b78eb3e430_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a63e5f09fdd8171e4a8f783b78eb3e430_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a63e5f09fdd8171e4a8f783b78eb3e430_icgraph.png deleted file mode 100644 index f8c83ffe..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a63e5f09fdd8171e4a8f783b78eb3e430_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a670a1ae47b5e60e281382c6a5c21e53d_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a670a1ae47b5e60e281382c6a5c21e53d_icgraph.map deleted file mode 100644 index 544f3c9e..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a670a1ae47b5e60e281382c6a5c21e53d_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a670a1ae47b5e60e281382c6a5c21e53d_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a670a1ae47b5e60e281382c6a5c21e53d_icgraph.png deleted file mode 100644 index 02ca3e66..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a670a1ae47b5e60e281382c6a5c21e53d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a69719a869c3b6a8dd4d587236f5c82e1_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a69719a869c3b6a8dd4d587236f5c82e1_icgraph.map deleted file mode 100644 index 0ef38d9b..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a69719a869c3b6a8dd4d587236f5c82e1_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a69719a869c3b6a8dd4d587236f5c82e1_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a69719a869c3b6a8dd4d587236f5c82e1_icgraph.png deleted file mode 100644 index 11205eea..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a69719a869c3b6a8dd4d587236f5c82e1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a76cd1ef51b44c3e58ba8e3c4c19a92d1_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a76cd1ef51b44c3e58ba8e3c4c19a92d1_icgraph.map deleted file mode 100644 index a56a4870..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a76cd1ef51b44c3e58ba8e3c4c19a92d1_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a76cd1ef51b44c3e58ba8e3c4c19a92d1_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a76cd1ef51b44c3e58ba8e3c4c19a92d1_icgraph.png deleted file mode 100644 index 5cc5d374..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a76cd1ef51b44c3e58ba8e3c4c19a92d1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_a7c238293a40ddbcb391e1395a0122944_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_a7c238293a40ddbcb391e1395a0122944_icgraph.map deleted file mode 100644 index f4ab2d66..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_a7c238293a40ddbcb391e1395a0122944_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_a7c238293a40ddbcb391e1395a0122944_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_a7c238293a40ddbcb391e1395a0122944_icgraph.png deleted file mode 100644 index c844e3cd..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_a7c238293a40ddbcb391e1395a0122944_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_aa0421c82d46697cf7b3742ad7b8531c5_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_aa0421c82d46697cf7b3742ad7b8531c5_icgraph.map deleted file mode 100644 index 9577d72c..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_aa0421c82d46697cf7b3742ad7b8531c5_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_aa0421c82d46697cf7b3742ad7b8531c5_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_aa0421c82d46697cf7b3742ad7b8531c5_icgraph.png deleted file mode 100644 index 91cebeb5..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_aa0421c82d46697cf7b3742ad7b8531c5_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_ab05281376e5c79e009306aff065abc07_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_ab05281376e5c79e009306aff065abc07_icgraph.map deleted file mode 100644 index 95c8aa07..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_ab05281376e5c79e009306aff065abc07_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_ab05281376e5c79e009306aff065abc07_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_ab05281376e5c79e009306aff065abc07_icgraph.png deleted file mode 100644 index a7657bfd..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_ab05281376e5c79e009306aff065abc07_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_ab252e7b7fb213c8047ef46651478990c_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_ab252e7b7fb213c8047ef46651478990c_icgraph.map deleted file mode 100644 index a1adbdf0..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_ab252e7b7fb213c8047ef46651478990c_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_ab252e7b7fb213c8047ef46651478990c_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_ab252e7b7fb213c8047ef46651478990c_icgraph.png deleted file mode 100644 index 0d0ee01a..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_ab252e7b7fb213c8047ef46651478990c_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_aeb1b9ade210dbb66e7e0c23042e7aa3a_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_aeb1b9ade210dbb66e7e0c23042e7aa3a_icgraph.map deleted file mode 100644 index 27f909f8..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_aeb1b9ade210dbb66e7e0c23042e7aa3a_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_aeb1b9ade210dbb66e7e0c23042e7aa3a_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_aeb1b9ade210dbb66e7e0c23042e7aa3a_icgraph.png deleted file mode 100644 index 8433943c..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_aeb1b9ade210dbb66e7e0c23042e7aa3a_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_af641d54d43954900d2431fef469fb1b2_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_af641d54d43954900d2431fef469fb1b2_icgraph.map deleted file mode 100644 index 57652b60..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_af641d54d43954900d2431fef469fb1b2_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_af641d54d43954900d2431fef469fb1b2_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_af641d54d43954900d2431fef469fb1b2_icgraph.png deleted file mode 100644 index f14cd075..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_af641d54d43954900d2431fef469fb1b2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_af6670334ed481cf27b779969711d45dd_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_af6670334ed481cf27b779969711d45dd_icgraph.map deleted file mode 100644 index bc6955dd..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_af6670334ed481cf27b779969711d45dd_icgraph.map +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_af6670334ed481cf27b779969711d45dd_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_af6670334ed481cf27b779969711d45dd_icgraph.png deleted file mode 100644 index c0cc7574..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_af6670334ed481cf27b779969711d45dd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_af814d19c507e3c5e1034385818c865c2_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_af814d19c507e3c5e1034385818c865c2_icgraph.map deleted file mode 100644 index 746ff8b9..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_af814d19c507e3c5e1034385818c865c2_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_af814d19c507e3c5e1034385818c865c2_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_af814d19c507e3c5e1034385818c865c2_icgraph.png deleted file mode 100644 index 877b5a45..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_af814d19c507e3c5e1034385818c865c2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1_c_entity_afe01427442323f71ab2e20174a71a12c_icgraph.map b/docs/classzen_1_1obj_1_1_c_entity_afe01427442323f71ab2e20174a71a12c_icgraph.map deleted file mode 100644 index 80c877ed..00000000 --- a/docs/classzen_1_1obj_1_1_c_entity_afe01427442323f71ab2e20174a71a12c_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1_c_entity_afe01427442323f71ab2e20174a71a12c_icgraph.png b/docs/classzen_1_1obj_1_1_c_entity_afe01427442323f71ab2e20174a71a12c_icgraph.png deleted file mode 100644 index 7aa62491..00000000 Binary files a/docs/classzen_1_1obj_1_1_c_entity_afe01427442323f71ab2e20174a71a12c_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_animation.html b/docs/classzen_1_1obj_1_1z_animation.html index ef49e539..0400cb0e 100644 --- a/docs/classzen_1_1obj_1_1z_animation.html +++ b/docs/classzen_1_1obj_1_1z_animation.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -110,10 +110,13 @@
Public Member Functions
-
zen::obj::zAnimation Class Reference
+
zen::obj::zAnimation Class Reference
Objects
+

An animated in-game object. + More...

+

#include "Animation.hpp"

- + @@ -131,23 +134,32 @@ + + + + + + - + + + + + + + + - - + - - - - - - + + + @@ -190,18 +202,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -264,8 +276,9 @@

@@ -123,7 +126,7 @@

 ~zAnimation ()
 
bool LoadFromTexture (const string_t &filename)
 Creates an entity from a texture file. More...
 Loads an animation from a texture file. More...
 
bool LoadFromFile (const string_t &filename)
 Creates an entity mesh from a file. More...
bool AddPrimitive (const gfx::zPolygon &Prim)
 Creates an entity from an existing primitive, or adds it. More...
 
void PlayAnimation (const uint32_t loops=0)
 Plays an animation for a certain number of loops. More...
 
void StopAnimation (const int16_t frame=-1)
 Freeze the animation at a certain frame. More...
 
bool Update ()
 Purely for inheritance compatibility. More...
 Update the current animation frame if the set frame time has passed. More...
 
void OnFinish (std::function< void()> &&callback)
 Executes a callback function when all animation loops are complete. More...
 
void SetKeyframeCount (const uint16_t frames)
 Configures the number of sprites in a given spritesheet. More...
 
void SetKeyframeSize (const uint16_t w, const uint16_t h)
 Configures the dimensions of a single frame. More...
 
void SetKeyframeSize (const math::vectoru16_t &Size)
 
void SetKeyframeSize (const uint16_t w, const uint16_t h)
 
void SetKeyframeRate (const uint16_t rate)
 Configures the time, in frames, before showing the next keyframe. More...
 
void PlayAnimation (const uint32_t loops=0)
 
void StopAnimation (const int16_t frame=-1)
 
void OnFinish (std::function< void()> &&callback)
 
bool Playing () const
 Checks to see if animation is currently enabled. More...
 
- Public Member Functions inherited from zen::obj::zEntity
 zEntity (asset::zAssetManager &Assets)
 
bool Offloaded () const
 Checks if the entity has offloaded any vertex data to a GPU buffer. More...
 
bool Collides (const zEntity &Other, math::vector_t *poi=nullptr)
 Checks collision with another entity. More...
 
bool Collides (const math::rect_t &other)
 
bool Collides (const math::aabb_t &other)
 
bool Collides (const math::vector_t &Pos)
 
void SetDepth (uint8_t depth)
 Sets the depth of the entity, for shadows or masking later on. More...
 
bool Collides (const zEntity &Other, math::cquery_t *q=nullptr) const
 Checks collision with another entity, querying the point-of-impact. More...
 
bool Collides (const math::rect_t &other) const
 
bool Collides (const math::aabb_t &other) const
 
bool Collides (const math::vector_t &Pos) const
 
void SetDepth (const uint8_t depth)
 Sets the depth of the entity, for shadows or masking later on. More...
 
const math::matrix4x4_t & GetTransformation () const
 Retrieves an immutable reference to the transformation matrix. More...
 
 

Detailed Description

-
-

Definition at line 33 of file Animation.hpp.

+

This is a high-level interface designed to facilitate efficient animation routines. It has several limitations, such as its reliance on constant calls to zAnimation::Update() in your main loop, and the requirement of uniform size of keyframes within a sprite sheet.

+ +

Definition at line 34 of file Animation.hpp.

Constructor & Destructor Documentation

@@ -324,14 +337,16 @@

Member Function Documentation

-

This will simply make a quad entity the exact width and height as the provided texture returns.

+

All settings should be set prior to this loading sequence, because it relies on the sprite size setting to properly generate the animation.

+

If no frame size has been given, the entire texture is assumed to be the first and only sprite in the sprite sheet.

Parameters
- +
filenamePath to texture
filenameThe path to the sprite sheet to load
-
Returns
true if the image and entity loaded successfully, false otherwise. There is no retrievable error, but something appropriate will be logged.
+
Precondition
SetKeyframeSize() must have been called.
+
Returns
true if the texture and animation shader loaded successfully, false otherwise.

Reimplemented from zen::obj::zEntity.

@@ -381,7 +396,7 @@

Member Function Documentation

Reimplemented from zen::obj::zEntity.

-

Definition at line 40 of file Animation.hpp.

+

Definition at line 57 of file Animation.hpp.

@@ -418,7 +433,67 @@

Member Function Documentation

Reimplemented from zen::obj::zEntity.

-

Definition at line 41 of file Animation.hpp.

+

Definition at line 58 of file Animation.hpp.

+ +
+ + +
+
+ + + + + + + + +
void zAnimation::PlayAnimation (const uint32_t loops = 0)
+
+

This is not necessary to call if you wish to loop forever. By default, the animation will play indefinitely.

+
Parameters
+ + +
loopsNumber of loops to execute, 0 means infinite.
+
+
+
See Also
OnFinish()
+ +

Definition at line 101 of file Animation.cpp.

+ +
+
+ +
+
+ + + + + + + + +
void zAnimation::StopAnimation (const int16_t frame = -1)
+
+

This will stop animating the object, and will stop on the current frame by default. If you provide a parameter >= 0, the object will use that keyframe as its static sprite. This will not reset any internal ticker, so resuming the animation will likely immediately switch sprites.

+
Parameters
+ + +
frameFrame to stop on, -1 means stop on current.
+
+
+ +

Definition at line 109 of file Animation.cpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

@@ -442,6 +517,14 @@

Member Function Documentation

+

This method relies on a per-frame rate being set for the object. This method will call the given callback function if a maximum loop count was specified, and has been reached.

+

This method should be called every frame to ensure that the ticker is updated accordingly.

+

true if a frame was changed, false otherwise.

+
See Also
SetKeyframeRate()
+
+PlayAnimation()
+
+OnFinish()

Reimplemented from zen::obj::zEntity.

@@ -449,66 +532,65 @@

Member Function Documentation

- +
- + - - + +
void zAnimation::SetKeyframeCount void zAnimation::OnFinish (const uint16_t frames)std::function< void()> && callback)
+

This does not apply in infinitely looping animations, and is executed right after the given number of maximum loops has been reached. Currently the callback must be move-constructable.

+
Parameters
+ + +
callbackThe callback function you wish to execute.
+
+
+
See Also
PlayAnimation()
-

Definition at line 80 of file Animation.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

+

Definition at line 115 of file Animation.cpp.

- +
- + - - + +
void zAnimation::SetKeyframeSize void zAnimation::SetKeyframeCount (const math::vectoru16_t & Size)const uint16_t frames)
-

Definition at line 85 of file Animation.cpp.

+

Definition at line 80 of file Animation.cpp.

Here is the caller graph for this function:
-
- +
+

- +
- + @@ -527,95 +609,87 @@

Member Function Documentation

void zen::obj::zAnimation::SetKeyframeSize void zAnimation::SetKeyframeSize ( const uint16_t  w,
-
-
- -
-
- - - - - - - - -
void zAnimation::SetKeyframeRate (const uint16_t rate)
-
-

Definition at line 90 of file Animation.cpp.

Here is the caller graph for this function:
-
- - +
+ +

- +
- + - - + +
void zAnimation::PlayAnimation void zAnimation::SetKeyframeSize (const uint32_t loops = 0)const math::vectoru16_t & Size)
-

Definition at line 95 of file Animation.cpp.

+

Definition at line 85 of file Animation.cpp.

- +
- + - - + +
void zAnimation::StopAnimation void zAnimation::SetKeyframeRate (const int16_t frame = -1)const uint16_t rate)
+

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 103 of file Animation.cpp.

+

Definition at line 96 of file Animation.cpp.

Here is the caller graph for this function:
-
- - +
+ +

- +
+ + + + + +
- + - - - + +
void zAnimation::OnFinish bool zen::obj::zAnimation::Playing (std::function< void()> && callback)) const
+ 		+inline
-

Definition at line 109 of file Animation.cpp.

+

Definition at line 124 of file Animation.hpp.

diff --git a/docs/classzen_1_1obj_1_1z_animation.js b/docs/classzen_1_1obj_1_1z_animation.js index 2d00e44c..3106cc74 100644 --- a/docs/classzen_1_1obj_1_1z_animation.js +++ b/docs/classzen_1_1obj_1_1z_animation.js @@ -5,12 +5,13 @@ var classzen_1_1obj_1_1z_animation = [ "LoadFromTexture", "classzen_1_1obj_1_1z_animation.html#a8d9a58895fbc85d08a940d82eb0c156a", null ], [ "LoadFromFile", "classzen_1_1obj_1_1z_animation.html#adcba40fcbe415c8fc02eeebdc63f63ff", null ], [ "AddPrimitive", "classzen_1_1obj_1_1z_animation.html#ac435855d325d13b4ae4319d2931223f7", null ], + [ "PlayAnimation", "classzen_1_1obj_1_1z_animation.html#a64d58d1759855bbf4d673b1b6ed4c1f6", null ], + [ "StopAnimation", "classzen_1_1obj_1_1z_animation.html#ab0c8efb8cbd5959143235c46671a2f86", null ], [ "Update", "classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063", null ], + [ "OnFinish", "classzen_1_1obj_1_1z_animation.html#a7d3ef5c8303886c20ab2c38e161e35ed", null ], [ "SetKeyframeCount", "classzen_1_1obj_1_1z_animation.html#af9f2e332f17dbe5bddd6e507549c6dd7", null ], + [ "SetKeyframeSize", "classzen_1_1obj_1_1z_animation.html#a33cd5b24da0db101668b121f47de4538", null ], [ "SetKeyframeSize", "classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07", null ], - [ "SetKeyframeSize", "classzen_1_1obj_1_1z_animation.html#a45db59d983ba8e5ff681fe2757f901bc", null ], [ "SetKeyframeRate", "classzen_1_1obj_1_1z_animation.html#a7622374cda2d6d88bc9e2bcfafb7275b", null ], - [ "PlayAnimation", "classzen_1_1obj_1_1z_animation.html#a64d58d1759855bbf4d673b1b6ed4c1f6", null ], - [ "StopAnimation", "classzen_1_1obj_1_1z_animation.html#ab0c8efb8cbd5959143235c46671a2f86", null ], - [ "OnFinish", "classzen_1_1obj_1_1z_animation.html#a7d3ef5c8303886c20ab2c38e161e35ed", null ] + [ "Playing", "classzen_1_1obj_1_1z_animation.html#adfa021b895a6673393ac751286500f40", null ] ]; \ No newline at end of file diff --git a/docs/classzen_1_1obj_1_1z_animation_a03a9e61e278245b9f1155d8c6cdf964b_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_a03a9e61e278245b9f1155d8c6cdf964b_icgraph.map deleted file mode 100644 index 79bfcc62..00000000 --- a/docs/classzen_1_1obj_1_1z_animation_a03a9e61e278245b9f1155d8c6cdf964b_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1z_animation_a03a9e61e278245b9f1155d8c6cdf964b_icgraph.png b/docs/classzen_1_1obj_1_1z_animation_a03a9e61e278245b9f1155d8c6cdf964b_icgraph.png deleted file mode 100644 index 96a2d641..00000000 Binary files a/docs/classzen_1_1obj_1_1z_animation_a03a9e61e278245b9f1155d8c6cdf964b_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_animation_a3322423803a9e2ffbb4b31e78e650f07_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_a3322423803a9e2ffbb4b31e78e650f07_icgraph.map deleted file mode 100644 index d87d1807..00000000 --- a/docs/classzen_1_1obj_1_1z_animation_a3322423803a9e2ffbb4b31e78e650f07_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1z_animation_a3322423803a9e2ffbb4b31e78e650f07_icgraph.png b/docs/classzen_1_1obj_1_1z_animation_a3322423803a9e2ffbb4b31e78e650f07_icgraph.png deleted file mode 100644 index e9e0158b..00000000 Binary files a/docs/classzen_1_1obj_1_1z_animation_a3322423803a9e2ffbb4b31e78e650f07_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_animation_a33cd5b24da0db101668b121f47de4538_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_a33cd5b24da0db101668b121f47de4538_icgraph.map new file mode 100644 index 00000000..812dad1d --- /dev/null +++ b/docs/classzen_1_1obj_1_1z_animation_a33cd5b24da0db101668b121f47de4538_icgraph.map @@ -0,0 +1,4 @@ + + + + diff --git a/docs/classzen_1_1obj_1_1z_animation_a33cd5b24da0db101668b121f47de4538_icgraph.png b/docs/classzen_1_1obj_1_1z_animation_a33cd5b24da0db101668b121f47de4538_icgraph.png new file mode 100644 index 00000000..f5fcd7a5 Binary files /dev/null and b/docs/classzen_1_1obj_1_1z_animation_a33cd5b24da0db101668b121f47de4538_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_animation_a4ae9c02d6e87549c5227c0d9f9dc3e14_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_a4ae9c02d6e87549c5227c0d9f9dc3e14_icgraph.map deleted file mode 100644 index 9734d240..00000000 --- a/docs/classzen_1_1obj_1_1z_animation_a4ae9c02d6e87549c5227c0d9f9dc3e14_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1z_animation_a4ae9c02d6e87549c5227c0d9f9dc3e14_icgraph.png b/docs/classzen_1_1obj_1_1z_animation_a4ae9c02d6e87549c5227c0d9f9dc3e14_icgraph.png deleted file mode 100644 index 42b45709..00000000 Binary files a/docs/classzen_1_1obj_1_1z_animation_a4ae9c02d6e87549c5227c0d9f9dc3e14_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_animation_a8ee90d4451d23727d77c8cba9c465e88_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_a8ee90d4451d23727d77c8cba9c465e88_icgraph.map deleted file mode 100644 index 75488a48..00000000 --- a/docs/classzen_1_1obj_1_1z_animation_a8ee90d4451d23727d77c8cba9c465e88_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1z_animation_a8ee90d4451d23727d77c8cba9c465e88_icgraph.png b/docs/classzen_1_1obj_1_1z_animation_a8ee90d4451d23727d77c8cba9c465e88_icgraph.png deleted file mode 100644 index 140c23c5..00000000 Binary files a/docs/classzen_1_1obj_1_1z_animation_a8ee90d4451d23727d77c8cba9c465e88_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_animation_ab0c8efb8cbd5959143235c46671a2f86_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_ab0c8efb8cbd5959143235c46671a2f86_icgraph.map index fe08a7b8..7eca4e69 100644 --- a/docs/classzen_1_1obj_1_1z_animation_ab0c8efb8cbd5959143235c46671a2f86_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_animation_ab0c8efb8cbd5959143235c46671a2f86_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1obj_1_1z_animation_afa91f2a5f74c681f522026ec1b5cd40f_icgraph.map b/docs/classzen_1_1obj_1_1z_animation_afa91f2a5f74c681f522026ec1b5cd40f_icgraph.map deleted file mode 100644 index b63ff1f9..00000000 --- a/docs/classzen_1_1obj_1_1z_animation_afa91f2a5f74c681f522026ec1b5cd40f_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1z_animation_afa91f2a5f74c681f522026ec1b5cd40f_icgraph.png b/docs/classzen_1_1obj_1_1z_animation_afa91f2a5f74c681f522026ec1b5cd40f_icgraph.png deleted file mode 100644 index edbbece6..00000000 Binary files a/docs/classzen_1_1obj_1_1z_animation_afa91f2a5f74c681f522026ec1b5cd40f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_entity.html b/docs/classzen_1_1obj_1_1z_entity.html index 256d7699..b99675d9 100644 --- a/docs/classzen_1_1obj_1_1z_entity.html +++ b/docs/classzen_1_1obj_1_1z_entity.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -176,18 +176,18 @@ bool Offloaded () const  Checks if the entity has offloaded any vertex data to a GPU buffer. More...
  -bool Collides (const zEntity &Other, math::vector_t *poi=nullptr) - Checks collision with another entity. More...
-  -bool Collides (const math::rect_t &other) -  -bool Collides (const math::aabb_t &other) -  -bool Collides (const math::vector_t &Pos) -  -void SetDepth (uint8_t depth) - Sets the depth of the entity, for shadows or masking later on. More...
-  +bool Collides (const zEntity &Other, math::cquery_t *q=nullptr) const + Checks collision with another entity, querying the point-of-impact. More...
+  +bool Collides (const math::rect_t &other) const +  +bool Collides (const math::aabb_t &other) const +  +bool Collides (const math::vector_t &Pos) const +  +void SetDepth (const uint8_t depth) + Sets the depth of the entity, for shadows or masking later on. More...
+  const math::matrix4x4_t & GetTransformation () const  Retrieves an immutable reference to the transformation matrix. More...
  @@ -256,7 +256,7 @@

When creating an entity from multiple primitives, a copy of the primitive data will be stored internally in order to prevent a bad reference later. Thus it's recommended that if you will be creating via AddPrimitive() that you either dynamically allocate the primitives and then delete later, or you ensure that they go out of scope soon to prevent useless data duplication.

The call to Optimize() is not necessary, but is recommended to merge identical primitives together if they use the same material, especially if you've got some CPU cycles to spare, because it will save render state switches down the road.

See Also
Entity Specification
-
Todo:
Allow for additional primitives not to stack up.
+
Todo:
Allow for additional primitives not to stack up.

Definition at line 51 of file Entity.hpp.

Constructor & Destructor Documentation

@@ -388,7 +388,7 @@

Member Function Documentation

- +

@@ -427,14 +427,14 @@

Member Function Documentation

Reimplemented in zen::obj::zAnimation.

-

Definition at line 147 of file Entity.cpp.

+

Definition at line 148 of file Entity.cpp.

Here is the caller graph for this function:
- +

@@ -456,7 +456,7 @@

Member Function Documentation

Returns
true if any optimization was done, false otherwise.
Warning
Not implemented.
-

Definition at line 174 of file Entity.cpp.

+

Definition at line 178 of file Entity.cpp.

@@ -490,7 +490,7 @@

Member Function Documentation

-

Definition at line 180 of file Entity.cpp.

+

Definition at line 184 of file Entity.cpp.

Here is the caller graph for this function:
@@ -550,16 +550,16 @@

Member Function Documentation

-
Todo:
Support a variety of primitive depths.
+
Todo:
Support a variety of primitive depths.
-

Definition at line 190 of file Entity.cpp.

+

Definition at line 194 of file Entity.cpp.

Here is the caller graph for this function:
- +

@@ -634,7 +634,7 @@

Member Function Documentation

- +

@@ -684,7 +684,7 @@

Member Function Documentation

- +

@@ -705,7 +705,7 @@

Member Function Documentation

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 212 of file Entity.cpp.

+

Definition at line 214 of file Entity.cpp.

@@ -868,7 +868,7 @@

Member Function Documentation

Warning
The data will stay on the GPU, occupying precious video memory, until the gfxcore::zVertexArray is cleared.
See Also
gfxcore::zVertexArray::Clear()
-

Definition at line 217 of file Entity.cpp.

+

Definition at line 219 of file Entity.cpp.

@@ -885,11 +885,11 @@

Member Function Documentation

-

Definition at line 223 of file Entity.cpp.

+

Definition at line 225 of file Entity.cpp.

- +
@@ -902,13 +902,13 @@

Member Function Documentation

- - + + - +
math::vector_t * poi = nullptr math::cquery_t * q = nullptr 
) const
@@ -916,53 +916,49 @@

Member Function Documentation

Here is the caller graph for this function:
-
- - +
+ +

- +
- + - +
bool zEntity::Collides bool zen::obj::zEntity::Collides ( const math::rect_t &  other) const

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 246 of file Entity.cpp.

-
- +
- + - +
bool zEntity::Collides bool zen::obj::zEntity::Collides ( const math::aabb_t &  other) const

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

-

Definition at line 251 of file Entity.cpp.

-
- +
@@ -971,7 +967,7 @@

Member Function Documentation

- +
( const math::vector_t &  Pos) const
@@ -979,30 +975,21 @@

Member Function Documentation

- +
- +
void zEntity::SetDepth (uint8_t const uint8_t  depth)
-

Definition at line 267 of file Entity.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

+

Definition at line 281 of file Entity.cpp.

@@ -1019,7 +1006,7 @@

Member Function Documentation

-

Definition at line 276 of file Entity.cpp.

+

Definition at line 290 of file Entity.cpp.

@@ -1036,14 +1023,14 @@

Member Function Documentation

-

Definition at line 286 of file Entity.cpp.

+

Definition at line 300 of file Entity.cpp.

Here is the caller graph for this function:
- +

@@ -1062,14 +1049,14 @@

Member Function Documentation

-

Definition at line 281 of file Entity.cpp.

+

Definition at line 295 of file Entity.cpp.

Here is the caller graph for this function:
- +

@@ -1103,7 +1090,7 @@

Member Function Documentation

- +

@@ -1137,7 +1124,7 @@

Member Function Documentation

- +

@@ -1171,7 +1158,7 @@

Member Function Documentation

- +

@@ -1205,7 +1192,7 @@

Member Function Documentation

- +

@@ -1224,7 +1211,7 @@

Member Function Documentation

-

Definition at line 291 of file Entity.cpp.

+

Definition at line 305 of file Entity.cpp.

@@ -1241,7 +1228,7 @@

Member Function Documentation

-

Definition at line 296 of file Entity.cpp.

+

Definition at line 310 of file Entity.cpp.

@@ -1258,7 +1245,7 @@

Member Function Documentation

-

Definition at line 301 of file Entity.cpp.

+

Definition at line 315 of file Entity.cpp.

Here is the caller graph for this function:
@@ -1299,7 +1286,7 @@

Member Function Documentation

- +

@@ -1333,7 +1320,7 @@

Member Function Documentation

- +

@@ -1360,14 +1347,14 @@

Member Function Documentation

-

Definition at line 306 of file Entity.cpp.

+

Definition at line 320 of file Entity.cpp.

Here is the caller graph for this function:
- +

@@ -1417,7 +1404,7 @@

Member Function Documentation

-

Definition at line 318 of file Entity.cpp.

+

Definition at line 332 of file Entity.cpp.

Here is the caller graph for this function:
diff --git a/docs/classzen_1_1obj_1_1z_entity.js b/docs/classzen_1_1obj_1_1z_entity.js index 6845757e..bf9a7cfc 100644 --- a/docs/classzen_1_1obj_1_1z_entity.js +++ b/docs/classzen_1_1obj_1_1z_entity.js @@ -19,11 +19,11 @@ var classzen_1_1obj_1_1z_entity = [ "Invert", "classzen_1_1obj_1_1z_entity.html#a5feabee3a6c74a9cb4c75dff978d4752", null ], [ "Offload", "classzen_1_1obj_1_1z_entity.html#a5e45836b1864f010ea57b2540980022a", null ], [ "Offloaded", "classzen_1_1obj_1_1z_entity.html#a3c201ca568e29bb36c93d19339670e45", null ], - [ "Collides", "classzen_1_1obj_1_1z_entity.html#aab105bb9a975be55bec1165839c75ca3", null ], - [ "Collides", "classzen_1_1obj_1_1z_entity.html#a0fabb7a8eb2c7e4b060fd121dfcbc6ad", null ], - [ "Collides", "classzen_1_1obj_1_1z_entity.html#a0c09afd745bbde3ee9dcf17e1bf0557b", null ], - [ "Collides", "classzen_1_1obj_1_1z_entity.html#a97f63b13f8d18df82b07248ab498ffcd", null ], - [ "SetDepth", "classzen_1_1obj_1_1z_entity.html#acaf234556b4960422bc2a6882667767e", null ], + [ "Collides", "classzen_1_1obj_1_1z_entity.html#a2a8b391f1405b50097201fc3deff567f", null ], + [ "Collides", "classzen_1_1obj_1_1z_entity.html#a2e4ba22ce1d4e73fd0f863028627e952", null ], + [ "Collides", "classzen_1_1obj_1_1z_entity.html#a1be62235d46a4e5b5e1aeb7fb6df5068", null ], + [ "Collides", "classzen_1_1obj_1_1z_entity.html#a75dc7487405c30be0f668a0a4ac23207", null ], + [ "SetDepth", "classzen_1_1obj_1_1z_entity.html#a0c553e6ddb51ebc2b3bf321e92e61aea", null ], [ "GetTransformation", "classzen_1_1obj_1_1z_entity.html#a73cfeabce7776b30a3316ac58f9209a3", null ], [ "GetBox", "classzen_1_1obj_1_1z_entity.html#a0d08f234b8a4481c4aa776d965812931", null ], [ "GetPosition", "classzen_1_1obj_1_1z_entity.html#af6802dca2ddf3532e4e6648ef416e77c", null ], diff --git a/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.map index e29a0257..198b167e 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.png index 2597e744..728c47db 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a0d08f234b8a4481c4aa776d965812931_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.map index ed27b930..c289de2e 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.map @@ -2,6 +2,8 @@ - - + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.png index 0b6c14ed..2514f60b 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a14fa187a69a6c5dba0199d6fdbef8cdb_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.map index ce68e0e4..562652f7 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.map @@ -1,9 +1,10 @@ - - - - - - + + + + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.png index 86fd7d36..3d2ee403 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a19f6d5563c71ef3fb51e44f33fe830a7_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a00366ac7dabc87b32c44eb2c28824263_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a2a8b391f1405b50097201fc3deff567f_icgraph.map similarity index 100% rename from docs/classzen_1_1obj_1_1z_entity_a00366ac7dabc87b32c44eb2c28824263_icgraph.map rename to docs/classzen_1_1obj_1_1z_entity_a2a8b391f1405b50097201fc3deff567f_icgraph.map diff --git a/docs/classzen_1_1obj_1_1z_entity_a00366ac7dabc87b32c44eb2c28824263_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a2a8b391f1405b50097201fc3deff567f_icgraph.png similarity index 100% rename from docs/classzen_1_1obj_1_1z_entity_a00366ac7dabc87b32c44eb2c28824263_icgraph.png rename to docs/classzen_1_1obj_1_1z_entity_a2a8b391f1405b50097201fc3deff567f_icgraph.png diff --git a/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.map index 78dbde3c..b24ca5de 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.map @@ -1,8 +1,3 @@ - - - - - - + diff --git a/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.png index 646373c9..15f4c0d2 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a2ca996948f259af706995c06267a4bb8_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.map index 9874a03a..f16480dc 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.map @@ -1,7 +1,9 @@ - - - - - + + + + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.png index 68fdcb5a..af7ed7e1 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a2cba45d96f6b9f7e2b42d12acbf1353a_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a4eba0f2720768a511208cd4f5375ba20_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a4eba0f2720768a511208cd4f5375ba20_icgraph.map deleted file mode 100644 index 0c7eb072..00000000 --- a/docs/classzen_1_1obj_1_1z_entity_a4eba0f2720768a511208cd4f5375ba20_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1obj_1_1z_entity_a4eba0f2720768a511208cd4f5375ba20_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a4eba0f2720768a511208cd4f5375ba20_icgraph.png deleted file mode 100644 index befe08a3..00000000 Binary files a/docs/classzen_1_1obj_1_1z_entity_a4eba0f2720768a511208cd4f5375ba20_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a50ad4eb5890e556c00ccfcdb842728dd_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a50ad4eb5890e556c00ccfcdb842728dd_icgraph.map deleted file mode 100644 index dcb00ee3..00000000 --- a/docs/classzen_1_1obj_1_1z_entity_a50ad4eb5890e556c00ccfcdb842728dd_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1obj_1_1z_entity_a50ad4eb5890e556c00ccfcdb842728dd_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a50ad4eb5890e556c00ccfcdb842728dd_icgraph.png deleted file mode 100644 index b61acf79..00000000 Binary files a/docs/classzen_1_1obj_1_1z_entity_a50ad4eb5890e556c00ccfcdb842728dd_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.map index d8078021..902a66c9 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.png index 47e2c948..f0c89c0e 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a656737f613535329c7580156623e957d_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.map index 04e51d13..7512131d 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.map @@ -3,5 +3,5 @@ - + diff --git a/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.png index 0aa14980..e8707a6d 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a707b60029a9a9cbe59981022a8b8110b_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.map index 0c7eb072..27decf38 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.map @@ -1,7 +1,9 @@ - - - - + + + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.png index befe08a3..d020f5e2 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a7c8997abe3efcdcebe92dbb0d1aeff74_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.map index bac13830..c9188298 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.map @@ -1,6 +1,8 @@ - + - - + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.png index 6d1bbd38..bc1d7359 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a903736be5f221a26c27505daa4c92854_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.map index b91ea2ca..b6ff4eca 100644 --- a/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.map @@ -1,3 +1,3 @@ - + diff --git a/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.png index 903d8552..a8a5af0f 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_a98a25ae2297bb4a20e2bde022d51e087_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_aab105bb9a975be55bec1165839c75ca3_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_aab105bb9a975be55bec1165839c75ca3_icgraph.map deleted file mode 100644 index 38d75474..00000000 --- a/docs/classzen_1_1obj_1_1z_entity_aab105bb9a975be55bec1165839c75ca3_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1obj_1_1z_entity_aab105bb9a975be55bec1165839c75ca3_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_aab105bb9a975be55bec1165839c75ca3_icgraph.png deleted file mode 100644 index 2c30533f..00000000 Binary files a/docs/classzen_1_1obj_1_1z_entity_aab105bb9a975be55bec1165839c75ca3_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.map index 9c848456..7844f3ac 100644 --- a/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.map @@ -1,4 +1,6 @@ - - + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.png index cc13ea78..5c19b7e3 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_aad6f5bd0a5e765f0082b3fbd253b1f68_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_ac8615d19c6198846a0c5f13c6685f887_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_ac8615d19c6198846a0c5f13c6685f887_icgraph.map deleted file mode 100644 index d7bc2856..00000000 --- a/docs/classzen_1_1obj_1_1z_entity_ac8615d19c6198846a0c5f13c6685f887_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1obj_1_1z_entity_ac8615d19c6198846a0c5f13c6685f887_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_ac8615d19c6198846a0c5f13c6685f887_icgraph.png deleted file mode 100644 index 45c1cc27..00000000 Binary files a/docs/classzen_1_1obj_1_1z_entity_ac8615d19c6198846a0c5f13c6685f887_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_entity_acaf234556b4960422bc2a6882667767e_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_acaf234556b4960422bc2a6882667767e_icgraph.map deleted file mode 100644 index e1f2ee37..00000000 --- a/docs/classzen_1_1obj_1_1z_entity_acaf234556b4960422bc2a6882667767e_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1obj_1_1z_entity_acaf234556b4960422bc2a6882667767e_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_acaf234556b4960422bc2a6882667767e_icgraph.png deleted file mode 100644 index ef7dc6ee..00000000 Binary files a/docs/classzen_1_1obj_1_1z_entity_acaf234556b4960422bc2a6882667767e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.map index c9e8a0b7..44828381 100644 --- a/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.map @@ -1,10 +1,12 @@ - - - - - - - - + + + + + + + + + + diff --git a/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.png index b178036d..251dc028 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_aec6363ad5d3af581c4759ad8d68c43c6_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.map index d9b40dc2..e1567245 100644 --- a/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.png index 55c05316..40f99a86 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_af6802dca2ddf3532e4e6648ef416e77c_icgraph.png differ diff --git a/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.map b/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.map index df73c8e2..eb07db50 100644 --- a/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.map +++ b/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.map @@ -1,8 +1,3 @@ - - - - - - + diff --git a/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.png b/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.png index 16685e98..30384121 100644 Binary files a/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.png and b/docs/classzen_1_1obj_1_1z_entity_af9a8bd0519937b8f6f08e7d3a0fa676a_icgraph.png differ diff --git a/docs/classzen_1_1sfx_1_1_c_audio2_d.html b/docs/classzen_1_1sfx_1_1_c_audio2_d.html deleted file mode 100644 index 8915e7cd..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio2_d.html +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - -Zenderer Engine: zen::sfx::CAudio2D Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Data Structures | -Public Member Functions | -Protected Member Functions | -Protected Attributes | -Friends
-
-
zen::sfx::CAudio2D Class Referenceabstract
Audio
-
-
- -

An abstract base class for audio objects. - More...

- -

#include "Audio2D.hpp"

- - - - -

-Data Structures

struct  ALData
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

virtual ~CAudio2D ()
 
virtual bool LoadFromFile (const string_t &filename)=0
 Loads an audio file from disk. More...
 
virtual void Play ()=0
 Called once. More...
 
virtual void Update ()=0
 Called every frame after Play() More...
 
bool Ready () const
 Returns true if the stream is ready to Update() More...
 
void UnloadSource ()
 Unloads the OpenAL source handle. More...
 
ALenum GetAudioState () const
 
const void *const GetData () const
 Returns raw asset data (usually for reloading). More...
 
- Public Member Functions inherited from zen::asset::CAsset
virtual ~CAsset ()
 Logs some information. More...
 
virtual bool LoadFromExisting (const CAsset *const pCopy)
 Copies an asset from another. More...
 
virtual bool Reload ()
 Reloads oneself from whatever method it was loaded from originally. More...
 
uint32_t GetFilenameHash () const
 Returns the hashed filename for quicker comparison. More...
 
virtual assetid_t GetAssetID () const final
 Returns the unique asset ID. More...
 
const string_t & GetFilename () const
 Returns the filename used to load the asset. More...
 
const void *const GetOwner () const
 Returns address of asset owner. More...
 
const string_t & GetError () const
 Returns the last error string. More...
 
bool IsLoaded () const
 Has LoadFromFile() been called successfully? More...
 
void SetOwner (const void *const owner)
 Sets the asset owner. More...
 
void SetFilename (const string_t &filename)
 Overrides the asset filename. More...
 
- - - - - - - - - - -

-Protected Member Functions

 CAudio2D (const void *const owner=nullptr)
 
bool Destroy ()
 No copy or assignment of assets. More...
 
- Protected Member Functions inherited from zen::asset::CAsset
 CAsset (const void *const owner=nullptr)
 Only asset::CAssetManager can create CAsset instances. More...
 
- - - - - - - - - - - - - - - - - - -

-Protected Attributes

struct zen::sfx::CAudio2D::ALData m_AL
 
uint32_t m_error_code
 
bool m_loop
 
- Protected Attributes inherited from zen::asset::CAsset
util::CLog & m_Log
 
string_t m_filename
 
string_t m_error_str
 
uint32_t m_filename_hash
 
bool m_loaded
 
- - - -

-Friends

class asset::CAssetManager
 
- - - - -

-Additional Inherited Members

- Static Protected Attributes inherited from zen::asset::CAsset
static uint32_t s_seed = 0x6915BAD
 
-

Detailed Description

-

A managed audio asset object that acts as a unified base class to support playing a variety of audio formats.

- -

Definition at line 37 of file Audio2D.hpp.

-

Data Structure Documentation

- -
-
- - - - -
struct zen::sfx::CAudio2D::ALData
-
-
-

Definition at line 68 of file Audio2D.hpp.

-
- - - - - - - - - - - - - -
Data Fields
-ALuint * -buffers -
-size_t -buffer_count -
-ALuint -source -
-real_t -volume -
- -
-
-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - -
CAudio2D::~CAudio2D ()
- 		-virtual
-
- -

Definition at line 18 of file Audio2D.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CAudio2D::CAudio2D (const void *const owner = nullptr)
- 		-protected
-
- -

Definition at line 9 of file Audio2D.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
virtual bool zen::sfx::CAudio2D::LoadFromFile (const string_t & filename)
- 		-pure virtual
-
- -

Implements zen::asset::CAsset.

- -

Implemented in zen::sfx::CMusic2D, and zen::sfx::CSound2D.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual void zen::sfx::CAudio2D::Play ()
- 		-pure virtual
-
- -

Implemented in zen::sfx::CMusic2D, and zen::sfx::CSound2D.

- -
-
- -
-
- - - - - -
- - - - - - - -
virtual void zen::sfx::CAudio2D::Update ()
- 		-pure virtual
-
- -

Implemented in zen::sfx::CMusic2D, and zen::sfx::CSound2D.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::sfx::CAudio2D::Ready () const
- 		-inline
-
- -
-
- -
-
- - - - - - - -
void CAudio2D::UnloadSource ()
-
- -

Definition at line 37 of file Audio2D.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
int CAudio2D::GetAudioState () const
-
- -

Definition at line 23 of file Audio2D.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
const void *const CAudio2D::GetData () const
- 		-virtual
-
- -

Implements zen::asset::CAsset.

- -

Definition at line 32 of file Audio2D.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool zen::sfx::CAudio2D::Destroy ()
- 		-inlineprotectedvirtual
-
- -

Implements zen::asset::CAsset.

- -

Definition at line 66 of file Audio2D.hpp.

- -
-
-

Friends And Related Function Documentation

- -
-
- - - - - -
- - - - -
friend class asset::CAssetManager
- 		-friend
-
- -

Definition at line 60 of file Audio2D.hpp.

- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
struct zen::sfx::CAudio2D::ALData zen::sfx::CAudio2D::m_AL
- 		-protected
-
- -
-
- -
-
- - - - - -
- - - - -
uint32_t zen::sfx::CAudio2D::m_error_code
- 		-protected
-
- -

Definition at line 77 of file Audio2D.hpp.

- -
-
- -
-
- - - - - -
- - - - -
bool zen::sfx::CAudio2D::m_loop
- 		-protected
-
- -

Definition at line 78 of file Audio2D.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio2_d.js b/docs/classzen_1_1sfx_1_1_c_audio2_d.js deleted file mode 100644 index dd531fbf..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio2_d.js +++ /dev/null @@ -1,23 +0,0 @@ -var classzen_1_1sfx_1_1_c_audio2_d = -[ - [ "ALData", "classzen_1_1sfx_1_1_c_audio2_d.html#structzen_1_1sfx_1_1_c_audio2_d_1_1_a_l_data", [ - [ "buffers", "classzen_1_1sfx_1_1_c_audio2_d.html#a08e91bd1696222078b5e09a3870c9e67", null ], - [ "buffer_count", "classzen_1_1sfx_1_1_c_audio2_d.html#ab0685867edce5f42a7e0baa7b99536ba", null ], - [ "source", "classzen_1_1sfx_1_1_c_audio2_d.html#aa46e9553b93e6d587e3c5d08da388b1a", null ], - [ "volume", "classzen_1_1sfx_1_1_c_audio2_d.html#a5fd045f2ca9d936822c8030ac686e3c1", null ] - ] ], - [ "~CAudio2D", "classzen_1_1sfx_1_1_c_audio2_d.html#a5dc7ca735e0d95c26f112cf483245540", null ], - [ "CAudio2D", "classzen_1_1sfx_1_1_c_audio2_d.html#ac9da50dd9b2bee52e7a7cf1460d4f115", null ], - [ "LoadFromFile", "classzen_1_1sfx_1_1_c_audio2_d.html#a9469bc653fea67fca82bf2f4b2e73819", null ], - [ "Play", "classzen_1_1sfx_1_1_c_audio2_d.html#a3b7e239fe6c2e676845fc385c4b7bab2", null ], - [ "Update", "classzen_1_1sfx_1_1_c_audio2_d.html#ab2f2dcf0135d07daf4ac735ee59daec5", null ], - [ "Ready", "classzen_1_1sfx_1_1_c_audio2_d.html#aa0e76601525a3d5605e731b1a6fdad9e", null ], - [ "UnloadSource", "classzen_1_1sfx_1_1_c_audio2_d.html#ac8d099f6ee7acd8c9af20d050a515c72", null ], - [ "GetAudioState", "classzen_1_1sfx_1_1_c_audio2_d.html#aa7e21ad93cb2814a9519eb5f7513aa0e", null ], - [ "GetData", "classzen_1_1sfx_1_1_c_audio2_d.html#a6373463cc239cae7d71cc40140f633bb", null ], - [ "Destroy", "classzen_1_1sfx_1_1_c_audio2_d.html#a68df63abf75665546540e375a59b594a", null ], - [ "asset::CAssetManager", "classzen_1_1sfx_1_1_c_audio2_d.html#a29506f8739fc077481fbd74a9d37b17f", null ], - [ "m_AL", "classzen_1_1sfx_1_1_c_audio2_d.html#a7e26bbc52b6555e6fe116ebaf50cc527", null ], - [ "m_error_code", "classzen_1_1sfx_1_1_c_audio2_d.html#a93f482a8e975a9f6130f1366a70d702f", null ], - [ "m_loop", "classzen_1_1sfx_1_1_c_audio2_d.html#a4a83aad12f3ce5ca4156398153cedb62", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1sfx_1_1_c_audio2_d_aa7e21ad93cb2814a9519eb5f7513aa0e_icgraph.map b/docs/classzen_1_1sfx_1_1_c_audio2_d_aa7e21ad93cb2814a9519eb5f7513aa0e_icgraph.map deleted file mode 100644 index 9e06788e..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio2_d_aa7e21ad93cb2814a9519eb5f7513aa0e_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio2_d_aa7e21ad93cb2814a9519eb5f7513aa0e_icgraph.png b/docs/classzen_1_1sfx_1_1_c_audio2_d_aa7e21ad93cb2814a9519eb5f7513aa0e_icgraph.png deleted file mode 100644 index 54ef1180..00000000 Binary files a/docs/classzen_1_1sfx_1_1_c_audio2_d_aa7e21ad93cb2814a9519eb5f7513aa0e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1sfx_1_1_c_audio2_d_ac8d099f6ee7acd8c9af20d050a515c72_icgraph.map b/docs/classzen_1_1sfx_1_1_c_audio2_d_ac8d099f6ee7acd8c9af20d050a515c72_icgraph.map deleted file mode 100644 index 5f39f009..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio2_d_ac8d099f6ee7acd8c9af20d050a515c72_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio2_d_ac8d099f6ee7acd8c9af20d050a515c72_icgraph.png b/docs/classzen_1_1sfx_1_1_c_audio2_d_ac8d099f6ee7acd8c9af20d050a515c72_icgraph.png deleted file mode 100644 index 97a1084c..00000000 Binary files a/docs/classzen_1_1sfx_1_1_c_audio2_d_ac8d099f6ee7acd8c9af20d050a515c72_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager.html b/docs/classzen_1_1sfx_1_1_c_audio_manager.html deleted file mode 100644 index 48358532..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio_manager.html +++ /dev/null @@ -1,436 +0,0 @@ - - - - - - -Zenderer Engine: zen::sfx::CAudioManager Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Static Public Member Functions
-
-
zen::sfx::CAudioManager Class Reference
Audio
-
-
- -

A collection of static helper functions for the audio API. - More...

- -

#include "AudioManager.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - -

-Static Public Member Functions

static bool Init ()
 Initializes OpenAL. More...
 
static int GetAvailableSourceIndex ()
 Finds an available audio source to use for a buffer. More...
 
static int GetAvailableSource (const uint16_t index)
 Actually returns the OpenAL source handle. More...
 
static ALuint CreateSource ()
 Creates an OpenAL source handle and returns its handle. More...
 
static bool FreeSource (ALuint index)
 Frees an OpenAL source. More...
 
static bool alCheck (const char *expr, const uint32_t line, const char *file)
 Checks the validity of an OpenAL call. More...
 
static void OGGError (const int error_code)
 Logs and outputs a readable error from an OGG error code. More...
 
static bool IsInit ()
 Is OpenAL initialized? More...
 
-

Detailed Description

-

This class provides a variety of static convenience functions for the various audio asset instance classes to use in order to find available OpenAL sources.

-

OpenAL is limited to 256 buffers, and despite the fact that they likely will never all be in use simultaneously, there is still no sense in being greedy. This class should be the one and only way that external audio classes get an available OpenAL source.

-

The architecture for controlling sources is as follows:

-

There exists a static array of 256 potential sources, zeroed out. As audio is played, the array fills up with source data, starting from [0]. So, the first call to GetAvailableSource() would return 0 and after a call to alGenSources it would be filled with some arbitrary data. So thus

-
CAudioManager::s_sources[0] = 12345
-

Then, a subsequent call to GetAvailableSource() would return 1 and the process repeats. Now, let's say the first source is done playing an .ogg file and CMusic2D::FreeSource() is called. Now the first available source is s_sources[0], but due to the nature of the source-finding algorithm, GetAvailableSource() will return 2, because it first searches the index immediately following the last-used source before starting from the beginning. Hence (assuming 2 is then used):

-
CAudioManager::s_sources[0] = 0
-CAudioManager::s_sources[1] = 223344
-CAudioManager::s_sources[2] = 696969
-

Definition at line 58 of file AudioManager.hpp.

-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CAudioManager::Init ()
- 		-static
-
- -

Definition at line 13 of file AudioManager.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
int CAudioManager::GetAvailableSourceIndex ()
- 		-static
-
-

If all of the sources are completely used up, this function will return -1, and someone needs to call FreeSource() on an audio file to free up some sources to use.

-
Returns
An index to the next available OpenAL source buffer.
- -

Definition at line 32 of file AudioManager.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
int CAudioManager::GetAvailableSource (const uint16_t index)
- 		-static
-
- -

Definition at line 60 of file AudioManager.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
ALuint CAudioManager::CreateSource ()
- 		-static
-
- -

Definition at line 67 of file AudioManager.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool CAudioManager::FreeSource (ALuint index)
- 		-static
-
- -

Definition at line 85 of file AudioManager.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
bool CAudioManager::alCheck (const char * expr,
const uint32_t line,
const char * file 
)
- 		-static
-
-

Mostly used internally for debugging, this will check valid execution of an OpenAL call. It should be used in congruence with the macro defined at the top of this file (AL(f)). This function won't really work well without the macro, as too many things have to be passed as parameters for accuracy; it'd be unwieldy to pass the string of the OpenAL function call by hand every time.

-
Parameters
- - - - -
exprOpenAL call expression
lineLine number of function call
fileFile name of function call
-
-
-
Returns
true if there was no error, and false otherwise, though the assertion will exit.
- -

Definition at line 102 of file AudioManager.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CAudioManager::OGGError (const int error_code)
- 		-static
-
- -

Definition at line 125 of file AudioManager.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CAudioManager::IsInit ()
- 		-static
-
- -

Definition at line 163 of file AudioManager.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager.js b/docs/classzen_1_1sfx_1_1_c_audio_manager.js deleted file mode 100644 index cac62605..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio_manager.js +++ /dev/null @@ -1,11 +0,0 @@ -var classzen_1_1sfx_1_1_c_audio_manager = -[ - [ "Init", "classzen_1_1sfx_1_1_c_audio_manager.html#a9ae7e2a83f5eba6f92adf07622eae4c8", null ], - [ "GetAvailableSourceIndex", "classzen_1_1sfx_1_1_c_audio_manager.html#aebc219ee89c86e8ed3fbd0684e1ced9f", null ], - [ "GetAvailableSource", "classzen_1_1sfx_1_1_c_audio_manager.html#ab652bcb2955fb97b098f3790daa34f61", null ], - [ "CreateSource", "classzen_1_1sfx_1_1_c_audio_manager.html#a5c00dd3076e14440b4f6d5ee17cd5ea1", null ], - [ "FreeSource", "classzen_1_1sfx_1_1_c_audio_manager.html#aa8af6f0acd2111500659b038fb256e01", null ], - [ "alCheck", "classzen_1_1sfx_1_1_c_audio_manager.html#a400e4194c5b8a08a72f8d00065f1eb2d", null ], - [ "OGGError", "classzen_1_1sfx_1_1_c_audio_manager.html#a99b8e3ee406f5571bce717ee2c30ecb1", null ], - [ "IsInit", "classzen_1_1sfx_1_1_c_audio_manager.html#a0e37c14ea1008f7a514cbfc5b67a0914", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager_a0e37c14ea1008f7a514cbfc5b67a0914_icgraph.map b/docs/classzen_1_1sfx_1_1_c_audio_manager_a0e37c14ea1008f7a514cbfc5b67a0914_icgraph.map deleted file mode 100644 index e397bee0..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio_manager_a0e37c14ea1008f7a514cbfc5b67a0914_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager_a0e37c14ea1008f7a514cbfc5b67a0914_icgraph.png b/docs/classzen_1_1sfx_1_1_c_audio_manager_a0e37c14ea1008f7a514cbfc5b67a0914_icgraph.png deleted file mode 100644 index 2217da00..00000000 Binary files a/docs/classzen_1_1sfx_1_1_c_audio_manager_a0e37c14ea1008f7a514cbfc5b67a0914_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager_a5c00dd3076e14440b4f6d5ee17cd5ea1_icgraph.map b/docs/classzen_1_1sfx_1_1_c_audio_manager_a5c00dd3076e14440b4f6d5ee17cd5ea1_icgraph.map deleted file mode 100644 index 30c4c7ea..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio_manager_a5c00dd3076e14440b4f6d5ee17cd5ea1_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager_a5c00dd3076e14440b4f6d5ee17cd5ea1_icgraph.png b/docs/classzen_1_1sfx_1_1_c_audio_manager_a5c00dd3076e14440b4f6d5ee17cd5ea1_icgraph.png deleted file mode 100644 index 44d11134..00000000 Binary files a/docs/classzen_1_1sfx_1_1_c_audio_manager_a5c00dd3076e14440b4f6d5ee17cd5ea1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager_aa8af6f0acd2111500659b038fb256e01_icgraph.map b/docs/classzen_1_1sfx_1_1_c_audio_manager_aa8af6f0acd2111500659b038fb256e01_icgraph.map deleted file mode 100644 index bc7c75a8..00000000 --- a/docs/classzen_1_1sfx_1_1_c_audio_manager_aa8af6f0acd2111500659b038fb256e01_icgraph.map +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/docs/classzen_1_1sfx_1_1_c_audio_manager_aa8af6f0acd2111500659b038fb256e01_icgraph.png b/docs/classzen_1_1sfx_1_1_c_audio_manager_aa8af6f0acd2111500659b038fb256e01_icgraph.png deleted file mode 100644 index ebc06eaf..00000000 Binary files a/docs/classzen_1_1sfx_1_1_c_audio_manager_aa8af6f0acd2111500659b038fb256e01_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1sfx_1_1_c_music2_d.html b/docs/classzen_1_1sfx_1_1_c_music2_d.html deleted file mode 100644 index 59cbdc5b..00000000 --- a/docs/classzen_1_1sfx_1_1_c_music2_d.html +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - -Zenderer Engine: zen::sfx::CMusic2D Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::sfx::CMusic2D Class Reference
Audio
-
-
- -

Music files (.ogg files) - More...

- -

#include "Music2D.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

virtual ~CMusic2D ()
 
bool LoadFromFile (const string_t &filename)
 Loads an .ogg file from disk. More...
 
void Play ()
 Plays the file (if loaded). More...
 
void Update ()
 Updates the internal file stream for continuous play. More...
 
bool Ready () const
 Is the stream ready to call Update()? More...
 
- Public Member Functions inherited from zen::sfx::CAudio2D
virtual ~CAudio2D ()
 
bool Ready () const
 Returns true if the stream is ready to Update() More...
 
void UnloadSource ()
 Unloads the OpenAL source handle. More...
 
ALenum GetAudioState () const
 
const void *const GetData () const
 Returns raw asset data (usually for reloading). More...
 
- Public Member Functions inherited from zen::asset::CAsset
virtual ~CAsset ()
 Logs some information. More...
 
virtual bool LoadFromExisting (const CAsset *const pCopy)
 Copies an asset from another. More...
 
virtual bool Reload ()
 Reloads oneself from whatever method it was loaded from originally. More...
 
uint32_t GetFilenameHash () const
 Returns the hashed filename for quicker comparison. More...
 
virtual assetid_t GetAssetID () const final
 Returns the unique asset ID. More...
 
const string_t & GetFilename () const
 Returns the filename used to load the asset. More...
 
const void *const GetOwner () const
 Returns address of asset owner. More...
 
const string_t & GetError () const
 Returns the last error string. More...
 
bool IsLoaded () const
 Has LoadFromFile() been called successfully? More...
 
void SetOwner (const void *const owner)
 Sets the asset owner. More...
 
void SetFilename (const string_t &filename)
 Overrides the asset filename. More...
 
- - - - - - - - - - - - - - - - - -

-Additional Inherited Members

- Protected Member Functions inherited from zen::sfx::CAudio2D
 CAudio2D (const void *const owner=nullptr)
 
bool Destroy ()
 No copy or assignment of assets. More...
 
- Protected Attributes inherited from zen::sfx::CAudio2D
struct zen::sfx::CAudio2D::ALData m_AL
 
uint32_t m_error_code
 
bool m_loop
 
- Static Protected Attributes inherited from zen::asset::CAsset
static uint32_t s_seed = 0x6915BAD
 
-

Detailed Description

-

A managed asset that will stream large files in the Ogg-Vorbis (.ogg) file format. This format is not recommended for files smaller than 96kB, due to the streaming nature that stores 96kB of data at a time. A better alternative would be to use the zen::sfx::CSound2D class in combination with an uncompressed .wav file.

- -

Definition at line 33 of file Music2D.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - -
- - - - - - - -
CMusic2D::~CMusic2D ()
- 		-virtual
-
- -

Definition at line 21 of file Music2D.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
bool CMusic2D::LoadFromFile (const string_t & filename)
- 		-virtual
-
- -

Implements zen::sfx::CAudio2D.

- -

Definition at line 26 of file Music2D.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void CMusic2D::Play ()
- 		-virtual
-
-

This should only be called a single time, and then subsequent calls should be to Update().

- -

Implements zen::sfx::CAudio2D.

- -

Definition at line 91 of file Music2D.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
void CMusic2D::Update ()
- 		-virtual
-
- -

Implements zen::sfx::CAudio2D.

- -

Definition at line 126 of file Music2D.cpp.

- -
-
- -
-
- - - - - - - -
bool CMusic2D::Ready () const
-
- -

Definition at line 148 of file Music2D.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1sfx_1_1_c_music2_d.js b/docs/classzen_1_1sfx_1_1_c_music2_d.js deleted file mode 100644 index 187369c5..00000000 --- a/docs/classzen_1_1sfx_1_1_c_music2_d.js +++ /dev/null @@ -1,8 +0,0 @@ -var classzen_1_1sfx_1_1_c_music2_d = -[ - [ "~CMusic2D", "classzen_1_1sfx_1_1_c_music2_d.html#aa46b12dc8f5701b3e5bb8fa7667fbc5a", null ], - [ "LoadFromFile", "classzen_1_1sfx_1_1_c_music2_d.html#aea18978c4f032e54668487698bfe78d7", null ], - [ "Play", "classzen_1_1sfx_1_1_c_music2_d.html#a58fcd70bb15d3203b71ccc458014cf36", null ], - [ "Update", "classzen_1_1sfx_1_1_c_music2_d.html#aa2d07ee000b0dfeabc800f46f580b649", null ], - [ "Ready", "classzen_1_1sfx_1_1_c_music2_d.html#ad8453333272f08243b7fc9c0e49dd78b", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1sfx_1_1_c_sound2_d.html b/docs/classzen_1_1sfx_1_1_c_sound2_d.html index 448fef05..c78b06e0 100644 --- a/docs/classzen_1_1sfx_1_1_c_sound2_d.html +++ b/docs/classzen_1_1sfx_1_1_c_sound2_d.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -256,7 +256,7 @@

Member Function Documentation

-
Todo:
Use some standardized WAV loading library.
+
Todo:
Use some standardized WAV loading library.

Implements zen::sfx::zAudio2D.

diff --git a/docs/classzen_1_1sfx_1_1z_audio2_d.html b/docs/classzen_1_1sfx_1_1z_audio2_d.html index ff1a57d0..ae670da5 100644 --- a/docs/classzen_1_1sfx_1_1z_audio2_d.html +++ b/docs/classzen_1_1sfx_1_1z_audio2_d.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1sfx_1_1z_audio_manager.html b/docs/classzen_1_1sfx_1_1z_audio_manager.html index 9091f765..ae112cc6 100644 --- a/docs/classzen_1_1sfx_1_1z_audio_manager.html +++ b/docs/classzen_1_1sfx_1_1z_audio_manager.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1sfx_1_1z_music2_d.html b/docs/classzen_1_1sfx_1_1z_music2_d.html index a5c248a8..714f4084 100644 --- a/docs/classzen_1_1sfx_1_1z_music2_d.html +++ b/docs/classzen_1_1sfx_1_1z_music2_d.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser.html b/docs/classzen_1_1util_1_1_c_i_n_i_parser.html deleted file mode 100644 index e6061ed8..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser.html +++ /dev/null @@ -1,653 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::CINIParser Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Types | -Public Member Functions | -Static Public Member Functions
-
-
zen::util::CINIParser Class Reference
Utilities
-
-
- -

Parses files based on key=value1,...,valueN pairs, like in .ini files. - More...

- -

#include "INIParser.hpp"

- - - - -

-Public Types

typedef std::map< string_t,
-string_t > 		pair_t
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CINIParser ()
 
virtual ~CINIParser ()
 
bool LoadFromFile (const string_t &filename)
 Fills the dictionary with key=value pairs for the entire file. More...
 
bool LoadFromStream (std::ifstream &file, const std::streampos &start=0, const std::streampos &finish=-1, const char *fn="file")
 Fills the key-value dictionary by parsing a file stream. More...
 
bool LoadFromStream (const char **str, const uint32_t start, const uint32_t finish)
 
void Reset ()
 Clears the dictionary. More...
 
bool Exists (const string_t &key) const
 Was the key found in the file stream? More...
 
const string_t & GetValue (const string_t &key) const
 Retrieves a value based on a key in the dictionary. More...
 
int GetValuei (const string_t &key) const
 Attempts to return an integer representation of a value. More...
 
bool GetValueb (const string_t &key) const
 Attempts to return a boolean representation of a value. More...
 
real_t GetValuer (const string_t &key) const
 Attempts to return a floating point representation of a value. More...
 
std::vector< string_t > GetValues (const string_t &key, const char delimiter= ',') const
 Returns an array of values from a key-value pair based on a char. More...
 
pair_t & GetPairs ()
 Direct access to the dictionary. More...
 
const pair_t & GetPairs () const
 Direct immutable access to the dictionary. More...
 
- - - - -

-Static Public Member Functions

static std::streampos FindInFile (std::ifstream &stream, const string_t &finder, const std::streampos &max_pos=-1)
 Finds the first instance of a string within a file stream. More...
 
-

Detailed Description

-

This file parser defines a very generic type of parsing, since most files (meshes, levels) in Zenderer use a similar formatting. For example, in a ZenLevel (see specs/ZenLevel) , an entity can be placed like so:

-
<entity>
-    texture=Quad.tga
-    position=100,200
-</entity>
-

So you can see that values are split up by an '=' delimiter. Thus, this generic parser can create a dictionary of values that can then be easily accessed. This eliminates the need to read the file sequentially and worry about what might come later and what options are defined while you're reading. Now, you can read in the file (or portion of a file), and then access the values by key, given that they exist. The parser will complete ignore lines beginning with the forward slash ('/') character (after stripping leading whitespace) and the less-than character ('<'), since these are typically tags ("<likethis>") and comments ("// like this").

-
Examples:
Parsing.
-
-

Definition at line 41 of file INIParser.hpp.

-

Member Typedef Documentation

- -
-
- - - - -
typedef std::map<string_t, string_t> zen::util::CINIParser::pair_t
-
- -

Definition at line 47 of file INIParser.hpp.

- -
-
-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
CINIParser::CINIParser ()
-
- -

Definition at line 10 of file INIParser.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CINIParser::~CINIParser ()
- 		-virtual
-
- -

Definition at line 15 of file INIParser.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
bool CINIParser::LoadFromFile (const string_t & filename)
-
-
Parameters
- - -
filenamePath to file to parse
-
-
-
Returns
true if file was parsed successfully false otherwise.
-
Examples:
Parsing.
-
-

Definition at line 20 of file INIParser.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool zen::util::CINIParser::LoadFromStream (std::ifstream & file,
const std::streampos & start = 0,
const std::streampos & finish = -1,
const char * fn = "file" 
)
-
-

This is more versatile than the generic LoadFromFile(), since you can specify where in the stream you would like to start and where you would like to end. By default, the whole file is read. This comes in handy if a file, for example, has several entity specifications, so there's more than one "texture" key. Thus you could read until "<entity>", mark that, read till "</entity>", mark that, then pass the stream to this method and it would only give you the key-value pairs found in that section of the file.

-
Parameters
- - - - - -
fileFile stream to read
startStarting point in the stream (opt=0)
finishEnding point in the stream (opt=END)
fnFilename the stream comes from (opt="file")
-
-
-
Returns
true if at least one pair was parsed, false otherwise, or if the given filestream was not open.
- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
bool zen::util::CINIParser::LoadFromStream (const char ** str,
const uint32_t start,
const uint32_t finish 
)
-
- -
-
- -
-
- - - - - - - -
void CINIParser::Reset ()
-
- -

Definition at line 94 of file INIParser.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
bool CINIParser::Exists (const string_t & key) const
-
- -

Definition at line 99 of file INIParser.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - - -
const string_t & CINIParser::GetValue (const string_t & key) const
-
-

If the file stream contained texture=Data.tga, and you called GetValue("texture"), the function gives back "Data.tga".

-
Parameters
- - -
keyKey to access
-
-
-
Returns
Value if it exists, empty string otherwise.
- -

Definition at line 104 of file INIParser.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
int CINIParser::GetValuei (const string_t & key) const
- 		-inline
-
-
Warning
No error checking is performed on conversion.
- -

Definition at line 2 of file INIParser.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
bool CINIParser::GetValueb (const string_t & key) const
- 		-inline
-
-
Warning
No error checking is performed on conversion.
- -

Definition at line 7 of file INIParser.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
real_t CINIParser::GetValuer (const string_t & key) const
- 		-inline
-
-
Warning
No error checking is performed on conversion.
- -

Definition at line 13 of file INIParser.hpp.

- -
-
- -
-
- - - - - - - -
CINIParser::pair_t & CINIParser::GetPairs ()
-
- -

Definition at line 113 of file INIParser.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
const pair_t& zen::util::CINIParser::GetPairs () const
-
- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
std::streampos CINIParser::FindInFile (std::ifstream & stream,
const string_t & finder,
const std::streampos & max_pos = -1 
)
- 		-static
-
-

This function basically reads a file until it finds an instance of finder in the current line OR up until it reaches the optional max_pos argument, which specifies a position in the stream to stop at, whichever comes first. If max_pos is left at the default, -1, the search is done till EOF (or some other reason causing std::getline to return false).

-

The function will return the stream to its starting point as it was when the function was called.

-
Parameters
- - - - -
streamStream to search
finderString to find
max_posPlace to stop search (optional=EOF)
-
-
-
Returns
Position the requested string was found at, std::streampos(-1) if it was not found.
-
Note
Stream is left at the same point it started at.
- -

Definition at line 118 of file INIParser.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser.js b/docs/classzen_1_1util_1_1_c_i_n_i_parser.js deleted file mode 100644 index 615733e6..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser.js +++ /dev/null @@ -1,19 +0,0 @@ -var classzen_1_1util_1_1_c_i_n_i_parser = -[ - [ "pair_t", "classzen_1_1util_1_1_c_i_n_i_parser.html#afeefbaa65dfdd868ba009c8a8531428c", null ], - [ "CINIParser", "classzen_1_1util_1_1_c_i_n_i_parser.html#a20c84eda45d2687f2ff9c1c9269a5083", null ], - [ "~CINIParser", "classzen_1_1util_1_1_c_i_n_i_parser.html#a47316c05513638fd204ed6abd9aa0c06", null ], - [ "LoadFromFile", "classzen_1_1util_1_1_c_i_n_i_parser.html#ac145ac752bbd1b59ebfe0e861ca81ac8", null ], - [ "LoadFromStream", "classzen_1_1util_1_1_c_i_n_i_parser.html#ae4e9f633811f25ba63eff847cd232cae", null ], - [ "LoadFromStream", "classzen_1_1util_1_1_c_i_n_i_parser.html#aa4bf277e6c50fd30e2ccd91e36a8b135", null ], - [ "Reset", "classzen_1_1util_1_1_c_i_n_i_parser.html#af3b867e089ded53f3540e53a08236f5e", null ], - [ "Exists", "classzen_1_1util_1_1_c_i_n_i_parser.html#a3d2eb50f3d14625e6a400a736e5374de", null ], - [ "GetValue", "classzen_1_1util_1_1_c_i_n_i_parser.html#a77da4e38e36caf33478187327dcecd56", null ], - [ "GetValuei", "classzen_1_1util_1_1_c_i_n_i_parser.html#aef355b201c3c5efd3ada50f1f694ca9c", null ], - [ "GetValueb", "classzen_1_1util_1_1_c_i_n_i_parser.html#aea41451a7d888f37f556828cb4dc5535", null ], - [ "GetValuer", "classzen_1_1util_1_1_c_i_n_i_parser.html#ab8710e9bf49c30e6567434bc2f688c37", null ], - [ "GetValues", "group___utilities.html#gac57686358966190d7c29a88ff1c87429", null ], - [ "GetPairs", "classzen_1_1util_1_1_c_i_n_i_parser.html#a76bcd06c50e0356a80b3ee034123aadc", null ], - [ "GetPairs", "classzen_1_1util_1_1_c_i_n_i_parser.html#ab5ba9999369bf4454a64db8d45b5ee5e", null ], - [ "FindInFile", "classzen_1_1util_1_1_c_i_n_i_parser.html#a6dcd1b91f04642dbee87b4d7b4d9909f", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a3d2eb50f3d14625e6a400a736e5374de_icgraph.map b/docs/classzen_1_1util_1_1_c_i_n_i_parser_a3d2eb50f3d14625e6a400a736e5374de_icgraph.map deleted file mode 100644 index 7f7fe846..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a3d2eb50f3d14625e6a400a736e5374de_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a3d2eb50f3d14625e6a400a736e5374de_icgraph.png b/docs/classzen_1_1util_1_1_c_i_n_i_parser_a3d2eb50f3d14625e6a400a736e5374de_icgraph.png deleted file mode 100644 index ffa60cb7..00000000 Binary files a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a3d2eb50f3d14625e6a400a736e5374de_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a76bcd06c50e0356a80b3ee034123aadc_icgraph.map b/docs/classzen_1_1util_1_1_c_i_n_i_parser_a76bcd06c50e0356a80b3ee034123aadc_icgraph.map deleted file mode 100644 index 66a31a1b..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a76bcd06c50e0356a80b3ee034123aadc_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a76bcd06c50e0356a80b3ee034123aadc_icgraph.png b/docs/classzen_1_1util_1_1_c_i_n_i_parser_a76bcd06c50e0356a80b3ee034123aadc_icgraph.png deleted file mode 100644 index 37a37860..00000000 Binary files a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a76bcd06c50e0356a80b3ee034123aadc_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a77da4e38e36caf33478187327dcecd56_icgraph.map b/docs/classzen_1_1util_1_1_c_i_n_i_parser_a77da4e38e36caf33478187327dcecd56_icgraph.map deleted file mode 100644 index fd692105..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a77da4e38e36caf33478187327dcecd56_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a77da4e38e36caf33478187327dcecd56_icgraph.png b/docs/classzen_1_1util_1_1_c_i_n_i_parser_a77da4e38e36caf33478187327dcecd56_icgraph.png deleted file mode 100644 index 382f1615..00000000 Binary files a/docs/classzen_1_1util_1_1_c_i_n_i_parser_a77da4e38e36caf33478187327dcecd56_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ac145ac752bbd1b59ebfe0e861ca81ac8_icgraph.map b/docs/classzen_1_1util_1_1_c_i_n_i_parser_ac145ac752bbd1b59ebfe0e861ca81ac8_icgraph.map deleted file mode 100644 index 2f3345bd..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ac145ac752bbd1b59ebfe0e861ca81ac8_icgraph.map +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ac145ac752bbd1b59ebfe0e861ca81ac8_icgraph.png b/docs/classzen_1_1util_1_1_c_i_n_i_parser_ac145ac752bbd1b59ebfe0e861ca81ac8_icgraph.png deleted file mode 100644 index a6ebc203..00000000 Binary files a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ac145ac752bbd1b59ebfe0e861ca81ac8_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ae4e9f633811f25ba63eff847cd232cae_icgraph.map b/docs/classzen_1_1util_1_1_c_i_n_i_parser_ae4e9f633811f25ba63eff847cd232cae_icgraph.map deleted file mode 100644 index 479f8207..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ae4e9f633811f25ba63eff847cd232cae_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ae4e9f633811f25ba63eff847cd232cae_icgraph.png b/docs/classzen_1_1util_1_1_c_i_n_i_parser_ae4e9f633811f25ba63eff847cd232cae_icgraph.png deleted file mode 100644 index f583261f..00000000 Binary files a/docs/classzen_1_1util_1_1_c_i_n_i_parser_ae4e9f633811f25ba63eff847cd232cae_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_af3b867e089ded53f3540e53a08236f5e_icgraph.map b/docs/classzen_1_1util_1_1_c_i_n_i_parser_af3b867e089ded53f3540e53a08236f5e_icgraph.map deleted file mode 100644 index 34761d05..00000000 --- a/docs/classzen_1_1util_1_1_c_i_n_i_parser_af3b867e089ded53f3540e53a08236f5e_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1util_1_1_c_i_n_i_parser_af3b867e089ded53f3540e53a08236f5e_icgraph.png b/docs/classzen_1_1util_1_1_c_i_n_i_parser_af3b867e089ded53f3540e53a08236f5e_icgraph.png deleted file mode 100644 index aaf376f4..00000000 Binary files a/docs/classzen_1_1util_1_1_c_i_n_i_parser_af3b867e089ded53f3540e53a08236f5e_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_log.html b/docs/classzen_1_1util_1_1_c_log.html deleted file mode 100644 index f54565b6..00000000 --- a/docs/classzen_1_1util_1_1_c_log.html +++ /dev/null @@ -1,814 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::CLog Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions | -Static Public Attributes | -Friends
-
-
zen::util::CLog Class Reference
Utilities
-
-
- -

Creates a special file stream to store logging information. - More...

- -

#include "Log.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CLog (const string_t &filename, const bool show_stdout=false)
 Sets internal variables to a known state. More...
 
 CLog (const CLog &Copy)
 Copy constructor does not exist. More...
 
CLog & operator= (const CLog &Copy)
 
virtual ~CLog ()
 This destructor does nothing but call Destroy(). More...
 
virtual CLog & operator<< (CLog &(CLog::*method)())
 Executes a CLog method in-stream. More...
 
template<typename T >
CLog & operator<< (const T &data)
 Logs given data. More...
 
virtual bool Init ()
 Opens a file stream with a custom filename given in the ctor. More...
 
virtual bool Destroy ()
 Writes out any leftover data and closes the file stream. More...
 
void ToggleStdout ()
 Toggles console output. More...
 
virtual CLog & SetMode (const LogMode &Mode)
 Sets the output mode to something in util::LogMode. More...
 
virtual CLog & SetSystem (const string_t &sys)
 Sets the current logging subsystem. More...
 
void SetFilename (const string_t &fn)
 Sets the log filename for a call to Init() after Destroy(). More...
 
const string_t & GetSystem () const
 Retrieves the current logging system. More...
 
string_t GetFilename () const
 Retrieves the current log filename. More...
 
bool IsInit () const
 Returns the sub-system initialization status. More...
 
template<typename T >
CLog & operator<< (const T &data)
 
- - - - -

-Static Public Member Functions

static CLog & GetEngineLog ()
 Singleton access to the engine log. More...
 
- - - - -

-Static Public Attributes

static CLog &(CLog::* endl )()
 Shortcut to the new line method pointer. More...
 
- - - - -

-Friends

std::ostream & operator<< (std::ostream &o, const CLog &Log)
 Makes it possible to inline the Set*() methods. More...
 
-

Detailed Description

-

If desirable, it can be inherited to provide a dummy logger to the engine for speed or whatever other reason.

-

By default, one of these is created for the engine log, but more streams can be opened as needed.

-

The stream immediately writes to the file. If specified (via a constructor or ToggleStdout()), the data will be immediately output to the screen, as well. This eliminates the need to flush the stream repeatedly and output data in chunks, as was the case in IronClad.

-

Log output is formatted like so:
-

-
- [MODE] Subsystem -- data
-

MODE is one of the 4 output modes in the util::LogMode enumerator:
-

-
-     DEBUG   --  Only shows up in debug builds (ZEN_DEBUG_BUILD directive)
-     INFO    --  Generic information
-     ERROR   --  Error that should cause alarm but no serious harm
-     FATAL   --  Critical error that terminates the program
-                 with the given data as the message in the pop-up
-                 window.
-

Logging works by calling SetMode(), which will be output for every subsequent line until SetMode() is called again. Newlines are not automatically detected, so you must force them via CLog::endl.

-

You should specify the subsystem that is doing the logging via SetSystem(), it will default to "Log".

-

You can directly stream SetMode() and SetSystem() as output, like so:

-
using util::CLog;
-
using util::LogMode;
-
-
CLog Output("Output.log", false);
-
Output.Init();
-
-
Output << Output.SetMode(LogMode::ZEN_FATAL) <<
-
<< Output.SetSystem("Game") << "Failure." << CLog:endl;
-
-
Output.Destroy();
-

The output log (in Output.log) would look like this:

-
- [FATAL] Game -- Failure.
-

In addition, a popup MessageBox (on Windows) will show with the caption "Game" and text saying "Failure." due to the specification of ZEN_FATAL.

-

You can see a few usage scenarios in the Examples section.

- -

Definition at line 53 of file Log.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - - - - - - - - - - - -
zen::util::CLog::CLog (const string_t & filename,
const bool show_stdout = false 
)
-
-

This constructor does next to nothing. The filename that is passed will not be used to create a file until Init() is called. It acts exactly like a zen::CSubsystem instance, but cannot actually be one due to the fact that that class uses a log within it.

-
Parameters
- - - -
filenameFilename for output log
show_stdoutOutput logged info to the screen?
-
-
-
See Also
CLog::Init()
-
-CLog::ToggleStdout()
- -
-
- -
-
- - - - - -
- - - - - - - - -
zen::util::CLog::CLog (const CLog & Copy)
- 		-inline
-
- -

Definition at line 80 of file Log.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CLog::~CLog ()
- 		-virtual
-
-

The zen::CSubsystem specification requires that the destructor only call Destroy(), and this behaves in a similar fashion.

-
See Also
zen::CSubsystem::~CSubsystem()
- -

Definition at line 22 of file Log.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - - -
CLog& zen::util::CLog::operator= (const CLog & Copy)
- 		-inline
-
- -

Definition at line 81 of file Log.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - -
CLog & zen::util::CLog::operator<< (CLog &(CLog::*)() method)
- 		-inlinevirtual
-
-

This allows for chaining CLog method calls in operator<< with the guarantee that they will be executed in the specified order. Thus, we can inline the new-line method call like so:

-
Log << Log.SetSystem("Test") << "Data" << CLog::endl;
-

And it will function identically.

-
Parameters
- - -
methodCLog method function
-
-
-
Returns
A reference to oneself, to allow for chaining.
-
Note
The passed method must return a CLog& instance, and must take no parameters.
-
-This should only be called through the CLog::endl pointer.
-
See Also
CLog::endl
- -

Definition at line 2 of file Log.hpp.

- -
-
- -
-
-
-template<typename T >
- - - - - - - - -
CLog & zen::util::CLog::operator<< (const T & data)
-
-

Due to its templated nature, and the versatility of std::ostream, almost anything can be passed as an argument. The given data is written to an std::stringstream, and is only writted to the file when CLog::endl is called.

-
Parameters
- - -
dataData to log
-
-
-
Returns
A reference to itself, to 'daisy-chain' statements.
- -

Definition at line 13 of file Log.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CLog::Init ()
- 		-virtual
-
-

This method accepts no parameters because it is intended to behave similarly to zen::CSubsystem. Thus, any parameters to Init() are typically handled in the constructor.

-
Returns
true if the file opened successfully, and false on any error.
-
See Also
Destroy()
- -

Definition at line 27 of file Log.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CLog::Destroy ()
- 		-virtual
-
-

After calling this method, it is possible to re-open a new log file by calling SetFilename() and subsequently calling Init() again. This should not be called on the global engine log, because then messages logged after zen::Quit() will not be recorded.

-
Returns
true if Init() had called successfully, and false if not.
- -

Definition at line 44 of file Log.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - - - -
void zen::util::CLog::ToggleStdout ()
-
- -
-
- -
-
- - - - - -
- - - - - - - - -
CLog & CLog::SetMode (const LogMode & Mode)
- 		-inlinevirtual
-
- -

Definition at line 24 of file Log.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
CLog & CLog::SetSystem (const string_t & sys)
- 		-inlinevirtual
-
- -

Definition at line 30 of file Log.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - - -
void CLog::SetFilename (const string_t & fn)
- 		-inline
-
- -

Definition at line 41 of file Log.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const string_t & CLog::GetSystem () const
- 		-inline
-
- -

Definition at line 46 of file Log.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
string_t CLog::GetFilename () const
- 		-inline
-
- -

Definition at line 51 of file Log.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CLog::IsInit () const
- 		-inline
-
- -

Definition at line 56 of file Log.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
CLog & CLog::GetEngineLog ()
- 		-static
-
- -

Definition at line 111 of file Log.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
-
-template<typename T >
- - - - - - - - -
CLog& zen::util::CLog::operator<< (const T & data)
-
- -

Definition at line 12 of file Log.inl.

- -
-
-

Friends And Related Function Documentation

- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
std::ostream& operator<< (std::ostream & o,
const CLog & Log 
)
- 		-friend
-
- -
-
-

Field Documentation

- -
-
- - - - - -
- - - - -
CLog&(CLog::* zen::util::CLog::endl)()
- 		-static
-
- -

Definition at line 184 of file Log.hpp.

- -
-
-
The documentation for this class was generated from the following files:
    -
  • Zenderer/include/Zenderer/Utilities/Log.hpp
    • -
  • Zenderer/include/Zenderer/Utilities/Log.inl
    • -
  • Zenderer/src/Utilities/Log.cpp
    • -
-
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_log.js b/docs/classzen_1_1util_1_1_c_log.js deleted file mode 100644 index 583ee2ad..00000000 --- a/docs/classzen_1_1util_1_1_c_log.js +++ /dev/null @@ -1,22 +0,0 @@ -var classzen_1_1util_1_1_c_log = -[ - [ "CLog", "classzen_1_1util_1_1_c_log.html#a188d8bf9beb5f1faa7560ca028a8bf72", null ], - [ "CLog", "classzen_1_1util_1_1_c_log.html#a042b3f3980addc9561a3817c088e5922", null ], - [ "~CLog", "classzen_1_1util_1_1_c_log.html#a569ed11d9b2dcd2f57753b000beb67e9", null ], - [ "operator=", "classzen_1_1util_1_1_c_log.html#a9707ea85c8bfc727f29c3d84952b4712", null ], - [ "operator<<", "classzen_1_1util_1_1_c_log.html#a4b47abac9f1cd45f5479be861290bfd6", null ], - [ "operator<<", "classzen_1_1util_1_1_c_log.html#a63ae1bf2dc31500af22930f7d5107622", null ], - [ "Init", "classzen_1_1util_1_1_c_log.html#a7bd03505f7785eca7040e913fe7831ee", null ], - [ "Destroy", "classzen_1_1util_1_1_c_log.html#a9d4bca1291fd1bcd8e8d8161cb27a44f", null ], - [ "ToggleStdout", "classzen_1_1util_1_1_c_log.html#a354fc06ab4cb37b616f5322cf2b333e1", null ], - [ "SetMode", "classzen_1_1util_1_1_c_log.html#ab8ad1612d97e76c971f1e7d0515a65e2", null ], - [ "SetSystem", "classzen_1_1util_1_1_c_log.html#a62c2eea1199e38b7d9297100e7a315e7", null ], - [ "SetFilename", "classzen_1_1util_1_1_c_log.html#a49707ee9497536f02e61e1cbb5b5d96d", null ], - [ "GetSystem", "classzen_1_1util_1_1_c_log.html#aa650a945529f19cf99c00f2f4655ef5d", null ], - [ "GetFilename", "classzen_1_1util_1_1_c_log.html#a8ee810e8f130b41733c45c7e05686ce1", null ], - [ "IsInit", "classzen_1_1util_1_1_c_log.html#a2df4b426c78dae048369de5783d668fa", null ], - [ "GetEngineLog", "classzen_1_1util_1_1_c_log.html#a5c2426faf7a405cccd6d8e5e8427283d", null ], - [ "operator<<", "classzen_1_1util_1_1_c_log.html#ac55ffbfa047950ed902c1bf0fc2b3984", null ], - [ "operator<<", "classzen_1_1util_1_1_c_log.html#a2c3666878fd6cdc5a98088014438b3b5", null ], - [ "endl", "classzen_1_1util_1_1_c_log.html#a23776c20007d9bc4b02afad6eb9e74a5", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_log_a2df4b426c78dae048369de5783d668fa_icgraph.map b/docs/classzen_1_1util_1_1_c_log_a2df4b426c78dae048369de5783d668fa_icgraph.map deleted file mode 100644 index 1ce1847d..00000000 --- a/docs/classzen_1_1util_1_1_c_log_a2df4b426c78dae048369de5783d668fa_icgraph.map +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_log_a2df4b426c78dae048369de5783d668fa_icgraph.png b/docs/classzen_1_1util_1_1_c_log_a2df4b426c78dae048369de5783d668fa_icgraph.png deleted file mode 100644 index b4971b2b..00000000 Binary files a/docs/classzen_1_1util_1_1_c_log_a2df4b426c78dae048369de5783d668fa_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_log_a5c2426faf7a405cccd6d8e5e8427283d_icgraph.map b/docs/classzen_1_1util_1_1_c_log_a5c2426faf7a405cccd6d8e5e8427283d_icgraph.map deleted file mode 100644 index 61485f89..00000000 --- a/docs/classzen_1_1util_1_1_c_log_a5c2426faf7a405cccd6d8e5e8427283d_icgraph.map +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_log_a5c2426faf7a405cccd6d8e5e8427283d_icgraph.png b/docs/classzen_1_1util_1_1_c_log_a5c2426faf7a405cccd6d8e5e8427283d_icgraph.png deleted file mode 100644 index 850366da..00000000 Binary files a/docs/classzen_1_1util_1_1_c_log_a5c2426faf7a405cccd6d8e5e8427283d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_log_a62c2eea1199e38b7d9297100e7a315e7_icgraph.map b/docs/classzen_1_1util_1_1_c_log_a62c2eea1199e38b7d9297100e7a315e7_icgraph.map deleted file mode 100644 index 2b10998a..00000000 --- a/docs/classzen_1_1util_1_1_c_log_a62c2eea1199e38b7d9297100e7a315e7_icgraph.map +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_log_a62c2eea1199e38b7d9297100e7a315e7_icgraph.png b/docs/classzen_1_1util_1_1_c_log_a62c2eea1199e38b7d9297100e7a315e7_icgraph.png deleted file mode 100644 index 31269495..00000000 Binary files a/docs/classzen_1_1util_1_1_c_log_a62c2eea1199e38b7d9297100e7a315e7_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_log_a8ee810e8f130b41733c45c7e05686ce1_icgraph.map b/docs/classzen_1_1util_1_1_c_log_a8ee810e8f130b41733c45c7e05686ce1_icgraph.map deleted file mode 100644 index c6cadcf3..00000000 --- a/docs/classzen_1_1util_1_1_c_log_a8ee810e8f130b41733c45c7e05686ce1_icgraph.map +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_log_a8ee810e8f130b41733c45c7e05686ce1_icgraph.png b/docs/classzen_1_1util_1_1_c_log_a8ee810e8f130b41733c45c7e05686ce1_icgraph.png deleted file mode 100644 index 24d890df..00000000 Binary files a/docs/classzen_1_1util_1_1_c_log_a8ee810e8f130b41733c45c7e05686ce1_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_log_a9d4bca1291fd1bcd8e8d8161cb27a44f_icgraph.map b/docs/classzen_1_1util_1_1_c_log_a9d4bca1291fd1bcd8e8d8161cb27a44f_icgraph.map deleted file mode 100644 index 7da7f204..00000000 --- a/docs/classzen_1_1util_1_1_c_log_a9d4bca1291fd1bcd8e8d8161cb27a44f_icgraph.map +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_log_a9d4bca1291fd1bcd8e8d8161cb27a44f_icgraph.png b/docs/classzen_1_1util_1_1_c_log_a9d4bca1291fd1bcd8e8d8161cb27a44f_icgraph.png deleted file mode 100644 index 79a31457..00000000 Binary files a/docs/classzen_1_1util_1_1_c_log_a9d4bca1291fd1bcd8e8d8161cb27a44f_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_log_ab8ad1612d97e76c971f1e7d0515a65e2_icgraph.map b/docs/classzen_1_1util_1_1_c_log_ab8ad1612d97e76c971f1e7d0515a65e2_icgraph.map deleted file mode 100644 index d4068bf2..00000000 --- a/docs/classzen_1_1util_1_1_c_log_ab8ad1612d97e76c971f1e7d0515a65e2_icgraph.map +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/classzen_1_1util_1_1_c_log_ab8ad1612d97e76c971f1e7d0515a65e2_icgraph.png b/docs/classzen_1_1util_1_1_c_log_ab8ad1612d97e76c971f1e7d0515a65e2_icgraph.png deleted file mode 100644 index 868362c4..00000000 Binary files a/docs/classzen_1_1util_1_1_c_log_ab8ad1612d97e76c971f1e7d0515a65e2_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_option.html b/docs/classzen_1_1util_1_1_c_option.html deleted file mode 100644 index 329c631d..00000000 --- a/docs/classzen_1_1util_1_1_c_option.html +++ /dev/null @@ -1,592 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::COption Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Friends
-
-
zen::util::COption Class Reference
-
-
- -

Used internally by CSettings to manage options of all types. -

- -

#include "Settings.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 COption ()
 
 COption (const string_t &value)
 
 COption (const COption &Opt)
 
COption & operator= (const COption &Opt)
 Create from option. More...
 
COption & operator= (const string_t &name)
 Create from string. More...
 
COption & operator= (const char *name)
 Create from C-string. More...
 
COption & operator= (const bool name)
 Create from bool. More...
 
template<typename T >
COption & operator= (const T &name)
 Create from numeric types. More...
 
 operator string_t () const
 Implicit conversion to string_t. More...
 
 operator int () const
 Implicit conversion to int More...
 
 operator size_t () const
 Implicit conversion to unsigned int More...
 
 operator real_t () const
 Implicit conversion to real_t More...
 
 operator bool () const
 Implicit conversion to bool More...
 
bool operator== (const COption &value) const
 Comparison to an option value. More...
 
bool operator== (const string_t &value) const
 
bool operator== (const bool value) const
 
template<typename T >
bool operator== (const T &value) const
 
- - - - -

-Friends

std::ostream & operator<< (std::ostream &o, const COption &Opt)
 Outputting an option value. More...
 
-

Detailed Description

-
-

Definition at line 38 of file Settings.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
COption::COption ()
-
- -

Definition at line 15 of file Settings.cpp.

- -
-
- -
-
- - - - - - - - -
COption::COption (const string_t & value)
-
- -

Definition at line 17 of file Settings.cpp.

- -
-
- -
-
- - - - - - - - -
COption::COption (const COption & Opt)
-
- -

Definition at line 20 of file Settings.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
COption & COption::operator= (const COption & Opt)
-
- -

Definition at line 23 of file Settings.cpp.

- -
-
- -
-
- - - - - - - - -
COption & COption::operator= (const string_t & name)
-
- -

Definition at line 29 of file Settings.cpp.

- -
-
- -
-
- - - - - - - - -
COption & COption::operator= (const char * name)
-
- -

Definition at line 35 of file Settings.cpp.

- -
-
- -
-
- - - - - - - - -
COption & COption::operator= (const bool name)
-
- -

Definition at line 41 of file Settings.cpp.

- -
-
- -
-
-
-template<typename T >
- - - - - -
- - - - - - - - -
COption& zen::util::COption::operator= (const T & name)
- 		-inline
-
- -

Definition at line 52 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zen::util::COption::operator string_t () const
- 		-inline
-
- -

Definition at line 59 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zen::util::COption::operator int () const
- 		-inline
-
- -

Definition at line 62 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zen::util::COption::operator size_t () const
- 		-inline
-
- -

Definition at line 65 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zen::util::COption::operator real_t () const
- 		-inline
-
- -

Definition at line 68 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
zen::util::COption::operator bool () const
- 		-inline
-
- -

Definition at line 71 of file Settings.hpp.

- -
-
- -
-
- - - - - - - - -
bool zen::util::COption::operator== (const COption & value) const
-
- -
-
- -
-
- - - - - - - - -
bool zen::util::COption::operator== (const string_t & value) const
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -
-
- -
-
- - - - - - - - -
bool zen::util::COption::operator== (const bool value) const
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -
-
- -
-
-
-template<typename T >
- - - - - -
- - - - - - - - -
bool zen::util::COption::operator== (const T & value) const
- 		-inline
-
-

This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts.

- -

Definition at line 79 of file Settings.hpp.

- -
-
-

Friends And Related Function Documentation

- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - -
std::ostream& operator<< (std::ostream & o,
const COption & Opt 
)
- 		-friend
-
- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_option.js b/docs/classzen_1_1util_1_1_c_option.js deleted file mode 100644 index 7616ce33..00000000 --- a/docs/classzen_1_1util_1_1_c_option.js +++ /dev/null @@ -1,21 +0,0 @@ -var classzen_1_1util_1_1_c_option = -[ - [ "COption", "classzen_1_1util_1_1_c_option.html#aca15b5270965b8d060804d4d0642f27d", null ], - [ "COption", "classzen_1_1util_1_1_c_option.html#a86b9dd59413818a856e79529ab246861", null ], - [ "COption", "classzen_1_1util_1_1_c_option.html#ab40282de4a85afcf27bd78bb261ecc7e", null ], - [ "operator=", "classzen_1_1util_1_1_c_option.html#a8be9806dcd1db45b228fb4ec71e90e4b", null ], - [ "operator=", "classzen_1_1util_1_1_c_option.html#a6b96a9e520988bc6a7a93f5d2db5f0cd", null ], - [ "operator=", "classzen_1_1util_1_1_c_option.html#aa23037e79daeba75f829ec32e4d41114", null ], - [ "operator=", "classzen_1_1util_1_1_c_option.html#afdc30416ab45cc5d1c31934e25f6401b", null ], - [ "operator=", "classzen_1_1util_1_1_c_option.html#ad3d32c722af952aff701a56d0b1dde49", null ], - [ "operator string_t", "classzen_1_1util_1_1_c_option.html#a9716de257ae20ff8ae9b91a103a7194c", null ], - [ "operator int", "classzen_1_1util_1_1_c_option.html#a90ed7bb3776e3309de2bb7cdf75e83a6", null ], - [ "operator size_t", "classzen_1_1util_1_1_c_option.html#af944dd8bdd1b0126a941a2882bb86a9f", null ], - [ "operator real_t", "classzen_1_1util_1_1_c_option.html#af311f2b0d5297e9db50dfcab501531a3", null ], - [ "operator bool", "classzen_1_1util_1_1_c_option.html#a3885ddaf194bd9d5d6363ee4114cf56a", null ], - [ "operator==", "classzen_1_1util_1_1_c_option.html#a87feea8dedabd95dc4eea01f441756e3", null ], - [ "operator==", "classzen_1_1util_1_1_c_option.html#a126a66ce23187af399a28ffb28ac9ea5", null ], - [ "operator==", "classzen_1_1util_1_1_c_option.html#aa68feab3eec761c81215b455f5582f4d", null ], - [ "operator==", "classzen_1_1util_1_1_c_option.html#a6d338a392e7ab4c5e0703f3259077d4f", null ], - [ "operator<<", "classzen_1_1util_1_1_c_option.html#a4d5a18576acad2c01f5abd0ebf5ab091", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_random.html b/docs/classzen_1_1util_1_1_c_random.html deleted file mode 100644 index 2eb8aaa8..00000000 --- a/docs/classzen_1_1util_1_1_c_random.html +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::CRandom< SEED, RNG > Class Template Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions
-
-
zen::util::CRandom< SEED, RNG > Class Template Reference
Utilities
-
-
- -

Facilitates simplification of random number generation. - More...

- -

#include "Random.hpp"

- - - - - - - - - - - - - - - - -

-Public Member Functions

 CRandom ()
 
template<typename T >
T randint (const T &low, const T &hi)
 Generates a random integer from the range [low, hi). More...
 
template<typename T >
T randreal (const T &low, const T &hi)
 Generates a random real number from the range [low, hi). More...
 
template<typename InputIterator >
auto choice (InputIterator begin, InputIterator end) -> decltype(*begin)&
 Chooses a random element in the given iterator range. More...
 
-

Detailed Description

-

template<int SEED = 0, typename RNG = std::mt19937>
-class zen::util::CRandom< SEED, RNG >

- -

This object provides a thin abstraction layer over the C++11 <random> implementation. It removes the cumbersome instantiation of unweildy templates. It also provides convenience member functions that allow for easily generating ranges of numbers, or choosing a random element of a container.

-

Here's the difference between creating a random integer in the range [1, 10) between this wrapper and the standard STL:

-
// STL
-
std::mt19937 Mersenne;
-
std::uniform_int_distribution<int> Range(1, 10);
-
Mersenne.seed(time(nullptr));
-
int r = Range(Mersenne);
-
-
// Zenderer
-
util::CRandom<0, std::mt19937> Mersenne;
-
int r = Mersenne.randint(1, 10);
-
-
// Zenderer with defaults
-
util::CRandom<> Mersenne; // Uses std::mt19937 by default.
-
int r = Mersenne.randint(1, 10);
-

As you can see, there are no longer complex template names and parameters to remember. There is merely the optional seed as the first parameter to util::CRandom, and the optional random-number generating engine as the second parameter.

-
Examples:
Random.
-
-

Definition at line 38 of file Random.hpp.

-

Constructor & Destructor Documentation

- -
-
-
-template<int SEED = 0, typename RNG = std::mt19937>
- - - - - -
- - - - - - - -
zen::util::CRandom< SEED, RNG >::CRandom ()
- 		-inline
-
- -

Definition at line 41 of file Random.hpp.

- -
-
-

Member Function Documentation

- -
-
-
-template<int SEED = 0, typename RNG = std::mt19937>
-
-template<typename T >
- - - - - -
- - - - - - - - - - - - - - - - - - -
T zen::util::CRandom< SEED, RNG >::randint (const T & low,
const T & hi 
)
- 		-inline
-
-
Template Parameters
- - -
TAn integer type (long, uinnt16_t, etc.)
-
-
-
Parameters
- - - -
lowThe lower bound
hiThe upper bound
-
-
-
Returns
An integer of type T in the range [low, hi).
- -

Definition at line 56 of file Random.hpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
-
-template<int SEED = 0, typename RNG = std::mt19937>
-
-template<typename T >
- - - - - -
- - - - - - - - - - - - - - - - - - -
T zen::util::CRandom< SEED, RNG >::randreal (const T & low,
const T & hi 
)
- 		-inline
-
-
Template Parameters
- - -
TA floating-point type (double, real_t, etc.)
-
-
-
Parameters
- - - -
lowThe lower bound
hiThe upper bound
-
-
-
Returns
A real number of type T in the range [low, hi).
- -

Definition at line 72 of file Random.hpp.

- -
-
- -
-
-
-template<int SEED = 0, typename RNG = std::mt19937>
-
-template<typename InputIterator >
- - - - - -
- - - - - - - - - - - - - - - - - - -
auto zen::util::CRandom< SEED, RNG >::choice (InputIterator begin,
InputIterator end 
) -> decltype(*begin)& -
- 		-inline
-
-
Template Parameters
- - -
InputIteratorAn iterable type, typically deduced.
-
-
-
Parameters
- - - -
beginThe starting iterator
endThe ending iterator
-
-
-
Warning
Modifying the return value of this method call will change the contents of the original container.
-
Returns
A reference to an element in the container.
- -

Definition at line 91 of file Random.hpp.

- -
-
-
The documentation for this class was generated from the following file:
    -
  • Zenderer/include/Zenderer/Utilities/Random.hpp
    • -
-
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_random.js b/docs/classzen_1_1util_1_1_c_random.js deleted file mode 100644 index 5cd779b9..00000000 --- a/docs/classzen_1_1util_1_1_c_random.js +++ /dev/null @@ -1,7 +0,0 @@ -var classzen_1_1util_1_1_c_random = -[ - [ "CRandom", "classzen_1_1util_1_1_c_random.html#acd802bc5062bf09f7d3b0eeaf8f1a063", null ], - [ "randint", "classzen_1_1util_1_1_c_random.html#a92b4339c98ace5aeb203223f2e8c118d", null ], - [ "randreal", "classzen_1_1util_1_1_c_random.html#a396d7a8cb15268ea620f2a731aec8480", null ], - [ "choice", "classzen_1_1util_1_1_c_random.html#a5f8ed379d9dc45e980612d56eaab16cb", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_random_a92b4339c98ace5aeb203223f2e8c118d_icgraph.map b/docs/classzen_1_1util_1_1_c_random_a92b4339c98ace5aeb203223f2e8c118d_icgraph.map deleted file mode 100644 index d5451aca..00000000 --- a/docs/classzen_1_1util_1_1_c_random_a92b4339c98ace5aeb203223f2e8c118d_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1util_1_1_c_random_a92b4339c98ace5aeb203223f2e8c118d_icgraph.png b/docs/classzen_1_1util_1_1_c_random_a92b4339c98ace5aeb203223f2e8c118d_icgraph.png deleted file mode 100644 index d9ea8da8..00000000 Binary files a/docs/classzen_1_1util_1_1_c_random_a92b4339c98ace5aeb203223f2e8c118d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_settings.html b/docs/classzen_1_1util_1_1_c_settings.html deleted file mode 100644 index 29a590fe..00000000 --- a/docs/classzen_1_1util_1_1_c_settings.html +++ /dev/null @@ -1,415 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::CSettings Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::util::CSettings Class Reference
Utilities
-
-
- -

An array-like wrapper for various settings. - More...

- -

#include "Settings.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CSettings (const string_t &filename="")
 
 ~CSettings ()
 
bool Init ()
 Initializes the subsystem. More...
 
bool Destroy ()
 Cleans up the subsystem completely. More...
 
COption & operator[] (const string_t &opt)
 Retrieves the value of an option (creates if non-existing). More...
 
settings_t::iterator begin ()
 Starting iterator (for range-based for() loops). More...
 
settings_t::iterator end ()
 Ending iterator (for range-based for() loops). More...
 
- Public Member Functions inherited from zen::CSubsystem
 CSubsystem (const string_t name="Subsystem")
 Sets subsystem to an uninitialized state. More...
 
virtual ~CSubsystem ()
 Destructor does absolutely nothing. More...
 
bool IsInit () const
 Returns the sub-system initialization status. More...
 
void SetLog (util::CLog &Log)
 Sets a custom output log. More...
 
const string_t & GetName () const
 Retrieves the subsystem name. More...
 
- - - -

-Static Public Member Functions

static CSettings & GetEngineInstance ()
 
- - - - - - - - - - - - -

-Additional Inherited Members

- Protected Attributes inherited from zen::CSubsystem
util::CLog & m_Log
 
string_t m_name
 
bool m_init
 
- Static Protected Attributes inherited from zen::CSubsystem
static std::vector< CSubsystem * > sp_allSystems
 No copying subsystems. More...
 
-

Detailed Description

-

This isn't used anywhere in the engine, but is present for user convenience in creating / passing around various in-game settings that may arise. The link to the development blog contains info about the specific implementation, as well as potential usage functions.

-
See Also
http://zenpandainteractive.blogspot.com/2013/06/setting-settings-of-arbitrary-types-in-c.html
- -

Definition at line 91 of file Settings.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CSettings::CSettings (const string_t & filename = "")
-
- -

Definition at line 72 of file Settings.cpp.

- -
-
- -
-
- - - - - - - -
CSettings::~CSettings ()
-
- -

Definition at line 77 of file Settings.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
bool CSettings::Init ()
- 		-virtual
-
-

Any parameters should be passed through the derived class's constructor.

- -

Implements zen::CSubsystem.

- -

Definition at line 79 of file Settings.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
bool CSettings::Destroy ()
- 		-virtual
-
-

Typically, a subsystem can be re-initialized by setting new parameters via various Set*() methods and calling Init() again, but this is specific to the inheriting class.

- -

Implements zen::CSubsystem.

- -

Definition at line 104 of file Settings.cpp.

- -
-
- -
-
- - - - - - - - -
COption & CSettings::operator[] (const string_t & opt)
-
-

This will search for an option setting with the given name, and return it if it exists. If not, it will create an option with that name and return a reference to it, which would allow for a user to assign it immediately. This allows for the following:

-
CSettings g_EngineSettings;
-
-
// Assigns a new option "FRAME_RATE" to the value 60.
-
g_EngineSettings["FRAME_RATE"] = 60;
-
-
// Retrieves the option value "FRAME_RATE"
-
std::cout << g_EngineSettings["FRAME_RATE"];
-
-
// Re-assigns the option "FRAME_RATE" to 24.
-
g_EngineSettings["FRAME_RATE"] = 24;
-

This is possible by overloading operator= in an abstracted object COption that acts just like a normal type but can be assigned to an int, a float, a bool, or a string_t.

-
Parameters
- - -
optOption to get value of
-
-
-
Returns
A mutable option value.
- -

Definition at line 110 of file Settings.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
settings_t::iterator zen::util::CSettings::begin ()
- 		-inline
-
- -

Definition at line 139 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
settings_t::iterator zen::util::CSettings::end ()
- 		-inline
-
- -

Definition at line 142 of file Settings.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
static CSettings& zen::util::CSettings::GetEngineInstance ()
- 		-inlinestatic
-
- -

Definition at line 144 of file Settings.hpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_settings.js b/docs/classzen_1_1util_1_1_c_settings.js deleted file mode 100644 index 4dd5f7e3..00000000 --- a/docs/classzen_1_1util_1_1_c_settings.js +++ /dev/null @@ -1,11 +0,0 @@ -var classzen_1_1util_1_1_c_settings = -[ - [ "CSettings", "classzen_1_1util_1_1_c_settings.html#ad772a4f72bc8f38791e746d1de451d95", null ], - [ "~CSettings", "classzen_1_1util_1_1_c_settings.html#a2e529f0e906c1abb97f6aede2ae91292", null ], - [ "Init", "classzen_1_1util_1_1_c_settings.html#a176c1b3559faf249482c9bdaac1e0550", null ], - [ "Destroy", "classzen_1_1util_1_1_c_settings.html#ae08be94f7ac820aa5e61abb1d48c9adf", null ], - [ "operator[]", "classzen_1_1util_1_1_c_settings.html#a0e507b8fce649e8b4c1f1991b071c2b4", null ], - [ "begin", "classzen_1_1util_1_1_c_settings.html#a33261683fedb84d56ef9477247b89b4b", null ], - [ "end", "classzen_1_1util_1_1_c_settings.html#a96ded7256e50a61d5e38beddf66e9e16", null ], - [ "GetEngineInstance", "classzen_1_1util_1_1_c_settings.html#a9cec9f73af011cb99e0c1df142ba4e02", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_settings_a176c1b3559faf249482c9bdaac1e0550_icgraph.map b/docs/classzen_1_1util_1_1_c_settings_a176c1b3559faf249482c9bdaac1e0550_icgraph.map deleted file mode 100644 index 5db837ce..00000000 --- a/docs/classzen_1_1util_1_1_c_settings_a176c1b3559faf249482c9bdaac1e0550_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/classzen_1_1util_1_1_c_settings_a176c1b3559faf249482c9bdaac1e0550_icgraph.png b/docs/classzen_1_1util_1_1_c_settings_a176c1b3559faf249482c9bdaac1e0550_icgraph.png deleted file mode 100644 index 72c6fd3c..00000000 Binary files a/docs/classzen_1_1util_1_1_c_settings_a176c1b3559faf249482c9bdaac1e0550_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_timer.html b/docs/classzen_1_1util_1_1_c_timer.html deleted file mode 100644 index e1d9b16b..00000000 --- a/docs/classzen_1_1util_1_1_c_timer.html +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::CTimer Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 9147 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Types | -Public Member Functions
-
-
zen::util::CTimer Class Reference
Utilities
-
-
- -

A high-precision timer class for controlling frame rates. - More...

- -

#include "Timer.hpp"

- - - - - - - - - - - -

-Public Types

typedef
-std::chrono::high_resolution_clock 		clock_t
 Shortcut for the type of clock we are using. More...
 
typedef clock_t::time_point timepoint_t
 Shortcut for time point structure. More...
 
typedef std::chrono::milliseconds precision_t
 Shortcut for the precision we want (do not change if using delays). More...
 
- - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CTimer (const uint16_t frames=60)
 Constructs a timer with a custom frame rate. More...
 
virtual ~CTimer ()
 
virtual time_t Start ()
 Marks start time and returns it. More...
 
virtual time_t Finish ()
 Marks finish time and returns it. More...
 
virtual time_t Elapsed ()
 Returns finish time - start time. More...
 
void Sleep (const time_t ticks)
 Sleeps the current thread (defaults to milliseconds). More...
 
virtual time_t Delay ()
 Delays the current thread appropriately to maintain frame-rate. More...
 
virtual time_t GetTime () const
 Returns the current clock time. More...
 
void SetFrameRate (const uint16_t fps)
 Sets a custom frame-rate, overriding the constructor. More...
 
-

Detailed Description

-

This class provides fairly generic timing functionality, with the ability to start, stop, measure, and delay for various periods of time. Most methods are virtual, allowing for a user to inherit and implement their own custom timer, but still be able to pass it around to various parts of the engine when necessary.

- -

Definition at line 42 of file Timer.hpp.

-

Member Typedef Documentation

- -
-
- - - - -
typedef std::chrono::high_resolution_clock zen::util::CTimer::clock_t
-
- -

Definition at line 46 of file Timer.hpp.

- -
-
- -
-
- - - - -
typedef clock_t::time_point zen::util::CTimer::timepoint_t
-
- -

Definition at line 49 of file Timer.hpp.

- -
-
- -
-
- - - - -
typedef std::chrono::milliseconds zen::util::CTimer::precision_t
-
- -

Definition at line 52 of file Timer.hpp.

- -
-
-

Constructor & Destructor Documentation

- -
-
- - - - - - - - -
CTimer::CTimer (const uint16_t frames = 60)
-
- -

Definition at line 11 of file Timer.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
CTimer::~CTimer ()
- 		-virtual
-
- -

Definition at line 14 of file Timer.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - -
- - - - - - - -
util::time_t CTimer::Start ()
- 		-virtual
-
- -

Definition at line 16 of file Timer.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
util::time_t CTimer::Finish ()
- 		-virtual
-
- -

Definition at line 22 of file Timer.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
util::time_t CTimer::Elapsed ()
- 		-virtual
-
- -

Definition at line 28 of file Timer.cpp.

- -
-
- -
-
- - - - - - - - -
void CTimer::Sleep (const time_t ticks)
-
- -

Definition at line 34 of file Timer.cpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
util::time_t CTimer::Delay ()
- 		-virtual
-
-

It is not necessary to call Finish() prior to this method, as it will automatically use the immediate timepoint that it was called at.

-

A solid game loop that utilizes the timer to regulate frame-rate would function something like this:

-
// Cap at 24 frames per second.
-
CTimer m_Timer(24);
-
-
while(m_Window.IsOpen())
-
{
-
m_Timer.Start();
-
// ...
-
// Handle events, game logic, rendering.
-
// ...
-
-
// Final update to draw everything.
-
m_Window.Update();
-
-
// Regulate frame-rate.
-
m_Timer.Delay();
-
}
-
Returns
The amount of milliseconds the thread slept (if any).
- -

Definition at line 39 of file Timer.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
util::time_t CTimer::GetTime () const
- 		-virtual
-
- -

Definition at line 59 of file Timer.cpp.

- -
-
- -
-
- - - - - - - - -
void CTimer::SetFrameRate (const uint16_t fps)
-
- -

Definition at line 65 of file Timer.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_timer.js b/docs/classzen_1_1util_1_1_c_timer.js deleted file mode 100644 index 3cf6ed24..00000000 --- a/docs/classzen_1_1util_1_1_c_timer.js +++ /dev/null @@ -1,15 +0,0 @@ -var classzen_1_1util_1_1_c_timer = -[ - [ "clock_t", "classzen_1_1util_1_1_c_timer.html#acd485409b526a749c891de0f8892c726", null ], - [ "timepoint_t", "classzen_1_1util_1_1_c_timer.html#a1086782663f0546069ea00ccaf574f82", null ], - [ "precision_t", "classzen_1_1util_1_1_c_timer.html#a076b03defe2c3d8a1aa446bdba623d66", null ], - [ "CTimer", "classzen_1_1util_1_1_c_timer.html#a78be4602778472362818d4ecfde4449b", null ], - [ "~CTimer", "classzen_1_1util_1_1_c_timer.html#afd3f6595928cd20f7faaece75f017733", null ], - [ "Start", "classzen_1_1util_1_1_c_timer.html#aa7ec276af3862a205dac144d964720ae", null ], - [ "Finish", "classzen_1_1util_1_1_c_timer.html#a447ec747ffd9f0f9f5b882d765e0c0bd", null ], - [ "Elapsed", "classzen_1_1util_1_1_c_timer.html#a345aba9628d5327f118830cff5952001", null ], - [ "Sleep", "classzen_1_1util_1_1_c_timer.html#a1c2e04ea1b00c02788f693267a3e46f6", null ], - [ "Delay", "classzen_1_1util_1_1_c_timer.html#a1c09eaf22a2d5738fd31620a9eecd455", null ], - [ "GetTime", "classzen_1_1util_1_1_c_timer.html#a85b9f93a8630235c6b6b476289dad35c", null ], - [ "SetFrameRate", "classzen_1_1util_1_1_c_timer.html#a8db939f6b0856914f6ddc9555fe7c88b", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_timer_a1c09eaf22a2d5738fd31620a9eecd455_icgraph.map b/docs/classzen_1_1util_1_1_c_timer_a1c09eaf22a2d5738fd31620a9eecd455_icgraph.map deleted file mode 100644 index 1ba8c81d..00000000 --- a/docs/classzen_1_1util_1_1_c_timer_a1c09eaf22a2d5738fd31620a9eecd455_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1util_1_1_c_timer_a1c09eaf22a2d5738fd31620a9eecd455_icgraph.png b/docs/classzen_1_1util_1_1_c_timer_a1c09eaf22a2d5738fd31620a9eecd455_icgraph.png deleted file mode 100644 index 1022240f..00000000 Binary files a/docs/classzen_1_1util_1_1_c_timer_a1c09eaf22a2d5738fd31620a9eecd455_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_timer_aa7ec276af3862a205dac144d964720ae_icgraph.map b/docs/classzen_1_1util_1_1_c_timer_aa7ec276af3862a205dac144d964720ae_icgraph.map deleted file mode 100644 index f8a5e3a4..00000000 --- a/docs/classzen_1_1util_1_1_c_timer_aa7ec276af3862a205dac144d964720ae_icgraph.map +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/docs/classzen_1_1util_1_1_c_timer_aa7ec276af3862a205dac144d964720ae_icgraph.png b/docs/classzen_1_1util_1_1_c_timer_aa7ec276af3862a205dac144d964720ae_icgraph.png deleted file mode 100644 index e53e9d15..00000000 Binary files a/docs/classzen_1_1util_1_1_c_timer_aa7ec276af3862a205dac144d964720ae_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1_c_x_m_l_parser.html b/docs/classzen_1_1util_1_1_c_x_m_l_parser.html deleted file mode 100644 index d650d7f2..00000000 --- a/docs/classzen_1_1util_1_1_c_x_m_l_parser.html +++ /dev/null @@ -1,518 +0,0 @@ - - - - - - -Zenderer Engine: zen::util::CXMLParser Class Reference - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-
-Public Member Functions | -Static Public Member Functions
-
-
zen::util::CXMLParser Class Reference
Utilities
-
-
- -

A minimalistic XML parser that expects near-perfection from the user. - More...

- -

#include "XMLParser.hpp"

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

-Public Member Functions

 CXMLParser ()
 Does nothing. More...
 
 ~CXMLParser ()
 Clears the internal XML tree. More...
 
bool LoadFromFile (const string_t &filename)
 Loads and parses an XML file from disk. More...
 
bool LoadFromString (const char **str)
 Loads and parses XML data from a string. More...
 
const XMLNode *const FindNode (const string_t &name) const
 Retrieve the immutable node data for the first tag occurrence. More...
 
XMLNode * FindNode (const string_t &name)
 Retrieve the mutable node data for the first tag occurrence. More...
 
void ClearTree ()
 Deletes the XML tree. More...
 
XMLList_t::iterator begin ()
 Returns iterator to root of tree (for range-based for() loops). More...
 
const XMLList_t::const_iterator cbegin () const
 
XMLList_t::iterator end ()
 Returns ending iterator of tree (for range-based for() loops). More...
 
const XMLList_t::const_iterator cend () const
 
- - - - -

-Static Public Member Functions

static void ShowXMLError (const uint32_t line_no, const string_t &line, const string_t &reason)
 Outputs an XML error. More...
 
-

Detailed Description

-
Todo:
Fix XMLNode parent setting
-

This parser is definitely not W3C compliant and will only accept a very strict subset of standard XML code.

-

-Format

-

-Tags

-

Tags can only be expressed on a single line; the parser will refuse to parse the remainder of the file if it finds an unclosed tag. Tag names cannot contain spaces; well, theoretically, they can, but it's undefined behavior since I haven't tested it. Tags must be on lines by themselves, as well as their closing tags. Tags without a body are not allowed. There must be an equal number of opening and closing tags, but they don't have to necessarily have identical names :) meaning

-
<open>
-    stuff
-</close>
-

is perfectly valid as far as this parser is concerned!

-
<!-- Examples of invalid tags -->
-
<sometag
-
>
-
</sometag>
-
<no spaces>
-
</no spaces>
-
<closeOnOneLine> </closeOnOneLine>
-
<bodyless_tag/>
-
<!-- Nameless tag -->
-
<>
-
<tag1>
-
<!-- EOF without an end to tag1 -->
-

-Comments

-

Comments can only span a single line. They are distinguished by a <!-- prefix and end with a --> suffix. The spaces are required.

-
<!-- Examples of invalid comments -->
-
<!-- No closing tag
-
<!--No space after prefix -->
-
<!-- No space before suffix-->
-
<!--Nospacesatall-->
-

-Options

-

Options must be separated only by single spaces and the option values must be encompassed in double-quotations. There must not be anything between the option name and its value (other than the = character, of course).

-
<!-- The perfect XML tag with options: -->
-
<best_tag option1="the best" option2="tag ever">
-
</best_tag>
-
-
<!-- Examples of invalid options -->
-
-
<!-- no quotes around values -->
-
<tag opt1=2 opt2=3>
-
-
<!-- Not separated by a single space -->
-
<tag opt1="2" opt2="3">
-
-
<!-- Space after last option -->
-
<tag opt1="2" opt2="3" >
-
-
<!-- Spaces between the '=' character -->
-
<tag opt1 = "2" opt2 ="3">
-

In summation: stay perfect. If you think it might not work, it probably wont :)

- -

Definition at line 83 of file XMLParser.hpp.

-

Constructor & Destructor Documentation

- -
-
- - - - - - - -
CXMLParser::CXMLParser ()
-
- -

Definition at line 10 of file XMLParser.cpp.

- -
-
- -
-
- - - - - - - -
CXMLParser::~CXMLParser ()
-
- -

Definition at line 15 of file XMLParser.cpp.

- -
-
-

Member Function Documentation

- -
-
- - - - - - - - -
bool CXMLParser::LoadFromFile (const string_t & filename)
-
- -

Definition at line 20 of file XMLParser.cpp.

- -
-
- -
-
- - - - - - - - -
bool CXMLParser::LoadFromString (const char ** str)
-
- -

Definition at line 39 of file XMLParser.cpp.

- -
-
- -
-
- - - - - - - - -
const XMLNode* const zen::util::CXMLParser::FindNode (const string_t & name) const
-
- -
-
- -
-
- - - - - - - - -
util::XMLNode * CXMLParser::FindNode (const string_t & name)
-
- -

Definition at line 89 of file XMLParser.cpp.

- -
-
- -
-
- - - - - - - -
void CXMLParser::ClearTree ()
-
- -

Definition at line 45 of file XMLParser.cpp.

- -

-Here is the caller graph for this function:
-
-
- - -
-

- -
-
- -
-
- - - - - -
- - - - - - - -
XMLList_t::iterator zen::util::CXMLParser::begin ()
- 		-inline
-
- -

Definition at line 143 of file XMLParser.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const XMLList_t::const_iterator zen::util::CXMLParser::cbegin () const
- 		-inline
-
- -

Definition at line 148 of file XMLParser.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
XMLList_t::iterator zen::util::CXMLParser::end ()
- 		-inline
-
- -

Definition at line 153 of file XMLParser.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - -
const XMLList_t::const_iterator zen::util::CXMLParser::cend () const
- 		-inline
-
- -

Definition at line 158 of file XMLParser.hpp.

- -
-
- -
-
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
void CXMLParser::ShowXMLError (const uint32_t line_no,
const string_t & line,
const string_t & reason 
)
- 		-static
-
-

With Zenderer present, this will output to the engine log as a non-fatal error. Output format:

-

[ERROR] XML Parser – Malformed XML on line line_no: line (reason)

-
Parameters
- - - - -
line_noLine that the error occurred on
lineThe actual XML line
reasonThe reason for the error
-
-
- -

Definition at line 58 of file XMLParser.cpp.

- -
-
-
The documentation for this class was generated from the following files: -
-
- - - - diff --git a/docs/classzen_1_1util_1_1_c_x_m_l_parser.js b/docs/classzen_1_1util_1_1_c_x_m_l_parser.js deleted file mode 100644 index a8d7aa91..00000000 --- a/docs/classzen_1_1util_1_1_c_x_m_l_parser.js +++ /dev/null @@ -1,15 +0,0 @@ -var classzen_1_1util_1_1_c_x_m_l_parser = -[ - [ "CXMLParser", "classzen_1_1util_1_1_c_x_m_l_parser.html#a57ef047bac46de34e6dc890b47559ec1", null ], - [ "~CXMLParser", "classzen_1_1util_1_1_c_x_m_l_parser.html#acfc41063166e5fd59c0daf944d24bd80", null ], - [ "LoadFromFile", "classzen_1_1util_1_1_c_x_m_l_parser.html#ad896719620c8ab6ce824fe19e192a73b", null ], - [ "LoadFromString", "classzen_1_1util_1_1_c_x_m_l_parser.html#a262f4856230b5925ea295b29e914c13b", null ], - [ "FindNode", "classzen_1_1util_1_1_c_x_m_l_parser.html#a1f08169cf0e30d1400a0254a466e5d6b", null ], - [ "FindNode", "classzen_1_1util_1_1_c_x_m_l_parser.html#ac240aa93c1fb7443ce870cc6326e8a11", null ], - [ "ClearTree", "classzen_1_1util_1_1_c_x_m_l_parser.html#a11f42bb42eae7ddf87ef5e850af79c45", null ], - [ "begin", "classzen_1_1util_1_1_c_x_m_l_parser.html#a5fcb27d270dd8270023b72dcbd6acfa9", null ], - [ "cbegin", "classzen_1_1util_1_1_c_x_m_l_parser.html#a516af4a893f4f80f8d4810f34f436098", null ], - [ "end", "classzen_1_1util_1_1_c_x_m_l_parser.html#aee5e135ff757bd44304b3335f11e9b69", null ], - [ "cend", "classzen_1_1util_1_1_c_x_m_l_parser.html#a2c72e5d19878a84dd42ee5345985e862", null ], - [ "ShowXMLError", "classzen_1_1util_1_1_c_x_m_l_parser.html#a9e33c13f8ab83cfe52cbc092418bb32f", null ] -]; \ No newline at end of file diff --git a/docs/classzen_1_1util_1_1_c_x_m_l_parser_a11f42bb42eae7ddf87ef5e850af79c45_icgraph.map b/docs/classzen_1_1util_1_1_c_x_m_l_parser_a11f42bb42eae7ddf87ef5e850af79c45_icgraph.map deleted file mode 100644 index a6af7c8d..00000000 --- a/docs/classzen_1_1util_1_1_c_x_m_l_parser_a11f42bb42eae7ddf87ef5e850af79c45_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/classzen_1_1util_1_1_c_x_m_l_parser_a11f42bb42eae7ddf87ef5e850af79c45_icgraph.png b/docs/classzen_1_1util_1_1_c_x_m_l_parser_a11f42bb42eae7ddf87ef5e850af79c45_icgraph.png deleted file mode 100644 index 90883c96..00000000 Binary files a/docs/classzen_1_1util_1_1_c_x_m_l_parser_a11f42bb42eae7ddf87ef5e850af79c45_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1z_file_parser.html b/docs/classzen_1_1util_1_1z_file_parser.html index fd4b6602..cd789936 100644 --- a/docs/classzen_1_1util_1_1z_file_parser.html +++ b/docs/classzen_1_1util_1_1z_file_parser.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -129,12 +129,12 @@ virtual bool LoadFromFile (const string_t &filename)  Parses an entire file according to the format specification. More...
  -virtual bool LoadFromStream (std::ifstream &infile, const std::streampos start=0, const std::streampos end=-1, const char *const fname=nullptr) - Parses a portion of a filestream. More...
-  -virtual bool LoadFromStreamUntil (std::ifstream &infile, const string_t &end, const std::streampos start=0, const char *const filename=nullptr) - Parses a stream until reaching a sequence. More...
-  +virtual bool LoadFromStream (std::ifstream &infile, const std::streampos start=0, const std::streampos end=-1, const char *const fname=nullptr, const bool skip=false) + Parses a portion of a file stream. More...
+  +virtual bool LoadFromStreamUntil (std::ifstream &infile, const string_t &end, const std::streampos start=0, const char *const filename=nullptr, const bool skip=false) + Parses a stream until reaching a sequence. More...
+  string_t PopResult (const string_t &index, string_t def="")  Pop a result off of the container and return it. More...
  @@ -237,7 +237,7 @@

Member Function Documentation

- +
@@ -266,7 +266,13 @@

Member Function Documentation

- + + + + + + + @@ -286,7 +292,8 @@

Member Function Documentation

- + +
const char *const fname = nullptr fname = nullptr,
const bool skip = false 
fileFile stream to parse on
startStream position in the file to begin parsing
endStream position in the file to end parsing
fnameFilename of the stream, if applicable
fnameFilename of the stream, if applicable
skipShould we not return to the start of the stream?
@@ -298,15 +305,15 @@

Member Function Documentation

Here is the caller graph for this function:
-
- +
+

- +
@@ -335,7 +342,13 @@

Member Function Documentation

- + + + + + + + @@ -355,21 +368,22 @@

Member Function Documentation

- + +
const char *const filename = nullptr filename = nullptr,
const bool skip = false 
fileFile stream to parse on
endString sequence to quit parsing on if found
startStream position in the file to start parsing
fnameFilename of the stream, if applicable
fnameFilename of the stream, if applicable
skipShould we not return to the start of the stream?
Postcondition
The internal file result storage is filled with parsed data. Regardless of whether or not there was an error, all old parser state is lost.
Returns
true if the file was parsed up to end, false otherwise. Potential reasons for failure include a bad file stream, a bad range of positions, or a fatal parsing error.
-

Definition at line 54 of file FileParser.cpp.

+

Definition at line 53 of file FileParser.cpp.

Here is the caller graph for this function:
-
- - +
+ +

@@ -407,14 +421,14 @@

Member Function Documentation

Returns
The matching value for the index if it's found, and the default string otherwise.
-

Definition at line 89 of file FileParser.cpp.

+

Definition at line 87 of file FileParser.cpp.

Here is the caller graph for this function:
- +

@@ -442,7 +456,16 @@

Member Function Documentation

-

Definition at line 128 of file FileParser.hpp.

+

Definition at line 132 of file FileParser.hpp.

+ +

+Here is the caller graph for this function:
+
+
+ + +
+

@@ -479,14 +502,14 @@

Member Function Documentation

Returns
The first result matching index, and def otherwise.
-

Definition at line 107 of file FileParser.cpp.

+

Definition at line 105 of file FileParser.cpp.

Here is the caller graph for this function:
- +

@@ -515,7 +538,7 @@

Member Function Documentation

Returns
A container with all results for the given index.
-

Definition at line 120 of file FileParser.cpp.

+

Definition at line 118 of file FileParser.cpp.

@@ -540,7 +563,7 @@

Member Function Documentation

-

Definition at line 159 of file FileParser.hpp.

+

Definition at line 163 of file FileParser.hpp.

@@ -566,14 +589,14 @@

Member Function Documentation

-

Definition at line 161 of file FileParser.hpp.

+

Definition at line 165 of file FileParser.hpp.

Here is the caller graph for this function:
- +

diff --git a/docs/classzen_1_1util_1_1z_file_parser.js b/docs/classzen_1_1util_1_1z_file_parser.js index 423db95b..28862646 100644 --- a/docs/classzen_1_1util_1_1z_file_parser.js +++ b/docs/classzen_1_1util_1_1z_file_parser.js @@ -3,8 +3,8 @@ var classzen_1_1util_1_1z_file_parser = [ "zFileParser", "classzen_1_1util_1_1z_file_parser.html#a4e5cc1ad7347d7d09c1c1bd728afd47b", null ], [ "~zFileParser", "classzen_1_1util_1_1z_file_parser.html#a968e2922cf9841539199a0c7debbc7c8", null ], [ "LoadFromFile", "classzen_1_1util_1_1z_file_parser.html#a4125da033c5afa59c8987fa74e0b0d60", null ], - [ "LoadFromStream", "classzen_1_1util_1_1z_file_parser.html#adeb9b19a83a1a6c2827a036318d9c209", null ], - [ "LoadFromStreamUntil", "classzen_1_1util_1_1z_file_parser.html#a6ca2fe02ff85919a2c76dfb4445fc62d", null ], + [ "LoadFromStream", "classzen_1_1util_1_1z_file_parser.html#a264a42f7c8879c34710f15a31a639bae", null ], + [ "LoadFromStreamUntil", "classzen_1_1util_1_1z_file_parser.html#a8a8e702d15b655d041d949830ca43527", null ], [ "PopResult", "classzen_1_1util_1_1z_file_parser.html#a56f7717381124624cd7e1efcd3c7bf21", null ], [ "Exists", "classzen_1_1util_1_1z_file_parser.html#a94e7a9736e7777a611662a8c27dc0acc", null ], [ "GetFirstResult", "classzen_1_1util_1_1z_file_parser.html#ab2b838120a61de3df5963b16c53f36c4", null ], diff --git a/docs/classzen_1_1util_1_1z_file_parser_adeb9b19a83a1a6c2827a036318d9c209_icgraph.map b/docs/classzen_1_1util_1_1z_file_parser_a264a42f7c8879c34710f15a31a639bae_icgraph.map similarity index 100% rename from docs/classzen_1_1util_1_1z_file_parser_adeb9b19a83a1a6c2827a036318d9c209_icgraph.map rename to docs/classzen_1_1util_1_1z_file_parser_a264a42f7c8879c34710f15a31a639bae_icgraph.map diff --git a/docs/classzen_1_1util_1_1z_file_parser_adeb9b19a83a1a6c2827a036318d9c209_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_a264a42f7c8879c34710f15a31a639bae_icgraph.png similarity index 100% rename from docs/classzen_1_1util_1_1z_file_parser_adeb9b19a83a1a6c2827a036318d9c209_icgraph.png rename to docs/classzen_1_1util_1_1z_file_parser_a264a42f7c8879c34710f15a31a639bae_icgraph.png diff --git a/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.map b/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.map index 1dfd507b..35374794 100644 --- a/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.map +++ b/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.map @@ -1,3 +1,4 @@ + diff --git a/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.png index 8fb40a9c..987bb980 100644 Binary files a/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.png and b/docs/classzen_1_1util_1_1z_file_parser_a56f7717381124624cd7e1efcd3c7bf21_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_file_parser_a6ca2fe02ff85919a2c76dfb4445fc62d_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_a6ca2fe02ff85919a2c76dfb4445fc62d_icgraph.png deleted file mode 100644 index eb76be4f..00000000 Binary files a/docs/classzen_1_1util_1_1z_file_parser_a6ca2fe02ff85919a2c76dfb4445fc62d_icgraph.png and /dev/null differ diff --git a/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.map b/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.map index e39bb0a4..5656b799 100644 --- a/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.map +++ b/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.map @@ -1,3 +1,4 @@ + diff --git a/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.png index 745ad056..0c521970 100644 Binary files a/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.png and b/docs/classzen_1_1util_1_1z_file_parser_a7c4a7903e417cd09b31fae28c95310b8_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_file_parser_a6ca2fe02ff85919a2c76dfb4445fc62d_icgraph.map b/docs/classzen_1_1util_1_1z_file_parser_a8a8e702d15b655d041d949830ca43527_icgraph.map similarity index 68% rename from docs/classzen_1_1util_1_1z_file_parser_a6ca2fe02ff85919a2c76dfb4445fc62d_icgraph.map rename to docs/classzen_1_1util_1_1z_file_parser_a8a8e702d15b655d041d949830ca43527_icgraph.map index 6af99158..a0b0f39d 100644 --- a/docs/classzen_1_1util_1_1z_file_parser_a6ca2fe02ff85919a2c76dfb4445fc62d_icgraph.map +++ b/docs/classzen_1_1util_1_1z_file_parser_a8a8e702d15b655d041d949830ca43527_icgraph.map @@ -1,3 +1,4 @@ + diff --git a/docs/classzen_1_1util_1_1z_file_parser_a8a8e702d15b655d041d949830ca43527_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_a8a8e702d15b655d041d949830ca43527_icgraph.png new file mode 100644 index 00000000..bc35f511 Binary files /dev/null and b/docs/classzen_1_1util_1_1z_file_parser_a8a8e702d15b655d041d949830ca43527_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_file_parser_a94e7a9736e7777a611662a8c27dc0acc_icgraph.map b/docs/classzen_1_1util_1_1z_file_parser_a94e7a9736e7777a611662a8c27dc0acc_icgraph.map new file mode 100644 index 00000000..f15907be --- /dev/null +++ b/docs/classzen_1_1util_1_1z_file_parser_a94e7a9736e7777a611662a8c27dc0acc_icgraph.map @@ -0,0 +1,4 @@ + + + + diff --git a/docs/classzen_1_1util_1_1z_file_parser_a94e7a9736e7777a611662a8c27dc0acc_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_a94e7a9736e7777a611662a8c27dc0acc_icgraph.png new file mode 100644 index 00000000..5c427dab Binary files /dev/null and b/docs/classzen_1_1util_1_1z_file_parser_a94e7a9736e7777a611662a8c27dc0acc_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.map b/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.map index 93257676..6d001285 100644 --- a/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.map +++ b/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.map @@ -1,3 +1,4 @@ + diff --git a/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.png b/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.png index 1466db26..be5a6dc0 100644 Binary files a/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.png and b/docs/classzen_1_1util_1_1z_file_parser_ab2b838120a61de3df5963b16c53f36c4_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_log.html b/docs/classzen_1_1util_1_1z_log.html index 44212bda..5a309281 100644 --- a/docs/classzen_1_1util_1_1z_log.html +++ b/docs/classzen_1_1util_1_1z_log.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -472,7 +472,7 @@

Member Function Documentation

- +

@@ -522,7 +522,7 @@

Member Function Documentation

- +

@@ -557,7 +557,7 @@

Member Function Documentation

- +

@@ -642,7 +642,7 @@

Member Function Documentation

- +

@@ -676,7 +676,7 @@

Member Function Documentation

- +

@@ -703,14 +703,14 @@

Member Function Documentation

-

Definition at line 111 of file Log.cpp.

+

Definition at line 106 of file Log.cpp.

Here is the caller graph for this function:
- +

@@ -769,6 +769,8 @@

Friends And Related Function Documentation

+

Definition at line 179 of file Log.hpp.

+

Field Documentation

@@ -790,7 +792,7 @@

Field Documentation

-

Definition at line 184 of file Log.hpp.

+

Definition at line 185 of file Log.hpp.

diff --git a/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.map b/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.map index f6a2e86f..86f17a6d 100644 --- a/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.map +++ b/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.map @@ -1,9 +1,12 @@ - - - - - - - + + + + + + + + + + diff --git a/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.png b/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.png index ae82e23e..9f93feae 100644 Binary files a/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.png and b/docs/classzen_1_1util_1_1z_log_a050d764d3b818e2619b0e4880edf749e_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.map b/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.map index 6dd65eef..cbaf4d95 100644 --- a/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.map +++ b/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.map @@ -1,13 +1,13 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.png b/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.png index c3fd3fc6..e9cdf0bd 100644 Binary files a/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.png and b/docs/classzen_1_1util_1_1z_log_a0e741f7919523907a62620025030cbc0_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.map b/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.map index dda59949..e6c1c9fc 100644 --- a/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.map +++ b/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.map @@ -1,11 +1,11 @@ - - - - - - - - - + + + + + + + + + diff --git a/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.png b/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.png index 099f753b..2a14776b 100644 Binary files a/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.png and b/docs/classzen_1_1util_1_1z_log_a2c680d3d86ea666ae74df9a9e5cbad18_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.map b/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.map index ef762439..b0f27daa 100644 --- a/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.map +++ b/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.png b/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.png index ffd027b3..9b877077 100644 Binary files a/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.png and b/docs/classzen_1_1util_1_1z_log_a2f3a062395707bdfbba36866ec3ead01_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.map b/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.map index ed7ea54a..240e6d95 100644 --- a/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.map +++ b/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.map @@ -1,51 +1,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.png b/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.png index 9fea0398..a36a7e07 100644 Binary files a/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.png and b/docs/classzen_1_1util_1_1z_log_a53d91446f6f763d4b29b1178e6ad6788_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.map b/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.map index 81aacacc..71c52c57 100644 --- a/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.map +++ b/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.map @@ -1,17 +1,18 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.png b/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.png index 99bc3c23..2963ede2 100644 Binary files a/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.png and b/docs/classzen_1_1util_1_1z_log_aaee9a40dab0f253880229699e6fb52a3_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_option.html b/docs/classzen_1_1util_1_1z_option.html index 773c3409..117f2a86 100644 --- a/docs/classzen_1_1util_1_1z_option.html +++ b/docs/classzen_1_1util_1_1z_option.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1util_1_1z_parser.html b/docs/classzen_1_1util_1_1z_parser.html index df6f2e09..266d2d38 100644 --- a/docs/classzen_1_1util_1_1z_parser.html +++ b/docs/classzen_1_1util_1_1z_parser.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1util_1_1z_random.html b/docs/classzen_1_1util_1_1z_random.html index d98639c4..c4e6a2ed 100644 --- a/docs/classzen_1_1util_1_1z_random.html +++ b/docs/classzen_1_1util_1_1z_random.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -245,7 +245,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.map b/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.map index aaf93671..0549a013 100644 --- a/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.map +++ b/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.map @@ -1,4 +1,4 @@ - + diff --git a/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.png b/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.png index f5beb38a..b6b24b27 100644 Binary files a/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.png and b/docs/classzen_1_1util_1_1z_random_a0d81392050f2797bc168a996dc96ffa1_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_settings.html b/docs/classzen_1_1util_1_1z_settings.html index 2f35b6b1..93a42768 100644 --- a/docs/classzen_1_1util_1_1z_settings.html +++ b/docs/classzen_1_1util_1_1z_settings.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1util_1_1z_timer.html b/docs/classzen_1_1util_1_1z_timer.html index 34a6b504..d0810d98 100644 --- a/docs/classzen_1_1util_1_1z_timer.html +++ b/docs/classzen_1_1util_1_1z_timer.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -165,7 +165,7 @@

Detailed Description

This class provides fairly generic timing functionality, with the ability to start, stop, measure, and delay for various periods of time. Most methods are virtual, allowing for a user to inherit and implement their own custom timer, but still be able to pass it around to various parts of the engine when necessary.

-

Definition at line 42 of file Timer.hpp.

+

Definition at line 47 of file Timer.hpp.

Member Typedef Documentation

@@ -177,7 +177,7 @@
-

Definition at line 46 of file Timer.hpp.

+

Definition at line 51 of file Timer.hpp.

@@ -191,7 +191,7 @@
-

Definition at line 49 of file Timer.hpp.

+

Definition at line 54 of file Timer.hpp.

@@ -205,7 +205,7 @@
-

Definition at line 52 of file Timer.hpp.

+

Definition at line 57 of file Timer.hpp.

@@ -282,7 +282,7 @@

Member Function Documentation

- +

@@ -354,6 +354,15 @@

Member Function Documentation

Definition at line 34 of file Timer.cpp.

+

+Here is the caller graph for this function:
+
+
+ + +
+

+ @@ -396,14 +405,14 @@

Member Function Documentation

}
Returns
The amount of milliseconds the thread slept (if any).
-

Definition at line 39 of file Timer.cpp.

+

Definition at line 52 of file Timer.cpp.

Here is the caller graph for this function:
- +

@@ -430,7 +439,7 @@

Member Function Documentation

-

Definition at line 59 of file Timer.cpp.

+

Definition at line 71 of file Timer.cpp.

@@ -448,7 +457,7 @@

Member Function Documentation

-

Definition at line 65 of file Timer.cpp.

+

Definition at line 77 of file Timer.cpp.

diff --git a/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.map b/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.map index 15a39d6b..1df29c5c 100644 --- a/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.map +++ b/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.map @@ -1,4 +1,5 @@ - + + diff --git a/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.png b/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.png index e1385390..05717bb5 100644 Binary files a/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.png and b/docs/classzen_1_1util_1_1z_timer_a1decc1f95613e9eca50d52e4add8bd0e_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_timer_a391c975d03981bb7607e28db36720eec_icgraph.map b/docs/classzen_1_1util_1_1z_timer_a391c975d03981bb7607e28db36720eec_icgraph.map new file mode 100644 index 00000000..217bb5cf --- /dev/null +++ b/docs/classzen_1_1util_1_1z_timer_a391c975d03981bb7607e28db36720eec_icgraph.map @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/classzen_1_1util_1_1z_timer_a391c975d03981bb7607e28db36720eec_icgraph.png b/docs/classzen_1_1util_1_1z_timer_a391c975d03981bb7607e28db36720eec_icgraph.png new file mode 100644 index 00000000..1c6c9ea5 Binary files /dev/null and b/docs/classzen_1_1util_1_1z_timer_a391c975d03981bb7607e28db36720eec_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.map b/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.map index b66af729..d93e4f93 100644 --- a/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.map +++ b/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.map @@ -1,4 +1,5 @@ - + + diff --git a/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.png b/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.png index d295d1e2..70313e8a 100644 Binary files a/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.png and b/docs/classzen_1_1util_1_1z_timer_a61a93b2e2de84029d98c67cc9f737ba9_icgraph.png differ diff --git a/docs/classzen_1_1util_1_1z_x_m_l_parser.html b/docs/classzen_1_1util_1_1z_x_m_l_parser.html index f8609147..998146ff 100644 --- a/docs/classzen_1_1util_1_1z_x_m_l_parser.html +++ b/docs/classzen_1_1util_1_1z_x_m_l_parser.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -161,7 +161,7 @@  

Detailed Description

-
Todo:
Fix XMLNode parent setting
+
Todo:
Fix XMLNode parent setting

This parser is definitely not W3C compliant and will only accept a very strict subset of standard XML code.

Format

@@ -214,7 +214,7 @@

<tag opt1 = "2" opt2 ="3">

In summation: stay perfect. If you think it might not work, it probably wont :)

-

Definition at line 83 of file XMLParser.hpp.

+

Definition at line 84 of file XMLParser.hpp.

Constructor & Destructor Documentation

@@ -368,7 +368,7 @@

Member Function Documentation

-

Definition at line 143 of file XMLParser.hpp.

+

Definition at line 144 of file XMLParser.hpp.

@@ -393,7 +393,7 @@

Member Function Documentation

-

Definition at line 148 of file XMLParser.hpp.

+

Definition at line 149 of file XMLParser.hpp.

@@ -418,7 +418,7 @@

Member Function Documentation

-

Definition at line 153 of file XMLParser.hpp.

+

Definition at line 154 of file XMLParser.hpp.

@@ -443,7 +443,7 @@

Member Function Documentation

-

Definition at line 158 of file XMLParser.hpp.

+

Definition at line 159 of file XMLParser.hpp.

diff --git a/docs/classzen_1_1z_allocator.html b/docs/classzen_1_1z_allocator.html index e1bcf6df..f58fce4b 100644 --- a/docs/classzen_1_1z_allocator.html +++ b/docs/classzen_1_1z_allocator.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/classzen_1_1z_subsystem.html b/docs/classzen_1_1z_subsystem.html index 29fe1b11..6be04fd1 100644 --- a/docs/classzen_1_1z_subsystem.html +++ b/docs/classzen_1_1z_subsystem.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -191,7 +191,7 @@
-

Definition at line 10 of file Subsystem.cpp.

+

Definition at line 11 of file Subsystem.cpp.

@@ -216,7 +216,7 @@
-

Definition at line 20 of file Subsystem.cpp.

+

Definition at line 21 of file Subsystem.cpp.

@@ -301,7 +301,7 @@

Member Function Documentation

- +

diff --git a/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.map b/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.map index bfa6ea1d..4e55f467 100644 --- a/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.map +++ b/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.map @@ -1,24 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.png b/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.png index bdb66bc8..507b88db 100644 Binary files a/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.png and b/docs/classzen_1_1z_subsystem_ae72732b27debb2c522a676e65099406d_icgraph.png differ diff --git a/docs/dir_000002_000004.html b/docs/dir_000002_000004.html index 19c448a5..d4c44fa6 100644 --- a/docs/dir_000002_000004.html +++ b/docs/dir_000002_000004.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000002_000012.html b/docs/dir_000002_000012.html index a8d1d2c7..d4230a46 100644 --- a/docs/dir_000002_000012.html +++ b/docs/dir_000002_000012.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000002_000013.html b/docs/dir_000002_000013.html index 0992cab4..cf150942 100644 --- a/docs/dir_000002_000013.html +++ b/docs/dir_000002_000013.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000002_000014.html b/docs/dir_000002_000014.html deleted file mode 100644 index 38c77066..00000000 --- a/docs/dir_000002_000014.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer -> Network Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Zenderer → Network Relation

File in Zenderer/include/ZendererIncludes file in Zenderer/include/Zenderer/Network
Zenderer.hppSocket.hpp
-
- - - - diff --git a/docs/dir_000002_000015.html b/docs/dir_000002_000015.html index 63ecf233..5b72fde4 100644 --- a/docs/dir_000002_000015.html +++ b/docs/dir_000002_000015.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000003_000005.html b/docs/dir_000003_000005.html index 01fae200..09ec09fb 100644 --- a/docs/dir_000003_000005.html +++ b/docs/dir_000003_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000003_000016.html b/docs/dir_000003_000016.html deleted file mode 100644 index f4a9de3b..00000000 --- a/docs/dir_000003_000016.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Assets -> Utilities Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Assets → Utilities Relation

File in Zenderer/include/Zenderer/AssetsIncludes file in Zenderer/include/Zenderer/Utilities
Asset.hppAssert.hpp
Asset.hppHelpers.hpp
Asset.hppLog.hpp
-
- - - - diff --git a/docs/dir_000003_000017.html b/docs/dir_000003_000017.html index 5e5930c3..bc570c6b 100644 --- a/docs/dir_000003_000017.html +++ b/docs/dir_000003_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000004_000003.html b/docs/dir_000004_000003.html index 974c2260..fe66af52 100644 --- a/docs/dir_000004_000003.html +++ b/docs/dir_000004_000003.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000004_000005.html b/docs/dir_000004_000005.html index d3d66b6a..2d634bc4 100644 --- a/docs/dir_000004_000005.html +++ b/docs/dir_000004_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000004_000017.html b/docs/dir_000004_000017.html index e3a74959..9f455d44 100644 --- a/docs/dir_000004_000017.html +++ b/docs/dir_000004_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000005_000017.html b/docs/dir_000005_000017.html index 7b3d2d25..71bdc0f8 100644 --- a/docs/dir_000005_000017.html +++ b/docs/dir_000005_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000006_000003.html b/docs/dir_000006_000003.html index b501406a..40ab4cd4 100644 --- a/docs/dir_000006_000003.html +++ b/docs/dir_000006_000003.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -99,7 +99,7 @@
-

CoreGraphics → Assets Relation

File in Zenderer/include/Zenderer/CoreGraphicsIncludes file in Zenderer/include/Zenderer/Assets
Shader.hppAsset.hpp
ShaderSet.hppAssetManager.hpp
Texture.hppAsset.hpp
+

CoreGraphics → Assets Relation

File in Zenderer/include/Zenderer/CoreGraphicsIncludes file in Zenderer/include/Zenderer/Assets
Shader.hppAsset.hpp
ShaderSet.hppAssetManager.hpp
Texture.hppAsset.hpp
Texture.hppAssetManager.hpp
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000006_000011.html b/docs/dir_000006_000011.html index e4e1533e..86e75931 100644 --- a/docs/dir_000006_000011.html +++ b/docs/dir_000006_000011.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000006_000013.html b/docs/dir_000006_000013.html deleted file mode 100644 index 91ee7d17..00000000 --- a/docs/dir_000006_000013.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/CoreGraphics -> Math Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

CoreGraphics → Math Relation

File in Zenderer/include/Zenderer/CoreGraphicsIncludes file in Zenderer/include/Zenderer/Math
Drawable.hppMath.hpp
Renderer.hppMatrix.hpp
-
- - - - diff --git a/docs/dir_000006_000014.html b/docs/dir_000006_000014.html index fb1383fd..b0e47c72 100644 --- a/docs/dir_000006_000014.html +++ b/docs/dir_000006_000014.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000006_000015.html b/docs/dir_000006_000015.html deleted file mode 100644 index d1dbdee0..00000000 --- a/docs/dir_000006_000015.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/CoreGraphics -> Objects Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

CoreGraphics → Objects Relation

File in Zenderer/include/Zenderer/CoreGraphicsIncludes file in Zenderer/include/Zenderer/Objects
Sorter.hppEntity.hpp
-
- - - - diff --git a/docs/dir_000006_000016.html b/docs/dir_000006_000016.html index 32f2a86c..85fc08ad 100644 --- a/docs/dir_000006_000016.html +++ b/docs/dir_000006_000016.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000006_000017.html b/docs/dir_000006_000017.html index e588172a..64cb2506 100644 --- a/docs/dir_000006_000017.html +++ b/docs/dir_000006_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000007_000005.html b/docs/dir_000007_000005.html index b3d80f77..ee6dc956 100644 --- a/docs/dir_000007_000005.html +++ b/docs/dir_000007_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000007_000006.html b/docs/dir_000007_000006.html index 810bebd3..89c98164 100644 --- a/docs/dir_000007_000006.html +++ b/docs/dir_000007_000006.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000007_000013.html b/docs/dir_000007_000013.html deleted file mode 100644 index 21b8e787..00000000 --- a/docs/dir_000007_000013.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Events -> Math Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  2.10.8-alpha -
-
A OpenGL-based 2D engine. Currently at 8785 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Events → Math Relation

File in Zenderer/include/Zenderer/EventsIncludes file in Zenderer/include/Zenderer/Math
Mouse.hppVector.hpp
-
- - - - diff --git a/docs/dir_000007_000014.html b/docs/dir_000007_000014.html index 52ecde3e..0724ead9 100644 --- a/docs/dir_000007_000014.html +++ b/docs/dir_000007_000014.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000010_000005.html b/docs/dir_000010_000005.html index 181baf94..4ae20fba 100644 --- a/docs/dir_000010_000005.html +++ b/docs/dir_000010_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000010_000008.html b/docs/dir_000010_000008.html index 98a2a669..1190cfdc 100644 --- a/docs/dir_000010_000008.html +++ b/docs/dir_000010_000008.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000010_000016.html b/docs/dir_000010_000016.html deleted file mode 100644 index 598c3943..00000000 --- a/docs/dir_000010_000016.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Scripting -> Utilities Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Scripting → Utilities Relation

File in Zenderer/include/Zenderer/ScriptingIncludes file in Zenderer/include/Zenderer/Utilities
Lua.hppAssert.hpp
-
- - - - diff --git a/docs/dir_000010_000017.html b/docs/dir_000010_000017.html index 7e641b10..7f786eff 100644 --- a/docs/dir_000010_000017.html +++ b/docs/dir_000010_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000003.html b/docs/dir_000011_000003.html index e6bd6583..2e5de4f4 100644 --- a/docs/dir_000011_000003.html +++ b/docs/dir_000011_000003.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000005.html b/docs/dir_000011_000005.html index 3611ce25..1e348942 100644 --- a/docs/dir_000011_000005.html +++ b/docs/dir_000011_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000006.html b/docs/dir_000011_000006.html index e82bb245..e7b9c54f 100644 --- a/docs/dir_000011_000006.html +++ b/docs/dir_000011_000006.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000007.html b/docs/dir_000011_000007.html index 3309dfb3..e6e89aa1 100644 --- a/docs/dir_000011_000007.html +++ b/docs/dir_000011_000007.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000013.html b/docs/dir_000011_000013.html deleted file mode 100644 index 27ff910a..00000000 --- a/docs/dir_000011_000013.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Graphics -> Math Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Graphics → Math Relation

File in Zenderer/include/Zenderer/GraphicsIncludes file in Zenderer/include/Zenderer/Math
Effect.hppMatrix.hpp
Light.hppMatrix.hpp
Quad.hppShapes.hpp
RenderTarget.hppMath.hpp
Triangle.hppShapes.hpp
Window.hppMatrix.hpp
-
- - - - diff --git a/docs/dir_000011_000014.html b/docs/dir_000011_000014.html index 462d073f..f2f5f84d 100644 --- a/docs/dir_000011_000014.html +++ b/docs/dir_000011_000014.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000015.html b/docs/dir_000011_000015.html deleted file mode 100644 index b3846fe6..00000000 --- a/docs/dir_000011_000015.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Graphics -> Objects Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Graphics → Objects Relation

File in Zenderer/include/Zenderer/GraphicsIncludes file in Zenderer/include/Zenderer/Objects
Scene.hppEntity.hpp
-
- - - - diff --git a/docs/dir_000011_000016.html b/docs/dir_000011_000016.html index b654911b..f68e8bad 100644 --- a/docs/dir_000011_000016.html +++ b/docs/dir_000011_000016.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000011_000017.html b/docs/dir_000011_000017.html index b3d9a5d5..6e4e10a8 100644 --- a/docs/dir_000011_000017.html +++ b/docs/dir_000011_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000005.html b/docs/dir_000012_000005.html index ec2c058d..009ae60b 100644 --- a/docs/dir_000012_000005.html +++ b/docs/dir_000012_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000006.html b/docs/dir_000012_000006.html index f62e81f9..ee1cffa4 100644 --- a/docs/dir_000012_000006.html +++ b/docs/dir_000012_000006.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000007.html b/docs/dir_000012_000007.html index 6116c1e4..4174c1a3 100644 --- a/docs/dir_000012_000007.html +++ b/docs/dir_000012_000007.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000011.html b/docs/dir_000012_000011.html index 96b2e31c..0dda0e71 100644 --- a/docs/dir_000012_000011.html +++ b/docs/dir_000012_000011.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000013.html b/docs/dir_000012_000013.html deleted file mode 100644 index 9f5d20f8..00000000 --- a/docs/dir_000012_000013.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/GUI -> Math Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

GUI → Math Relation

File in Zenderer/include/Zenderer/GUIIncludes file in Zenderer/include/Zenderer/Math
FontCore.hppShapes.hpp
-
- - - - diff --git a/docs/dir_000012_000014.html b/docs/dir_000012_000014.html index 7dd9e412..86becc1e 100644 --- a/docs/dir_000012_000014.html +++ b/docs/dir_000012_000014.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000015.html b/docs/dir_000012_000015.html deleted file mode 100644 index 9a9b5792..00000000 --- a/docs/dir_000012_000015.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/GUI -> Objects Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

GUI → Objects Relation

File in Zenderer/include/Zenderer/GUIIncludes file in Zenderer/include/Zenderer/Objects
Font.hppEntity.hpp
FontAtlas.hppEntity.hpp
-
- - - - diff --git a/docs/dir_000012_000016.html b/docs/dir_000012_000016.html index f3a796d0..b638c9e0 100644 --- a/docs/dir_000012_000016.html +++ b/docs/dir_000012_000016.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000012_000017.html b/docs/dir_000012_000017.html index d18cdc9e..5d2b1faf 100644 --- a/docs/dir_000012_000017.html +++ b/docs/dir_000012_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000013_000003.html b/docs/dir_000013_000003.html index 75d433e8..4c28ee65 100644 --- a/docs/dir_000013_000003.html +++ b/docs/dir_000013_000003.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000013_000005.html b/docs/dir_000013_000005.html index 5bb15610..0c9e7fbf 100644 --- a/docs/dir_000013_000005.html +++ b/docs/dir_000013_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000013_000011.html b/docs/dir_000013_000011.html index 459c6d66..89e60990 100644 --- a/docs/dir_000013_000011.html +++ b/docs/dir_000013_000011.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -99,7 +99,7 @@
-

Levels → Graphics Relation

File in Zenderer/include/Zenderer/LevelsIncludes file in Zenderer/include/Zenderer/Graphics
Level.hppLight.hpp
LevelLoader.hppPolygon.hpp
LevelLoader.hppScene.hpp
+

Levels → Graphics Relation

File in Zenderer/include/Zenderer/LevelsIncludes file in Zenderer/include/Zenderer/Graphics
Level.hppLight.hpp
LevelLoader.hppConcavePolygon.hpp
LevelLoader.hppScene.hpp
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000013_000017.html b/docs/dir_000013_000017.html index 436fa739..65bb63b5 100644 --- a/docs/dir_000013_000017.html +++ b/docs/dir_000013_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000014_000005.html b/docs/dir_000014_000005.html index 2cfefa2d..ce94041c 100644 --- a/docs/dir_000014_000005.html +++ b/docs/dir_000014_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000014_000016.html b/docs/dir_000014_000016.html deleted file mode 100644 index 47c78ba3..00000000 --- a/docs/dir_000014_000016.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Network -> Utilities Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Network → Utilities Relation

File in Zenderer/include/Zenderer/NetworkIncludes file in Zenderer/include/Zenderer/Utilities
Socket.hppAssert.hpp
Socket.hppLog.hpp
-
- - - - diff --git a/docs/dir_000014_000017.html b/docs/dir_000014_000017.html index fbbfdc23..32beccd3 100644 --- a/docs/dir_000014_000017.html +++ b/docs/dir_000014_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000015_000005.html b/docs/dir_000015_000005.html index 85dd5fb6..98c23b28 100644 --- a/docs/dir_000015_000005.html +++ b/docs/dir_000015_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000015_000006.html b/docs/dir_000015_000006.html deleted file mode 100644 index 38bb8a0c..00000000 --- a/docs/dir_000015_000006.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Objects -> CoreGraphics Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Objects → CoreGraphics Relation

File in Zenderer/include/Zenderer/ObjectsIncludes file in Zenderer/include/Zenderer/CoreGraphics
Entity.hppDrawable.hpp
-
- - - - diff --git a/docs/dir_000015_000011.html b/docs/dir_000015_000011.html deleted file mode 100644 index b3b212a8..00000000 --- a/docs/dir_000015_000011.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Objects -> Graphics Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Objects → Graphics Relation

File in Zenderer/include/Zenderer/ObjectsIncludes file in Zenderer/include/Zenderer/Graphics
Entity.hppMaterial.hpp
Entity.hppQuad.hpp
Entity.hppWindow.hpp
-
- - - - diff --git a/docs/dir_000015_000013.html b/docs/dir_000015_000013.html deleted file mode 100644 index b6a777b6..00000000 --- a/docs/dir_000015_000013.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Objects -> Math Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Objects → Math Relation

File in Zenderer/include/Zenderer/ObjectsIncludes file in Zenderer/include/Zenderer/Math
Entity.hppMath.hpp
Physics.hppMath.hpp
-
- - - - diff --git a/docs/dir_000015_000016.html b/docs/dir_000015_000016.html deleted file mode 100644 index 2657da2e..00000000 --- a/docs/dir_000015_000016.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/include/Zenderer/Objects -> Utilities Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

Objects → Utilities Relation

File in Zenderer/include/Zenderer/ObjectsIncludes file in Zenderer/include/Zenderer/Utilities
Entity.hppINIParser.hpp
-
- - - - diff --git a/docs/dir_000015_000017.html b/docs/dir_000015_000017.html index 73480877..21e5dd1c 100644 --- a/docs/dir_000015_000017.html +++ b/docs/dir_000015_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000016_000005.html b/docs/dir_000016_000005.html index fa54c2b0..746315e2 100644 --- a/docs/dir_000016_000005.html +++ b/docs/dir_000016_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000016_000011.html b/docs/dir_000016_000011.html index b961cd7b..b0b33ac4 100644 --- a/docs/dir_000016_000011.html +++ b/docs/dir_000016_000011.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000016_000014.html b/docs/dir_000016_000014.html index d26d39fb..d0113ce7 100644 --- a/docs/dir_000016_000014.html +++ b/docs/dir_000016_000014.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000016_000017.html b/docs/dir_000016_000017.html index ae48cf88..95a52a72 100644 --- a/docs/dir_000016_000017.html +++ b/docs/dir_000016_000017.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000017_000001.html b/docs/dir_000017_000001.html deleted file mode 100644 index 14655f75..00000000 --- a/docs/dir_000017_000001.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - -Zenderer Engine: Zenderer/src -> include Relation - - - - - - - - - - - - - -
-
- - - - - - -
-
Zenderer Engine -  3.0.0-alpha -
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
-
-
- - - - -
-
- -
-
-
- -
- - - - -
- -
- -
-

src → include Relation

File in Zenderer/srcIncludes file in Zenderer/include
Core / Allocator.cppZenderer / Core / Allocator.hpp
Utilities / Assert.cppZenderer / Utilities / Assert.hpp
Assets / Asset.cppZenderer / Assets / Asset.hpp
Assets / AssetManager.cppZenderer / Assets / AssetManager.hpp
Audio / Audio2D.cppZenderer / Audio / Audio2D.hpp
Audio / AudioManager.cppZenderer / Audio / AudioManager.hpp
GUI / Button.cppZenderer / GUI / Button.hpp
CoreGraphics / Drawable.cppZenderer / CoreGraphics / Drawable.hpp
Graphics / Effect.cppZenderer / Graphics / Effect.hpp
EngineTest.cppZenderer / Zenderer.hpp
Objects / Entity.cppZenderer / Objects / Entity.hpp
Core / ErrorHandling.cppZenderer / Core / ErrorHandling.hpp
Events / EventHandler.cppZenderer / Events / EventHandler.hpp
GUI / Font.cppZenderer / GUI / Font.hpp
Utilities / Helpers.cppZenderer / Utilities / Helpers.hpp
Utilities / INIParser.cppZenderer / Utilities / INIParser.hpp
Graphics / Light.cppZenderer / Graphics / Light.hpp
Utilities / Log.cppZenderer / Utilities / Log.hpp
Graphics / Material.cppZenderer / Graphics / Material.hpp
Math / MathCore.cppZenderer / Math / MathCore.hpp
Math / Matrix.cppZenderer / Math / Matrix.hpp
GUI / Menu.cppZenderer / GUI / Menu.hpp
Events / Mouse.cppZenderer / Events / Mouse.hpp
Audio / Music2D.cppZenderer / Audio / Music2D.hpp
CoreGraphics / OpenGL.cppZenderer / CoreGraphics / OpenGL.hpp
Graphics / Polygon.cppZenderer / Graphics / Polygon.hpp
Pong.cppZenderer / Zenderer.hpp
Graphics / Quad.cppZenderer / Graphics / Quad.hpp
CoreGraphics / Renderer.cppZenderer / CoreGraphics / Renderer.hpp
Graphics / RenderTarget.cppZenderer / Graphics / RenderTarget.hpp
Graphics / Scene.cppZenderer / Graphics / Scene.hpp
Utilities / Settings.cppZenderer / Utilities / Settings.hpp
CoreGraphics / Shader.cppZenderer / CoreGraphics / Shader.hpp
CoreGraphics / ShaderSet.cppZenderer / CoreGraphics / ShaderSet.hpp
Network / Socket.cppZenderer / Network / Socket.hpp
CoreGraphics / Sorter.cppZenderer / CoreGraphics / Sorter.hpp
Audio / Sound2D.cppZenderer / Audio / Sound2D.hpp
Core / Subsystem.cppZenderer / Core / Subsystem.hpp
CoreGraphics / Texture.cppZenderer / CoreGraphics / Texture.hpp
Utilities / Timer.cppZenderer / Utilities / Timer.hpp
CoreGraphics / VertexArray.cppZenderer / CoreGraphics / VertexArray.hpp
Graphics / Window.cppZenderer / Graphics / Window.hpp
Utilities / XMLParser.cppZenderer / Utilities / XMLParser.hpp
Zenderer.cppZenderer / Zenderer.hpp
-
- - - - diff --git a/docs/dir_000017_000005.html b/docs/dir_000017_000005.html index e4849981..9a51b353 100644 --- a/docs/dir_000017_000005.html +++ b/docs/dir_000017_000005.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000005_000016.html b/docs/dir_000017_000014.html similarity index 89% rename from docs/dir_000005_000016.html rename to docs/dir_000017_000014.html index 44cab5aa..76432624 100644 --- a/docs/dir_000005_000016.html +++ b/docs/dir_000017_000014.html @@ -4,7 +4,7 @@ -Zenderer Engine: Zenderer/include/Zenderer/Core -> Utilities Relation +Zenderer Engine: Zenderer/include/Zenderer/Utilities -> Math Relation @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 8924 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -81,7 +81,7 @@
@@ -99,12 +99,12 @@
-

Core → Utilities Relation

File in Zenderer/include/Zenderer/CoreIncludes file in Zenderer/include/Zenderer/Utilities
Subsystem.hppLog.hpp
+

Utilities → Math Relation

File in Zenderer/include/Zenderer/UtilitiesIncludes file in Zenderer/include/Zenderer/Math
XMLParser.hppMath.hpp
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -99,7 +99,7 @@
-

src → include Relation

File in Zenderer/srcIncludes file in Zenderer/include
Core / Allocator.cppZenderer / Core / Allocator.hpp
Objects / Animation.cppZenderer / Objects / Animation.hpp
Utilities / Assert.cppZenderer / Utilities / Assert.hpp
Assets / Asset.cppZenderer / Assets / Asset.hpp
Assets / AssetManager.cppZenderer / Assets / AssetManager.hpp
Audio / Audio2D.cppZenderer / Audio / Audio2D.hpp
Audio / AudioManager.cppZenderer / Audio / AudioManager.hpp
GUI / Button.cppZenderer / GUI / Button.hpp
CollisionTest.cppZenderer / Zenderer.hpp
Graphics / ConcavePolygon.cppZenderer / Graphics / Polygon.hpp
Graphics / Effect.cppZenderer / Graphics / Effect.hpp
EngineTest.cppZenderer / Zenderer.hpp
Objects / Entity.cppZenderer / Objects / Entity.hpp
Core / ErrorHandling.cppZenderer / Core / ErrorHandling.hpp
Events / EventHandler.cppZenderer / Events / EventHandler.hpp
Utilities / FileParser.cppZenderer / Utilities / FileParser.hpp
GUI / Font.cppZenderer / GUI / Font.hpp
Utilities / Helpers.cppZenderer / Utilities / Helpers.hpp
Utilities / INIParser.cppZenderer / Utilities / INIParser.hpp
Graphics / Light.cppZenderer / Graphics / Light.hpp
Utilities / Log.cppZenderer / Utilities / Log.hpp
Graphics / Material.cppZenderer / Graphics / Material.hpp
Math / MathCore.cppZenderer / Math / MathCore.hpp
Math / Matrix.cppZenderer / Math / Matrix.hpp
GUI / Menu.cppZenderer / GUI / Menu.hpp
Events / Mouse.cppZenderer / Events / Mouse.hpp
Audio / Music2D.cppZenderer / Audio / Music2D.hpp
CoreGraphics / OpenGL.cppZenderer / CoreGraphics / OpenGL.hpp
Graphics / Polygon.cppZenderer / Graphics / Polygon.hpp
Pong.cppZenderer / Zenderer.hpp
Graphics / Quad.cppZenderer / Graphics / Quad.hpp
CoreGraphics / Renderer.cppZenderer / CoreGraphics / Renderer.hpp
Graphics / RenderTarget.cppZenderer / Graphics / RenderTarget.hpp
Graphics / Scene.cppZenderer / Graphics / Scene.hpp
Utilities / Settings.cppZenderer / Utilities / Settings.hpp
CoreGraphics / Shader.cppZenderer / CoreGraphics / Shader.hpp
CoreGraphics / ShaderSet.cppZenderer / CoreGraphics / ShaderSet.hpp
Math / Shapes.cppZenderer / Math / Shapes.hpp
Network / Socket.cppZenderer / Network / Socket.hpp
CoreGraphics / Sorter.cppZenderer / CoreGraphics / Sorter.hpp
Audio / Sound2D.cppZenderer / Audio / Sound2D.hpp
Core / Subsystem.cppZenderer / Core / Subsystem.hpp
CoreGraphics / Texture.cppZenderer / CoreGraphics / Texture.hpp
Utilities / Timer.cppZenderer / Utilities / Timer.hpp
CoreGraphics / VertexArray.cppZenderer / CoreGraphics / VertexArray.hpp
Graphics / Window.cppZenderer / Graphics / Window.hpp
Utilities / XMLParser.cppZenderer / Utilities / XMLParser.hpp
Zenderer.cppZenderer / Zenderer.hpp
+

src → include Relation

File in Zenderer/srcIncludes file in Zenderer/include
Core / Allocator.cppZenderer / Core / Allocator.hpp
Objects / Animation.cppZenderer / Objects / Animation.hpp
Utilities / Assert.cppZenderer / Utilities / Assert.hpp
Assets / Asset.cppZenderer / Assets / Asset.hpp
Assets / AssetManager.cppZenderer / Assets / AssetManager.hpp
Audio / Audio2D.cppZenderer / Audio / Audio2D.hpp
Audio / AudioManager.cppZenderer / Audio / AudioManager.hpp
GUI / Button.cppZenderer / GUI / Button.hpp
CollisionTest.cppZenderer / Zenderer.hpp
Graphics / ConcavePolygon.cppZenderer / Graphics / ConcavePolygon.hpp
Graphics / Effect.cppZenderer / Graphics / Effect.hpp
EngineTest.cppZenderer / Zenderer.hpp
Objects / Entity.cppZenderer / Objects / Entity.hpp
Core / ErrorHandling.cppZenderer / Core / ErrorHandling.hpp
Events / EventHandler.cppZenderer / Events / EventHandler.hpp
Utilities / FileParser.cppZenderer / Utilities / FileParser.hpp
GUI / Font.cppZenderer / GUI / Font.hpp
Utilities / Helpers.cppZenderer / Utilities / Helpers.hpp
Utilities / INIParser.cppZenderer / Utilities / INIParser.hpp
LevelTest.cppZenderer / Zenderer.hpp
Graphics / Light.cppZenderer / Graphics / Light.hpp
Utilities / Log.cppZenderer / Utilities / Log.hpp
Graphics / Material.cppZenderer / Graphics / Material.hpp
Math / MathCore.cppZenderer / Math / MathCore.hpp
Math / Matrix.cppZenderer / Math / Matrix.hpp
GUI / Menu.cppZenderer / GUI / Menu.hpp
Events / Mouse.cppZenderer / Events / Mouse.hpp
Audio / Music2D.cppZenderer / Audio / Music2D.hpp
CoreGraphics / OpenGL.cppZenderer / CoreGraphics / OpenGL.hpp
Graphics / Polygon.cppZenderer / Graphics / Polygon.hpp
Pong.cppZenderer / Zenderer.hpp
Graphics / Quad.cppZenderer / Graphics / Quad.hpp
CoreGraphics / Renderer.cppZenderer / CoreGraphics / Renderer.hpp
Graphics / RenderTarget.cppZenderer / Graphics / RenderTarget.hpp
Graphics / Scene.cppZenderer / Graphics / Scene.hpp
Utilities / Settings.cppZenderer / Utilities / Settings.hpp
CoreGraphics / Shader.cppZenderer / CoreGraphics / Shader.hpp
CoreGraphics / ShaderSet.cppZenderer / CoreGraphics / ShaderSet.hpp
Math / Shapes.cppZenderer / Math / Shapes.hpp
Network / Socket.cppZenderer / Network / Socket.hpp
CoreGraphics / Sorter.cppZenderer / CoreGraphics / Sorter.hpp
Audio / Sound2D.cppZenderer / Audio / Sound2D.hpp
Core / Subsystem.cppZenderer / Core / Subsystem.hpp
CoreGraphics / Texture.cppZenderer / CoreGraphics / Texture.hpp
Utilities / Timer.cppZenderer / Utilities / Timer.hpp
CoreGraphics / VertexArray.cppZenderer / CoreGraphics / VertexArray.hpp
Graphics / Window.cppZenderer / Graphics / Window.hpp
Utilities / XMLParser.cppZenderer / Utilities / XMLParser.hpp
Zenderer.cppZenderer / Zenderer.hpp
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000020_000001.html b/docs/dir_000020_000001.html index 4257ce3f..89f6e5d3 100644 --- a/docs/dir_000020_000001.html +++ b/docs/dir_000020_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000021_000001.html b/docs/dir_000021_000001.html index 7c88f793..896edda5 100644 --- a/docs/dir_000021_000001.html +++ b/docs/dir_000021_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000022_000001.html b/docs/dir_000022_000001.html index cccf671b..04e569f6 100644 --- a/docs/dir_000022_000001.html +++ b/docs/dir_000022_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000023_000001.html b/docs/dir_000023_000001.html index dd5cee08..56ca591d 100644 --- a/docs/dir_000023_000001.html +++ b/docs/dir_000023_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000024_000001.html b/docs/dir_000024_000001.html index 2a7359f4..169423bc 100644 --- a/docs/dir_000024_000001.html +++ b/docs/dir_000024_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -99,7 +99,7 @@
-

Graphics → include Relation

File in Zenderer/src/GraphicsIncludes file in Zenderer/include
ConcavePolygon.cppZenderer / Graphics / Polygon.hpp
Effect.cppZenderer / Graphics / Effect.hpp
Light.cppZenderer / Graphics / Light.hpp
Material.cppZenderer / Graphics / Material.hpp
Polygon.cppZenderer / Graphics / Polygon.hpp
Quad.cppZenderer / Graphics / Quad.hpp
RenderTarget.cppZenderer / Graphics / RenderTarget.hpp
Scene.cppZenderer / Graphics / Scene.hpp
Window.cppZenderer / Graphics / Window.hpp
+

Graphics → include Relation

File in Zenderer/src/GraphicsIncludes file in Zenderer/include
ConcavePolygon.cppZenderer / Graphics / ConcavePolygon.hpp
Effect.cppZenderer / Graphics / Effect.hpp
Light.cppZenderer / Graphics / Light.hpp
Material.cppZenderer / Graphics / Material.hpp
Polygon.cppZenderer / Graphics / Polygon.hpp
Quad.cppZenderer / Graphics / Quad.hpp
RenderTarget.cppZenderer / Graphics / RenderTarget.hpp
Scene.cppZenderer / Graphics / Scene.hpp
Window.cppZenderer / Graphics / Window.hpp
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000026_000001.html b/docs/dir_000026_000001.html index 6b430f4e..342e48fe 100644 --- a/docs/dir_000026_000001.html +++ b/docs/dir_000026_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000027_000001.html b/docs/dir_000027_000001.html index 3457c2d5..ebc38208 100644 --- a/docs/dir_000027_000001.html +++ b/docs/dir_000027_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000028_000001.html b/docs/dir_000028_000001.html index ba908423..29401cf8 100644 --- a/docs/dir_000028_000001.html +++ b/docs/dir_000028_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_000029_000001.html b/docs/dir_000029_000001.html index a9d749bd..d3309743 100644 --- a/docs/dir_000029_000001.html +++ b/docs/dir_000029_000001.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_06e027613a13d1054daca9a92baf0960.html b/docs/dir_06e027613a13d1054daca9a92baf0960.html index ed8be76e..3238721c 100644 --- a/docs/dir_06e027613a13d1054daca9a92baf0960.html +++ b/docs/dir_06e027613a13d1054daca9a92baf0960.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_28dcd915fe0393b1e15814a592438527.html b/docs/dir_28dcd915fe0393b1e15814a592438527.html index c6ffc734..8b2d870e 100644 --- a/docs/dir_28dcd915fe0393b1e15814a592438527.html +++ b/docs/dir_28dcd915fe0393b1e15814a592438527.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_2e2bad19a935fabc6f99a8d77fdd18b8.html b/docs/dir_2e2bad19a935fabc6f99a8d77fdd18b8.html index 44c0c057..3539ade5 100644 --- a/docs/dir_2e2bad19a935fabc6f99a8d77fdd18b8.html +++ b/docs/dir_2e2bad19a935fabc6f99a8d77fdd18b8.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_2eec9d20f82ef914ce42f144ece54dcc.html b/docs/dir_2eec9d20f82ef914ce42f144ece54dcc.html index 15b5e18f..0a6a285b 100644 --- a/docs/dir_2eec9d20f82ef914ce42f144ece54dcc.html +++ b/docs/dir_2eec9d20f82ef914ce42f144ece54dcc.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_3c38a32aee846584c33b3c7a24a46c52.html b/docs/dir_3c38a32aee846584c33b3c7a24a46c52.html index 959b21b9..66d19946 100644 --- a/docs/dir_3c38a32aee846584c33b3c7a24a46c52.html +++ b/docs/dir_3c38a32aee846584c33b3c7a24a46c52.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_3cc1f4e95d00690d9fb35a448e356037.html b/docs/dir_3cc1f4e95d00690d9fb35a448e356037.html index 6a585a98..1bc17106 100644 --- a/docs/dir_3cc1f4e95d00690d9fb35a448e356037.html +++ b/docs/dir_3cc1f4e95d00690d9fb35a448e356037.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_581b39117fad9c901c881a5f767a7292.html b/docs/dir_581b39117fad9c901c881a5f767a7292.html index 37910556..da54c372 100644 --- a/docs/dir_581b39117fad9c901c881a5f767a7292.html +++ b/docs/dir_581b39117fad9c901c881a5f767a7292.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
+ All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer/Graphics
- +
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_6bb5ebe70616dc0e02dd1d9a005c6c8d.html b/docs/dir_6bb5ebe70616dc0e02dd1d9a005c6c8d.html index 8b1deb75..b797062a 100644 --- a/docs/dir_6bb5ebe70616dc0e02dd1d9a005c6c8d.html +++ b/docs/dir_6bb5ebe70616dc0e02dd1d9a005c6c8d.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_7eb9af5f8eadb34b65292da9b9c705b3.html b/docs/dir_7eb9af5f8eadb34b65292da9b9c705b3.html index c4bd0eb7..0c50cb1a 100644 --- a/docs/dir_7eb9af5f8eadb34b65292da9b9c705b3.html +++ b/docs/dir_7eb9af5f8eadb34b65292da9b9c705b3.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_83649a668cc514157bc5eeec4c9e3f09.html b/docs/dir_83649a668cc514157bc5eeec4c9e3f09.html index a897d47c..81d559ff 100644 --- a/docs/dir_83649a668cc514157bc5eeec4c9e3f09.html +++ b/docs/dir_83649a668cc514157bc5eeec4c9e3f09.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer/Utilities
- +

diff --git a/docs/dir_581b39117fad9c901c881a5f767a7292_dep.map b/docs/dir_581b39117fad9c901c881a5f767a7292_dep.map index 7aba96a9..2a7130ba 100644 --- a/docs/dir_581b39117fad9c901c881a5f767a7292_dep.map +++ b/docs/dir_581b39117fad9c901c881a5f767a7292_dep.map @@ -1,37 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/dir_581b39117fad9c901c881a5f767a7292_dep.png b/docs/dir_581b39117fad9c901c881a5f767a7292_dep.png index 90471281..043d71eb 100644 Binary files a/docs/dir_581b39117fad9c901c881a5f767a7292_dep.png and b/docs/dir_581b39117fad9c901c881a5f767a7292_dep.png differ diff --git a/docs/dir_6ba1276ecb08e799aefa47925204b56c.html b/docs/dir_6ba1276ecb08e799aefa47925204b56c.html index 52fc22eb..cd0db17e 100644 --- a/docs/dir_6ba1276ecb08e799aefa47925204b56c.html +++ b/docs/dir_6ba1276ecb08e799aefa47925204b56c.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_853c2b543f5b384380d1698b48cfe19a.html b/docs/dir_853c2b543f5b384380d1698b48cfe19a.html index 0da31684..7921a4eb 100644 --- a/docs/dir_853c2b543f5b384380d1698b48cfe19a.html +++ b/docs/dir_853c2b543f5b384380d1698b48cfe19a.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405.html b/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405.html index d3b83cb9..53e86733 100644 --- a/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405.html +++ b/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer/CoreGraphics
- +

diff --git a/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.map b/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.map index a7549568..83261dd9 100644 --- a/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.map +++ b/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.map @@ -1,7 +1,11 @@ - - - + + + + + + + diff --git a/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.png b/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.png index c8ec5ee0..b3e52853 100644 Binary files a/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.png and b/docs/dir_83649a668cc514157bc5eeec4c9e3f09_dep.png differ diff --git a/docs/dir_83ce8f1182b9a0b14e91c4d6ff3d804c.html b/docs/dir_83ce8f1182b9a0b14e91c4d6ff3d804c.html index a4d01e3d..d246a056 100644 --- a/docs/dir_83ce8f1182b9a0b14e91c4d6ff3d804c.html +++ b/docs/dir_83ce8f1182b9a0b14e91c4d6ff3d804c.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.html b/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.html index 0596f770..89674100 100644 --- a/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.html +++ b/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -145,6 +145,8 @@
+ + diff --git a/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.js b/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.js index 27891789..da2bf6a1 100644 --- a/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.js +++ b/docs/dir_8c7877d0c820b41d5685825b6f58f6c7.js @@ -14,6 +14,7 @@ var dir_8c7877d0c820b41d5685825b6f58f6c7 = [ "CollisionTest.cpp", "_collision_test_8cpp.html", "_collision_test_8cpp" ], [ "DLLMain.cpp", "_d_l_l_main_8cpp.html", null ], [ "EngineTest.cpp", "_engine_test_8cpp.html", "_engine_test_8cpp" ], + [ "LevelTest.cpp", "_level_test_8cpp.html", "_level_test_8cpp" ], [ "Pong.cpp", "_pong_8cpp.html", "_pong_8cpp" ], [ "Zenderer.cpp", "_zenderer_8cpp.html", null ] ]; \ No newline at end of file diff --git a/docs/dir_94ce42b34006fee834f667cb91576700.html b/docs/dir_94ce42b34006fee834f667cb91576700.html index df20063c..61a2ff56 100644 --- a/docs/dir_94ce42b34006fee834f667cb91576700.html +++ b/docs/dir_94ce42b34006fee834f667cb91576700.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer/Objects
- +

diff --git a/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.map b/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.map index 705aae7a..f910fc42 100644 --- a/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.map +++ b/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.map @@ -1,32 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.png b/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.png index e1c29b90..e3c9b057 100644 Binary files a/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.png and b/docs/dir_88424f08fb9f6b5a5a3c5d8b116f9405_dep.png differ diff --git a/docs/dir_898b4fac06b0f172e3b3e37f4fca246b.html b/docs/dir_898b4fac06b0f172e3b3e37f4fca246b.html index d737051d..b3ae7806 100644 --- a/docs/dir_898b4fac06b0f172e3b3e37f4fca246b.html +++ b/docs/dir_898b4fac06b0f172e3b3e37f4fca246b.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
 
file  EngineTest.cpp [code]
 
file  LevelTest.cpp [code]
 
file  Pong.cpp [code]
 
file  Zenderer.cpp [code]
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_9faa2ec350053c3b81bde887e1e8ddde.html b/docs/dir_9faa2ec350053c3b81bde887e1e8ddde.html index 506f290c..b7971c43 100644 --- a/docs/dir_9faa2ec350053c3b81bde887e1e8ddde.html +++ b/docs/dir_9faa2ec350053c3b81bde887e1e8ddde.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_c188e09dd5fcdf29b608e01fc7b48ab8.html b/docs/dir_c188e09dd5fcdf29b608e01fc7b48ab8.html index fe4366f3..b7469b31 100644 --- a/docs/dir_c188e09dd5fcdf29b608e01fc7b48ab8.html +++ b/docs/dir_c188e09dd5fcdf29b608e01fc7b48ab8.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_c41963e08dd1fdd0c8449c288287ef04.html b/docs/dir_c41963e08dd1fdd0c8449c288287ef04.html index 25e38b77..3231049d 100644 --- a/docs/dir_c41963e08dd1fdd0c8449c288287ef04.html +++ b/docs/dir_c41963e08dd1fdd0c8449c288287ef04.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4.html b/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4.html index f11b63b9..0c254ded 100644 --- a/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4.html +++ b/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer
- +

diff --git a/docs/dir_94ce42b34006fee834f667cb91576700.js b/docs/dir_94ce42b34006fee834f667cb91576700.js index 892c2eef..65752752 100644 --- a/docs/dir_94ce42b34006fee834f667cb91576700.js +++ b/docs/dir_94ce42b34006fee834f667cb91576700.js @@ -1,8 +1,6 @@ var dir_94ce42b34006fee834f667cb91576700 = [ - [ "Animation.hpp", "_animation_8hpp.html", [ - [ "zAnimation", "classzen_1_1obj_1_1z_animation.html", "classzen_1_1obj_1_1z_animation" ] - ] ], + [ "Animation.hpp", "_animation_8hpp.html", null ], [ "Entity.hpp", "_entity_8hpp.html", "_entity_8hpp" ], [ "Physics.hpp", "_physics_8hpp.html", "_physics_8hpp" ] ]; \ No newline at end of file diff --git a/docs/dir_94ce42b34006fee834f667cb91576700_dep.map b/docs/dir_94ce42b34006fee834f667cb91576700_dep.map index 03b52f10..a60c6675 100644 --- a/docs/dir_94ce42b34006fee834f667cb91576700_dep.map +++ b/docs/dir_94ce42b34006fee834f667cb91576700_dep.map @@ -1,20 +1,21 @@ - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + diff --git a/docs/dir_94ce42b34006fee834f667cb91576700_dep.png b/docs/dir_94ce42b34006fee834f667cb91576700_dep.png index da23a596..4f2cb8fb 100644 Binary files a/docs/dir_94ce42b34006fee834f667cb91576700_dep.png and b/docs/dir_94ce42b34006fee834f667cb91576700_dep.png differ diff --git a/docs/dir_96f7981e552f469cdf3f1e7386a3bf14.html b/docs/dir_96f7981e552f469cdf3f1e7386a3bf14.html index 65481d67..a9e61301 100644 --- a/docs/dir_96f7981e552f469cdf3f1e7386a3bf14.html +++ b/docs/dir_96f7981e552f469cdf3f1e7386a3bf14.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_d64bb876af14358c61c373e2d9f7ff4e.html b/docs/dir_d64bb876af14358c61c373e2d9f7ff4e.html index e54d19a0..edf09eef 100644 --- a/docs/dir_d64bb876af14358c61c373e2d9f7ff4e.html +++ b/docs/dir_d64bb876af14358c61c373e2d9f7ff4e.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_de81990a9045b37d9965bbcd70fef2f3.html b/docs/dir_de81990a9045b37d9965bbcd70fef2f3.html index b48c38c6..bc5368e6 100644 --- a/docs/dir_de81990a9045b37d9965bbcd70fef2f3.html +++ b/docs/dir_de81990a9045b37d9965bbcd70fef2f3.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_de81990a9045b37d9965bbcd70fef2f3.js b/docs/dir_de81990a9045b37d9965bbcd70fef2f3.js index 9251871b..dac54d9a 100644 --- a/docs/dir_de81990a9045b37d9965bbcd70fef2f3.js +++ b/docs/dir_de81990a9045b37d9965bbcd70fef2f3.js @@ -1,23 +1,6 @@ var dir_de81990a9045b37d9965bbcd70fef2f3 = [ - [ "Level.hpp", "_level_8hpp.html", [ - [ "spawn_t", "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1spawn__t", [ - [ "position", "namespacezen_1_1lvl.html#a485dcd48c31a1cbedf472dd04d2148ab", null ], - [ "whitelist", "namespacezen_1_1lvl.html#a5072412ea19f98b884c3c4e09bb481bd", null ], - [ "blacklist", "namespacezen_1_1lvl.html#a4465479c53f0a8cd38ce315f20f5c024", null ] - ] ], - [ "metalevel_t", "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1metalevel__t", [ - [ "author", "namespacezen_1_1lvl.html#a13d0fd7c54ce90543b9ef634500fceaf", null ], - [ "description", "namespacezen_1_1lvl.html#a3705ac2a95924b36fcc162b183b6b350", null ] - ] ], - [ "level_t", "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1level__t", [ - [ "metadata", "namespacezen_1_1lvl.html#ab468f1c84927f9cff5a72f8b8f9fba2a", null ], - [ "spawnpoints", "namespacezen_1_1lvl.html#a20532f985031396ba3bb0fbdd8b6deac", null ], - [ "entities", "namespacezen_1_1lvl.html#a75e632ff82a8efeea13536f34416bde4", null ], - [ "lights", "namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39", null ], - [ "valid", "namespacezen_1_1lvl.html#ab19c575a197ebaa8853515c925605461", null ] - ] ] - ] ], + [ "Level.hpp", "_level_8hpp.html", "_level_8hpp" ], [ "LevelLoader.hpp", "_level_loader_8hpp.html", [ [ "zLevelLoader", "classzen_1_1lvl_1_1z_level_loader.html", "classzen_1_1lvl_1_1z_level_loader" ] ] ] diff --git a/docs/dir_e18839c54a81f7f7540c9f21f37582f0.html b/docs/dir_e18839c54a81f7f7540c9f21f37582f0.html index cfb80483..d881f912 100644 --- a/docs/dir_e18839c54a81f7f7540c9f21f37582f0.html +++ b/docs/dir_e18839c54a81f7f7540c9f21f37582f0.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_e1addd992e85f136b9e0af733a0c4dc3.html b/docs/dir_e1addd992e85f136b9e0af733a0c4dc3.html index 6f2a2002..6378eb9f 100644 --- a/docs/dir_e1addd992e85f136b9e0af733a0c4dc3.html +++ b/docs/dir_e1addd992e85f136b9e0af733a0c4dc3.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer/GUI
- +

diff --git a/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.map b/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.map index 3a6f8b82..af6006aa 100644 --- a/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.map +++ b/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.map @@ -1,6 +1,6 @@ - + diff --git a/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.png b/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.png index b8627823..85055e91 100644 Binary files a/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.png and b/docs/dir_cd6979e7ce7ff2c8aeadb4e183fb34c4_dep.png differ diff --git a/docs/dir_d434dd89545c808cdb27ee1725e3c16d.html b/docs/dir_d434dd89545c808cdb27ee1725e3c16d.html index 5399bd8f..48efbbec 100644 --- a/docs/dir_d434dd89545c808cdb27ee1725e3c16d.html +++ b/docs/dir_d434dd89545c808cdb27ee1725e3c16d.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer
- +

diff --git a/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.map b/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.map index 9d73bb3f..b817f97d 100644 --- a/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.map +++ b/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.map @@ -1,40 +1,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.png b/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.png index 77c0aee6..65bd10e8 100644 Binary files a/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.png and b/docs/dir_e1addd992e85f136b9e0af733a0c4dc3_dep.png differ diff --git a/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5.html b/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5.html index d19a5581..9348c47c 100644 --- a/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5.html +++ b/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/dir_fb506ce3840802e4699f44ecb313702e.html b/docs/dir_fb506ce3840802e4699f44ecb313702e.html index e31cae51..e98bfba5 100644 --- a/docs/dir_fb506ce3840802e4699f44ecb313702e.html +++ b/docs/dir_fb506ce3840802e4699f44ecb313702e.html @@ -30,9 +30,9 @@
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -108,7 +108,7 @@
Zenderer/include/Zenderer/Math
- +

diff --git a/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.map b/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.map index a53d701e..35dee903 100644 --- a/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.map +++ b/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.map @@ -1,68 +1,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.png b/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.png index 16d20422..46d7e468 100644 Binary files a/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.png and b/docs/dir_ed5a72cd7c500fb83d60e97a060edfe5_dep.png differ diff --git a/docs/dir_ee74c1ad1e693386ed3571c11b538ae5.html b/docs/dir_ee74c1ad1e693386ed3571c11b538ae5.html index 1ea5543d..d490f290 100644 --- a/docs/dir_ee74c1ad1e693386ed3571c11b538ae5.html +++ b/docs/dir_ee74c1ad1e693386ed3571c11b538ae5.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
diff --git a/docs/files.html b/docs/files.html index 0e3c4637..98a2deac 100644 --- a/docs/files.html +++ b/docs/files.html @@ -30,9 +30,9 @@
@@ -95,7 +95,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
@@ -258,8 +258,9 @@
- - + + +

diff --git a/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.map b/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.map index 10648f38..51b79e22 100644 --- a/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.map +++ b/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.map @@ -1,10 +1,11 @@ - - - - - - - - + + + + + + + + + diff --git a/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.png b/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.png index 75b09b9f..f1b6641e 100644 Binary files a/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.png and b/docs/dir_fb506ce3840802e4699f44ecb313702e_dep.png differ diff --git a/docs/examples.html b/docs/examples.html index 534342f8..90b9aaaa 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -30,9 +30,9 @@

Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
  o*CollisionTest.cpp
  o*DLLMain.cppDLLMain.cpp - Contains the DLL entry point for the Zenderer engine
  o*EngineTest.cpp
  o*Pong.cpp
  \*Zenderer.cpp
  o*LevelTest.cpp
  o*Pong.cpp
  \*Zenderer.cpp
diff --git a/docs/functions.html b/docs/functions.html index ce571282..3d531648 100644 --- a/docs/functions.html +++ b/docs/functions.html @@ -30,9 +30,9 @@
Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
-
A OpenGL-based 2D engine. Currently at 9447 lines of code.
+
A OpenGL-based 2D engine. Currently at 10804 lines of code.
@@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -203,6 +204,9 @@

    - a -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -174,6 +175,12 @@

    - b -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -155,13 +156,19 @@

    - c -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -217,7 +218,7 @@

    - d -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x66.html b/docs/functions_0x66.html index e80b1b33..4a4a5233 100644 --- a/docs/functions_0x66.html +++ b/docs/functions_0x66.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x67.html b/docs/functions_0x67.html index 8c79bdc2..d153db91 100644 --- a/docs/functions_0x67.html +++ b/docs/functions_0x67.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -153,12 +154,15 @@

    - g -

    diff --git a/docs/functions_0x68.html b/docs/functions_0x68.html index cbd14e96..55f0f6b0 100644 --- a/docs/functions_0x68.html +++ b/docs/functions_0x68.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -157,6 +158,7 @@

    - h -

    diff --git a/docs/functions_0x69.html b/docs/functions_0x69.html index 7ef4f6e9..e1382412 100644 --- a/docs/functions_0x69.html +++ b/docs/functions_0x69.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -190,15 +191,18 @@

    - i -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x6c.html b/docs/functions_0x6c.html index 26a03d15..f0f439a6 100644 --- a/docs/functions_0x6c.html +++ b/docs/functions_0x6c.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -152,6 +153,12 @@

    - l -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x6e.html b/docs/functions_0x6e.html index 800a66f2..1a1cf3d9 100644 --- a/docs/functions_0x6e.html +++ b/docs/functions_0x6e.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -152,6 +153,9 @@

    - n -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x70.html b/docs/functions_0x70.html index 6386650b..abd31297 100644 --- a/docs/functions_0x70.html +++ b/docs/functions_0x70.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -155,6 +156,12 @@

    - p -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x72.html b/docs/functions_0x72.html index 64ae72ab..6818eaaf 100644 --- a/docs/functions_0x72.html +++ b/docs/functions_0x72.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -180,11 +181,15 @@

    - r -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -203,7 +204,7 @@

    - s -

    @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -195,12 +196,19 @@

    - t -

    diff --git a/docs/functions_0x75.html b/docs/functions_0x75.html index a9522b09..0149a764 100644 --- a/docs/functions_0x75.html +++ b/docs/functions_0x75.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -166,13 +167,15 @@

    - u -

    diff --git a/docs/functions_0x76.html b/docs/functions_0x76.html index 91d5b012..83e3e8de 100644 --- a/docs/functions_0x76.html +++ b/docs/functions_0x76.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x77.html b/docs/functions_0x77.html index 36140c9b..b6218ddc 100644 --- a/docs/functions_0x77.html +++ b/docs/functions_0x77.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x78.html b/docs/functions_0x78.html index 3fecbb4d..a7710774 100644 --- a/docs/functions_0x78.html +++ b/docs/functions_0x78.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x79.html b/docs/functions_0x79.html index 1fc124ad..1d449f8c 100644 --- a/docs/functions_0x79.html +++ b/docs/functions_0x79.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x7a.html b/docs/functions_0x7a.html index 5bf54bf3..f32ea58f 100644 --- a/docs/functions_0x7a.html +++ b/docs/functions_0x7a.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_0x7e.html b/docs/functions_0x7e.html index 8e4163a3..cb843878 100644 --- a/docs/functions_0x7e.html +++ b/docs/functions_0x7e.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -136,7 +137,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -155,6 +156,12 @@

    - ~ -

    + +
    @@ -99,12 +117,25 @@
    -

    Audio → Utilities Relation

    File in Zenderer/include/Zenderer/AudioIncludes file in Zenderer/include/Zenderer/Utilities
    AudioManager.hppAssert.hpp
    AudioManager.hppLog.hpp
    +  + @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x62.html b/docs/functions_func_0x62.html index 53d1a545..cad743b5 100644 --- a/docs/functions_func_0x62.html +++ b/docs/functions_func_0x62.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x63.html b/docs/functions_func_0x63.html index 3d81a68a..ce5ef6ff 100644 --- a/docs/functions_func_0x63.html +++ b/docs/functions_func_0x63.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -151,13 +152,19 @@

    - c -

    @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -198,7 +199,7 @@

    - d -

    @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x66.html b/docs/functions_func_0x66.html index 44e3aba8..107839ab 100644 --- a/docs/functions_func_0x66.html +++ b/docs/functions_func_0x66.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x67.html b/docs/functions_func_0x67.html index a382998e..ecf5e5f6 100644 --- a/docs/functions_func_0x67.html +++ b/docs/functions_func_0x67.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -145,6 +146,9 @@  

    - g -

    diff --git a/docs/functions_func_0x68.html b/docs/functions_func_0x68.html index 7948270a..f2576f95 100644 --- a/docs/functions_func_0x68.html +++ b/docs/functions_func_0x68.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -147,6 +148,7 @@

    - h -

    diff --git a/docs/functions_func_0x69.html b/docs/functions_func_0x69.html index dde704ed..4712cbd7 100644 --- a/docs/functions_func_0x69.html +++ b/docs/functions_func_0x69.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x6b.html b/docs/functions_func_0x6b.html index 18d0ba0b..fda26578 100644 --- a/docs/functions_func_0x6b.html +++ b/docs/functions_func_0x6b.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x6c.html b/docs/functions_func_0x6c.html index 8da2b85a..b1cf9e0c 100644 --- a/docs/functions_func_0x6c.html +++ b/docs/functions_func_0x6c.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -173,8 +174,8 @@

    - l -

    @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x6e.html b/docs/functions_func_0x6e.html index 5e4c66e7..d5bdd4ef 100644 --- a/docs/functions_func_0x6e.html +++ b/docs/functions_func_0x6e.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x6f.html b/docs/functions_func_0x6f.html index 89c4e78f..8113c8c0 100644 --- a/docs/functions_func_0x6f.html +++ b/docs/functions_func_0x6f.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x70.html b/docs/functions_func_0x70.html index d6e3d698..f79d88c8 100644 --- a/docs/functions_func_0x70.html +++ b/docs/functions_func_0x70.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -159,6 +160,9 @@

    - p -

    @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -171,13 +172,17 @@

    - r -

    @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -189,7 +190,7 @@

    - s -

    @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x75.html b/docs/functions_func_0x75.html index ac1015f9..2351fec6 100644 --- a/docs/functions_func_0x75.html +++ b/docs/functions_func_0x75.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -156,13 +157,15 @@

    - u -

    diff --git a/docs/functions_func_0x76.html b/docs/functions_func_0x76.html deleted file mode 100644 index 1907399d..00000000 --- a/docs/functions_func_0x76.html +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - -Zenderer Engine: Data Fields - Functions - - - - - - - - - - - - - -
    -
    - - - - - - -
    -
    Zenderer Engine -  2.10.8-alpha -
    -
    A OpenGL-based 2D engine. Currently at 8785 lines of code.
    -
    -
    - - - - - - - -
    -
    - -
    -
    -
    - -
    - - - - -
    - -
    - -
    -  - -

    - v -

    -
    -
    - - - - diff --git a/docs/functions_func_0x77.html b/docs/functions_func_0x77.html index aca37f09..5c8a67c8 100644 --- a/docs/functions_func_0x77.html +++ b/docs/functions_func_0x77.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x7a.html b/docs/functions_func_0x7a.html index 354ac51e..dc35a155 100644 --- a/docs/functions_func_0x7a.html +++ b/docs/functions_func_0x7a.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_func_0x7e.html b/docs/functions_func_0x7e.html index bed4433b..d1963681 100644 --- a/docs/functions_func_0x7e.html +++ b/docs/functions_func_0x7e.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -132,7 +133,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -151,6 +152,12 @@

    - ~ -

    @@ -106,7 +107,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_type.html b/docs/functions_type.html index 2a00497a..64357036 100644 --- a/docs/functions_type.html +++ b/docs/functions_type.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -106,7 +107,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/functions_vars.html b/docs/functions_vars.html index 4a23c1a4..376c45f9 100644 --- a/docs/functions_vars.html +++ b/docs/functions_vars.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -83,6 +83,7 @@
  • Functions
  • Variables
  • Typedefs
    • +
  • Enumerator
  • Related Functions
    • @@ -134,7 +135,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -180,6 +181,12 @@

    - b -

    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -211,6 +211,9 @@

    - c -

    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -120,9 +120,21 @@
  • AL : AudioManager.hpp
    • +
  • CHECK +: LevelTest.cpp +
    • +
  • FONT_PATH +: LevelTest.cpp +
  • GL : OpenGL.hpp
    • +
  • LEVEL_PATH +: LevelTest.cpp +
    • +
  • TEXTURE_PATH +: LevelTest.cpp +
  • VBO_OFFSET : VertexArray.hpp
    • diff --git a/docs/globals_enum.html b/docs/globals_enum.html index 6bc83c0d..4cd2e397 100644 --- a/docs/globals_enum.html +++ b/docs/globals_enum.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -106,7 +106,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/globals_eval.html b/docs/globals_eval.html index 9790543a..a17217b8 100644 --- a/docs/globals_eval.html +++ b/docs/globals_eval.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -106,7 +106,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/globals_func.html b/docs/globals_func.html index 94147f29..8df3fce5 100644 --- a/docs/globals_func.html +++ b/docs/globals_func.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -106,7 +106,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -133,13 +133,14 @@ : MathCore.inl
  • main() -: Pong.cpp +: LevelTest.cpp
  • main1() -: CollisionTest.cpp +: Pong.cpp
  • main2() : EngineTest.cpp +, CollisionTest.cpp
  • make_ball() : Pong.cpp @@ -162,6 +163,9 @@
  • PONG_JOIN_PORT() : Pong.cpp
    • +
  • rgb2f() +: LevelTest.cpp +
    • diff --git a/docs/globals_type.html b/docs/globals_type.html index bcb7a00f..5286c6b4 100644 --- a/docs/globals_type.html +++ b/docs/globals_type.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -106,7 +106,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/globals_vars.html b/docs/globals_vars.html index 3ad2020e..ca7a10f6 100644 --- a/docs/globals_vars.html +++ b/docs/globals_vars.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -136,7 +136,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/graph_legend.html b/docs/graph_legend.html index 6bc2019c..6f2643f0 100644 --- a/docs/graph_legend.html +++ b/docs/graph_legend.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___assets.html b/docs/group___assets.html index 5adbb42c..492aa13f 100644 --- a/docs/group___assets.html +++ b/docs/group___assets.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___audio.html b/docs/group___audio.html index c4df064c..de79ad1f 100644 --- a/docs/group___audio.html +++ b/docs/group___audio.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___core_graphics.html b/docs/group___core_graphics.html index c26601bc..c8070575 100644 --- a/docs/group___core_graphics.html +++ b/docs/group___core_graphics.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -169,7 +169,7 @@

    Macro Definition Documentation

    -

    Definition at line 47 of file OpenGL.hpp.

    +

    Definition at line 52 of file OpenGL.hpp.

    @@ -198,7 +198,7 @@

    Macro Definition Documentation

    Examples:
    Scenes.
    -

    Definition at line 35 of file Texture.hpp.

    +

    Definition at line 36 of file Texture.hpp.

    diff --git a/docs/group___engine.html b/docs/group___engine.html index f60acec9..9281e1d9 100644 --- a/docs/group___engine.html +++ b/docs/group___engine.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -147,7 +147,7 @@

    Macro Definition Documentation

    -

    Definition at line 46 of file Types.hpp.

    +

    Definition at line 77 of file Types.hpp.

    @@ -161,7 +161,7 @@

    Macro Definition Documentation

    -

    Definition at line 59 of file Types.hpp.

    +

    Definition at line 90 of file Types.hpp.

    diff --git a/docs/group___events.html b/docs/group___events.html index d84dbfb4..54b6f182 100644 --- a/docs/group___events.html +++ b/docs/group___events.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___g_u_i.html b/docs/group___g_u_i.html index 2d260fa1..1884a993 100644 --- a/docs/group___g_u_i.html +++ b/docs/group___g_u_i.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___graphics.html b/docs/group___graphics.html index 265b1b8a..45808ae7 100644 --- a/docs/group___graphics.html +++ b/docs/group___graphics.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -140,6 +140,7 @@  Creates a target for all subsequent rendering operations. More...
      class  zen::gfx::zScene + A high-level rendering wrapper allowing for special effects and lighting. More...
      class  zen::gfx::zWindow  Creates a renderable OpenGL context. More...
    diff --git a/docs/group___graphics.js b/docs/group___graphics.js index 82aa5800..d9e56c96 100644 --- a/docs/group___graphics.js +++ b/docs/group___graphics.js @@ -4,7 +4,7 @@ var group___graphics = [ "zConcavePolygon", "classzen_1_1gfx_1_1z_concave_polygon.html", [ [ "zConcavePolygon", "classzen_1_1gfx_1_1z_concave_polygon.html#a595421bc42e6ba537614c12d1a4ab371", null ], [ "~zConcavePolygon", "classzen_1_1gfx_1_1z_concave_polygon.html#a63c8d13eb8b8983eeb0ca1912b38e889", null ], - [ "Create", "classzen_1_1gfx_1_1z_concave_polygon.html#a10251b694ecba0fb2ec99fe53c05f79d", null ] + [ "Create", "classzen_1_1gfx_1_1z_concave_polygon.html#ab9a368fae6346609c591204180b5ed04", null ] ] ], [ "zEffect", "classzen_1_1gfx_1_1z_effect.html", [ [ "zEffect", "classzen_1_1gfx_1_1z_effect.html#ae1a801dc1d3f50c373ef1900cd539a7d", null ], @@ -78,17 +78,18 @@ var group___graphics = [ "zPolygon", "classzen_1_1gfx_1_1z_polygon.html#a671a04f2358287c3d03d5f296bf5077b", null ], [ "zPolygon", "classzen_1_1gfx_1_1z_polygon.html#ab51b46d8382897edc481d19f1af419ef", null ], [ "AddVertex", "classzen_1_1gfx_1_1z_polygon.html#ad40c6155bf17ce17ebb5f3e95266820e", null ], - [ "Create", "classzen_1_1gfx_1_1z_polygon.html#ac9df030c2f41e4454a7b6d260e0fd21a", null ], + [ "Create", "classzen_1_1gfx_1_1z_polygon.html#a1955ad2231b3b46bbf4f4e2408be3c62", null ], [ "Move", "classzen_1_1gfx_1_1z_polygon.html#a40ae71e4df1b6fe15500d1367d749193", null ], [ "Move", "classzen_1_1gfx_1_1z_polygon.html#a631f77c20d84f47ebebe768a405b5bf3", null ], [ "AttachMaterial", "classzen_1_1gfx_1_1z_polygon.html#a679c54a2052d619caea511cdc1ce4e80", null ], [ "RemoveMaterial", "classzen_1_1gfx_1_1z_polygon.html#a1e58cf0134e0693790713f7791f2d736", null ], [ "Draw", "classzen_1_1gfx_1_1z_polygon.html#ab7fb29249ab405cc610bb5e451397fea", null ], [ "LoadIntoVAO", "classzen_1_1gfx_1_1z_polygon.html#a8477362b059957c20edb7dfe4ff04fd9", null ], - [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a7cd1ed28b12be147b3567325035588ab", null ], - [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a3574b7e895e99b3aba9352083b86e36b", null ], + [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a445f57a850cd65629ba96595172d2ef4", null ], + [ "Collides", "classzen_1_1gfx_1_1z_polygon.html#a05f999895093561101c8016f43f2a464", null ], [ "SetIndices", "classzen_1_1gfx_1_1z_polygon.html#ae812840875c700f99062aa1c34fe9a4f", null ], [ "SetColor", "classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3", null ], + [ "SetColor", "classzen_1_1gfx_1_1z_polygon.html#a23ad8a42c4b82114209ee864c5be873e", null ], [ "GetTriangulation", "classzen_1_1gfx_1_1z_polygon.html#aaed8a4e7e4232d9a2f64032676995778", null ], [ "GetPosition", "classzen_1_1gfx_1_1z_polygon.html#ade8d718f4392ea6f7d36563363d667db", null ], [ "GetBoundingBox", "classzen_1_1gfx_1_1z_polygon.html#aabb3fd590b40851176dcbc81edc10b47", null ], @@ -96,10 +97,12 @@ var group___graphics = [ "GetY", "classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe", null ], [ "GetH", "classzen_1_1gfx_1_1z_polygon.html#a8f19764a95eab8010a529652d484635d", null ], [ "GetW", "classzen_1_1gfx_1_1z_polygon.html#ad9810bdc85ac5ccb72b0e07880b075b7", null ], + [ "CalcX", "classzen_1_1gfx_1_1z_polygon.html#a44b2721ed65c2e2fb2b5391b4397ae9b", null ], + [ "CalcY", "classzen_1_1gfx_1_1z_polygon.html#adc5878f6c1cb869b6e5ed4ba8911bd62", null ], [ "CalcH", "classzen_1_1gfx_1_1z_polygon.html#a429c80360298608d83c56c74bae31e22", null ], [ "CalcW", "classzen_1_1gfx_1_1z_polygon.html#a55d204431680f82b0016e5b290c25ccf", null ], - [ "GetLowPoint", "classzen_1_1gfx_1_1z_polygon.html#a3fad6b6af1a44dac05b4cecb9bfdc31d", null ], - [ "GetLeftPoint", "classzen_1_1gfx_1_1z_polygon.html#a1952d1ddbb16cae0816d03a4c284f5d6", null ], + [ "GetLowPoint", "classzen_1_1gfx_1_1z_polygon.html#ae9034f5809ff965852ae22fa4d869b19", null ], + [ "GetLeftPoint", "classzen_1_1gfx_1_1z_polygon.html#a5d5880fa1e14f9b5622db4ef4322d1db", null ], [ "IsModifiable", "classzen_1_1gfx_1_1z_polygon.html#ad957c880eed742790fb244ddf42c54d6", null ], [ "GetMaterial", "classzen_1_1gfx_1_1z_polygon.html#a54a92a7768eafb28d57909f4313223bc", null ], [ "MapTexCoords", "classzen_1_1gfx_1_1z_polygon.html#aa2df331795d72f7554bba150831c332a", null ], @@ -116,11 +119,11 @@ var group___graphics = [ "zQuad", "classzen_1_1gfx_1_1z_quad.html#a683d7e953f5018c035009a09bdbac4a7", null ], [ "zQuad", "classzen_1_1gfx_1_1z_quad.html#a6d50f5678187a56ba068cb04d96a5321", null ], [ "~zQuad", "classzen_1_1gfx_1_1z_quad.html#a5867cc5adb72ebb4b58718141db0f3bf", null ], - [ "Create", "classzen_1_1gfx_1_1z_quad.html#a8eaf715d98a3a11a202ad73f0f7e356d", null ], + [ "Create", "classzen_1_1gfx_1_1z_quad.html#a6ba50baedb76b9e4b966b9a3fa0333f4", null ], [ "Resize", "classzen_1_1gfx_1_1z_quad.html#aa18ef578cfc4552effe995fa42e7ce59", null ], [ "Resize", "classzen_1_1gfx_1_1z_quad.html#aecfed1edd9f86fdd22522ac869cae5a2", null ], - [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a5eb84d8851c72de252ee06a302d45e07", null ], - [ "Collides", "classzen_1_1gfx_1_1z_quad.html#ab47b202f4549acb2c691fad8199d45e7", null ], + [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a5f5ed27f47eb430f1bc36eb6b046b04a", null ], + [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a67eeed3aa34f859af6f017bd081c4f4d", null ], [ "Collides", "classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04", null ], [ "SetInverted", "classzen_1_1gfx_1_1z_quad.html#a432e755f175068c7e354053a37ac2365", null ], [ "SetRepeating", "classzen_1_1gfx_1_1z_quad.html#a2461053b411db584b9c3dd40364cdff2", null ] @@ -155,6 +158,8 @@ var group___graphics = [ "InsertEntity", "classzen_1_1gfx_1_1z_scene.html#a1da8d9bef43e37b34a302faa35a986ba", null ], [ "RemoveEntity", "classzen_1_1gfx_1_1z_scene.html#a20048957053138cc366344e16c614561", null ], [ "RemoveEntity", "classzen_1_1gfx_1_1z_scene.html#ad3636d08d2f1492469b8af350d0b6062", null ], + [ "RemoveLight", "classzen_1_1gfx_1_1z_scene.html#ace7ecda0222bcc628b4d1e548fbafb7f", null ], + [ "ShiftEntity", "classzen_1_1gfx_1_1z_scene.html#a3d15fe6db75f5b1e8190f28b0fda1d5f", null ], [ "Clear", "classzen_1_1gfx_1_1z_scene.html#af6b595895bdc0cfcd832435f714ec3b6", null ], [ "Render", "classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1", null ], [ "IsValidEntityIndex", "classzen_1_1gfx_1_1z_scene.html#ad38c58aba5fc0fd4c5d6db43a6befa6b", null ], diff --git a/docs/group___levels.html b/docs/group___levels.html index 17fa8d68..593efec1 100644 --- a/docs/group___levels.html +++ b/docs/group___levels.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -106,7 +106,7 @@
    -

    This group encompasses a high-level API suitable for easily loading, importing, and creating highly customizable levels in order to faciliate rapid development of game worlds. +

    This group encompasses a high-level API suitable for easily loading, importing, and creating highly customizable levels in order to facilitate rapid development of game worlds. More...

    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -146,7 +146,7 @@
    zVector<int> C = A + B; // VALID

    Thus if you need a higher level of precision, keep that vector instance on the right-hand side.

    There is a built-in shortcut to vector_t that is a floating-point vector representation that is used throughout the engine.

    -
    Todo:
    Add support for translation via matrices.
    +
    Todo:
    Add support for translation via matrices.
    Note
    There is support for creating translation matrices via vectors but not vice-versa.
    See Also
    USE_DOUBLE_PRECISION
    diff --git a/docs/group___network.html b/docs/group___network.html index d5630585..9f281079 100644 --- a/docs/group___network.html +++ b/docs/group___network.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___objects.html b/docs/group___objects.html index ab6752da..b14fd2d1 100644 --- a/docs/group___objects.html +++ b/docs/group___objects.html @@ -30,9 +30,9 @@
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -131,6 +131,9 @@
    + + + diff --git a/docs/group___scripting.html b/docs/group___scripting.html index 0388ca3e..24f6f3c8 100644 --- a/docs/group___scripting.html +++ b/docs/group___scripting.html @@ -30,9 +30,9 @@ @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/group___utilities.html b/docs/group___utilities.html index 678ccaef..6b504429 100644 --- a/docs/group___utilities.html +++ b/docs/group___utilities.html @@ -30,9 +30,9 @@
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/hierarchy.html b/docs/hierarchy.html index c15fbc8e..f7727f84 100644 --- a/docs/hierarchy.html +++ b/docs/hierarchy.html @@ -30,9 +30,9 @@
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -123,70 +123,73 @@
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    diff --git a/docs/group___math.html b/docs/group___math.html index d573f28b..b553d9cd 100644 --- a/docs/group___math.html +++ b/docs/group___math.html @@ -30,9 +30,9 @@

    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
     
    struct  zen::obj::material_t
     
    class  zen::obj::zAnimation
     An animated in-game object. More...
     
    class  zen::obj::zEntity
     A base class for all "in-game" objects. More...
     
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    oCzen::obj::circle_tA representation of a circle to provide an alternative collision in Zenderer for objects or sprites that don't play nicely with quads
    oCzen::color3f_tA 24-bit floating point color component (RGB)
    oCzen::color4f_tA 32-bit floating point color component (RGBA)
    oCzen::gfxcore::DrawBatchA collection of drawing data to pass to a zVertexArray
    oCzen::evt::event_tThe event structure storing information about system events
    oCzen::glyph_t
    oCzen::gui::glyph_tA glyph structure used internally by the font API
    oCzen::net::ICMPHeader
    oCzen::net::IPHeader
    oCzen::evt::key_tKeyboard event structure
    oCzen::lvl::level_t
    oCzen::obj::material_t
    oCzen::math::matrix4x4_t4x4 matrix representation
    oCzen::lvl::metalevel_t
    oCzen::evt::mouse_tMouse event structure
    oCPongPacket
    oCzen::math::rect_tRepresents a rectangle with position and dimensions
    oCzen::lvl::spawn_t
    oCzen::math::vector_t
    oCzen::gfxcore::vertex_t
    oCzen::util::XMLNodeA single XML node
    oCzen::asset::zAssetUsed throughout Zenderer to act as a managed asset
    |oCzen::gfxcore::zShaderA wrapper for OpenGL shader objects
    |oCzen::gfxcore::zTextureLow-level texture asset abstraction over OpenGL texture handles
    |oCzen::gui::zFontA TrueType font wrapper class
    |\Czen::sfx::zAudio2DAn abstract base class for audio objects
    | oCzen::sfx::CSound2DSound effects (.wav files)
    | \Czen::sfx::zMusic2DMusic files (.ogg files)
    oCzen::sfx::zAudioManagerA collection of static helper functions for the audio API
    oCzen::gui::zButton
    oCzen::obj::zEntityA base class for all "in-game" objects
    |\Czen::obj::zAnimation
    oCzen::evt::zEventHandler
    oCzen::util::zFileParserZenderer-specific file format parser
    oCzen::gfx::zFont
    oCzen::gfxcore::zGLSubsystemA wrapper for OpenGL objects with proper cleanup
    |oCzen::gfx::zEffectA high-level shader wrapper
    |oCzen::gfx::zRenderTargetCreates a target for all subsequent rendering operations
    |oCzen::gfxcore::zShaderSetA wrapper for a usable set of shaders (an OpenGL program)
    |\Czen::gfxcore::zVertexArrayA wrapper for OpenGL Vertex Array Objects
    oCzen::lvl::zLevelLoaderLoads levels (go figure)
    oCzen::gfx::zLightRepresents a light object acting on a graphical scene
    oCzen::util::zLogCreates a special file stream to store logging information
    oCzen::gfx::zMaterialRendering data composed of a shader effect and a texture
    oCzen::gui::zMenu
    oCzen::util::zOptionUsed internally by zSettings to manage options of all types
    oCzen::util::zParserParses files based on key=value1,...,valueN pairs, like in .ini files
    oCzen::gfx::zPolygonAn arbitrary n-vertex convex polygon
    |oCzen::gfx::zConcavePolygonAn arbitrary n-vertex concave polygon
    |\Czen::gfx::zQuadA four-sided quadrilateral primitive
    oCzen::util::zRandom< SEED, RNG >Facilitates simplification of random number generation
    oCzen::gfxcore::zRendererAbstracts away API-specific rendering operations
    oCzen::net::zSocketA low-level socket wrapper
    oCzen::gfxcore::zSorterA collection of sort methods to optimize rendering
    oCzen::zSubsystemAn abstract base class for all engine subsystems
    |oCzen::asset::zAssetManagerControls creation and proper mmeory management of assets
    |oCzen::gfx::zScene
    |oCzen::gfx::zWindowCreates a renderable OpenGL context
    |oCzen::gui::zFontLibraryInitializes the core FreeType2 library
    |oCzen::lua::zLuaWrapper for the core Lua interpreter
    |oCzen::util::zSettingsAn array-like wrapper for various settings
    |\Czen::zAllocatorAn optional custom allocator for high-speed memory requests
    oCzen::util::zTimerA high-precision timer class for controlling frame rates
    oCzen::math::zVector< T >Represents a point in 3D rectangular-coordinate space
    oCzen::math::zVector< real_t >
    oCzen::math::zVector< uint16_t >
    \Czen::util::zXMLParserA minimalistic XML parser that expects near-perfection from the user
    oCzen::math::cquery_tA collision-quering structure
    oCzen::gfxcore::DrawBatchA collection of drawing data to pass to a zVertexArray
    oCzen::evt::event_tThe event structure storing information about system events
    oCgBullet
    oCzen::glyph_t
    oCzen::gui::glyph_tA glyph structure used internally by the font API
    oCgWorld
    oCzen::net::ICMPHeader
    oCzen::net::IPHeader
    oCzen::evt::key_tKeyboard event structure
    oCzen::lvl::level_t
    oCzen::obj::material_t
    oCzen::math::matrix4x4_t4x4 matrix representation
    oCzen::lvl::metalevel_t
    oCzen::evt::mouse_tMouse event structure
    oCPongPacket
    oCzen::math::rect_tRepresents a rectangle with position and dimensions
    oCzen::lvl::spawn_t
    oCzen::math::vector_t
    oCzen::gfxcore::vertex_t
    oCzen::util::XMLNodeA single XML node
    oCzen::asset::zAssetUsed throughout Zenderer to act as a managed asset
    |oCzen::gfxcore::zShaderA wrapper for OpenGL shader objects
    |oCzen::gfxcore::zTextureLow-level texture asset abstraction over OpenGL texture handles
    |oCzen::gui::zFontA TrueType font wrapper class
    |\Czen::sfx::zAudio2DAn abstract base class for audio objects
    | oCzen::sfx::CSound2DSound effects (.wav files)
    | \Czen::sfx::zMusic2DMusic files (.ogg files)
    oCzen::sfx::zAudioManagerA collection of static helper functions for the audio API
    oCzen::gui::zButton
    oCzen::obj::zEntityA base class for all "in-game" objects
    |\Czen::obj::zAnimationAn animated in-game object
    oCzen::evt::zEventHandler
    oCzen::util::zFileParserZenderer-specific file format parser
    oCzen::gfx::zFont
    oCzen::gfxcore::zGLSubsystemA wrapper for OpenGL objects with proper cleanup
    |oCzen::gfx::zEffectA high-level shader wrapper
    |oCzen::gfx::zRenderTargetCreates a target for all subsequent rendering operations
    |oCzen::gfxcore::zShaderSetA wrapper for a usable set of shaders (an OpenGL program)
    |\Czen::gfxcore::zVertexArrayA wrapper for OpenGL Vertex Array Objects
    oCzen::lvl::zLevelLoaderLoads levels (go figure)
    oCzen::gfx::zLightRepresents a light object acting on a graphical scene
    oCzen::util::zLogCreates a special file stream to store logging information
    oCzen::gfx::zMaterialRendering data composed of a shader effect and a texture
    oCzen::gui::zMenu
    oCzen::util::zOptionUsed internally by zSettings to manage options of all types
    oCzen::util::zParserParses files based on key=value1,...,valueN pairs, like in .ini files
    oCzen::gfx::zPolygonAn arbitrary n-vertex convex polygon
    |oCzen::gfx::zConcavePolygonAn arbitrary n-vertex concave polygon
    |\Czen::gfx::zQuadA four-sided quadrilateral primitive
    oCzen::util::zRandom< SEED, RNG >Facilitates simplification of random number generation
    oCzen::gfxcore::zRendererAbstracts away API-specific rendering operations
    oCzen::net::zSocketA low-level socket wrapper
    oCzen::gfxcore::zSorterA collection of sort methods to optimize rendering
    oCzen::zSubsystemAn abstract base class for all engine subsystems
    |oCzen::asset::zAssetManagerControls creation and proper mmeory management of assets
    |oCzen::gfx::zSceneA high-level rendering wrapper allowing for special effects and lighting
    |oCzen::gfx::zWindowCreates a renderable OpenGL context
    |oCzen::gui::zFontLibraryInitializes the core FreeType2 library
    |oCzen::lua::zLuaWrapper for the core Lua interpreter
    |oCzen::util::zSettingsAn array-like wrapper for various settings
    |\Czen::zAllocatorAn optional custom allocator for high-speed memory requests
    oCzen::util::zTimerA high-precision timer class for controlling frame rates
    oCzen::math::zVector< T >Represents a point in 3D rectangular-coordinate space
    oCzen::math::zVector< real_t >
    oCzen::math::zVector< uint16_t >
    \Czen::util::zXMLParserA minimalistic XML parser that expects near-perfection from the user
    diff --git a/docs/hierarchy.js b/docs/hierarchy.js index 90035e96..180dce87 100644 --- a/docs/hierarchy.js +++ b/docs/hierarchy.js @@ -8,10 +8,13 @@ var hierarchy = [ "zen::obj::circle_t", "group___objects.html#structzen_1_1obj_1_1circle__t", null ], [ "zen::color3f_t", "structzen_1_1color3f__t.html", null ], [ "zen::color4f_t", "structzen_1_1color4f__t.html", null ], + [ "zen::math::cquery_t", "structzen_1_1math_1_1cquery__t.html", null ], [ "zen::gfxcore::DrawBatch", "namespacezen_1_1gfxcore.html#structzen_1_1gfxcore_1_1_draw_batch", null ], [ "zen::evt::event_t", "structzen_1_1evt_1_1event__t.html", null ], + [ "gBullet", "classg_bullet.html", null ], [ "zen::glyph_t", "namespacezen.html#structzen_1_1glyph__t", null ], [ "zen::gui::glyph_t", "namespacezen_1_1gui.html#structzen_1_1gui_1_1glyph__t", null ], + [ "gWorld", "classg_world.html", null ], [ "zen::net::ICMPHeader", "namespacezen_1_1net.html#structzen_1_1net_1_1_i_c_m_p_header", null ], [ "zen::net::IPHeader", "namespacezen_1_1net.html#structzen_1_1net_1_1_i_p_header", null ], [ "zen::evt::key_t", "structzen_1_1evt_1_1key__t.html", null ], diff --git a/docs/index.html b/docs/index.html index c399c322..74108e58 100644 --- a/docs/index.html +++ b/docs/index.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -124,7 +124,7 @@

  • libvorbis (OGG/Vorbis Audio Compression Algorithm)

    • The headers for these files are located in the Zenderer/External/ include path. By default, this path is added to the include search directories for the VS2012 project, so if you are using a different build system, be sure to do likewise.

    -
    Todo:
    Test cross-platform compatibility.
    +
    Todo:
    Test cross-platform compatibility.

    Preprocessor Defines

    There are several preprocessor directives that can be set to slightly modify the behavior of the engine at runtime. They are outlined below.

    diff --git a/docs/inherit_graph_0.map b/docs/inherit_graph_0.map index d8ee9122..37ef1c4e 100644 --- a/docs/inherit_graph_0.map +++ b/docs/inherit_graph_0.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_0.png b/docs/inherit_graph_0.png index ce152d4e..2246abb9 100644 Binary files a/docs/inherit_graph_0.png and b/docs/inherit_graph_0.png differ diff --git a/docs/inherit_graph_1.map b/docs/inherit_graph_1.map index ff7ddc17..9fba3902 100644 --- a/docs/inherit_graph_1.map +++ b/docs/inherit_graph_1.map @@ -1,9 +1,3 @@ - - - - - - - + diff --git a/docs/inherit_graph_1.png b/docs/inherit_graph_1.png index b0761bee..ebf40a1e 100644 Binary files a/docs/inherit_graph_1.png and b/docs/inherit_graph_1.png differ diff --git a/docs/inherit_graph_10.map b/docs/inherit_graph_10.map index 756f9e78..0738e314 100644 --- a/docs/inherit_graph_10.map +++ b/docs/inherit_graph_10.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_10.png b/docs/inherit_graph_10.png index 3480245e..5c3db221 100644 Binary files a/docs/inherit_graph_10.png and b/docs/inherit_graph_10.png differ diff --git a/docs/inherit_graph_11.map b/docs/inherit_graph_11.map index a25058ee..63b8a95b 100644 --- a/docs/inherit_graph_11.map +++ b/docs/inherit_graph_11.map @@ -1,5 +1,3 @@ - - - + diff --git a/docs/inherit_graph_11.png b/docs/inherit_graph_11.png index b96449cc..1b27a2ed 100644 Binary files a/docs/inherit_graph_11.png and b/docs/inherit_graph_11.png differ diff --git a/docs/inherit_graph_12.map b/docs/inherit_graph_12.map index c6a7b854..756f9e78 100644 --- a/docs/inherit_graph_12.map +++ b/docs/inherit_graph_12.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_12.png b/docs/inherit_graph_12.png index d51599a8..3480245e 100644 Binary files a/docs/inherit_graph_12.png and b/docs/inherit_graph_12.png differ diff --git a/docs/inherit_graph_13.map b/docs/inherit_graph_13.map index 7a7e36c2..a25058ee 100644 --- a/docs/inherit_graph_13.map +++ b/docs/inherit_graph_13.map @@ -1,3 +1,5 @@ - + + + diff --git a/docs/inherit_graph_13.png b/docs/inherit_graph_13.png index 2819d19d..b96449cc 100644 Binary files a/docs/inherit_graph_13.png and b/docs/inherit_graph_13.png differ diff --git a/docs/inherit_graph_14.map b/docs/inherit_graph_14.map index 04cdc739..c6a7b854 100644 --- a/docs/inherit_graph_14.map +++ b/docs/inherit_graph_14.map @@ -1,7 +1,3 @@ - - - - - + diff --git a/docs/inherit_graph_14.png b/docs/inherit_graph_14.png index ca27b917..d51599a8 100644 Binary files a/docs/inherit_graph_14.png and b/docs/inherit_graph_14.png differ diff --git a/docs/inherit_graph_15.map b/docs/inherit_graph_15.map index a38aef4e..7a7e36c2 100644 --- a/docs/inherit_graph_15.map +++ b/docs/inherit_graph_15.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_15.png b/docs/inherit_graph_15.png index 5a22c57a..2819d19d 100644 Binary files a/docs/inherit_graph_15.png and b/docs/inherit_graph_15.png differ diff --git a/docs/inherit_graph_16.map b/docs/inherit_graph_16.map index 603c6e52..04cdc739 100644 --- a/docs/inherit_graph_16.map +++ b/docs/inherit_graph_16.map @@ -1,3 +1,7 @@ - + + + + + diff --git a/docs/inherit_graph_16.png b/docs/inherit_graph_16.png index 591d727c..ca27b917 100644 Binary files a/docs/inherit_graph_16.png and b/docs/inherit_graph_16.png differ diff --git a/docs/inherit_graph_17.map b/docs/inherit_graph_17.map index c16699bc..a38aef4e 100644 --- a/docs/inherit_graph_17.map +++ b/docs/inherit_graph_17.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_17.png b/docs/inherit_graph_17.png index ef4d0c41..5a22c57a 100644 Binary files a/docs/inherit_graph_17.png and b/docs/inherit_graph_17.png differ diff --git a/docs/inherit_graph_18.map b/docs/inherit_graph_18.map index f9fe7af0..603c6e52 100644 --- a/docs/inherit_graph_18.map +++ b/docs/inherit_graph_18.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_18.png b/docs/inherit_graph_18.png index 0f92dde8..591d727c 100644 Binary files a/docs/inherit_graph_18.png and b/docs/inherit_graph_18.png differ diff --git a/docs/inherit_graph_19.map b/docs/inherit_graph_19.map index f87d188b..c16699bc 100644 --- a/docs/inherit_graph_19.map +++ b/docs/inherit_graph_19.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_19.png b/docs/inherit_graph_19.png index 44ef88fc..ef4d0c41 100644 Binary files a/docs/inherit_graph_19.png and b/docs/inherit_graph_19.png differ diff --git a/docs/inherit_graph_2.map b/docs/inherit_graph_2.map index d3510908..d8ee9122 100644 --- a/docs/inherit_graph_2.map +++ b/docs/inherit_graph_2.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_2.png b/docs/inherit_graph_2.png index fc7146e0..ce152d4e 100644 Binary files a/docs/inherit_graph_2.png and b/docs/inherit_graph_2.png differ diff --git a/docs/inherit_graph_20.map b/docs/inherit_graph_20.map index ad2aba3a..f9fe7af0 100644 --- a/docs/inherit_graph_20.map +++ b/docs/inherit_graph_20.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_20.png b/docs/inherit_graph_20.png index 06393625..0f92dde8 100644 Binary files a/docs/inherit_graph_20.png and b/docs/inherit_graph_20.png differ diff --git a/docs/inherit_graph_21.map b/docs/inherit_graph_21.map index 8360b045..f87d188b 100644 --- a/docs/inherit_graph_21.map +++ b/docs/inherit_graph_21.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_21.png b/docs/inherit_graph_21.png index 3c900f40..44ef88fc 100644 Binary files a/docs/inherit_graph_21.png and b/docs/inherit_graph_21.png differ diff --git a/docs/inherit_graph_22.map b/docs/inherit_graph_22.map index 104e8c30..ad2aba3a 100644 --- a/docs/inherit_graph_22.map +++ b/docs/inherit_graph_22.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_22.png b/docs/inherit_graph_22.png index 754dcf95..06393625 100644 Binary files a/docs/inherit_graph_22.png and b/docs/inherit_graph_22.png differ diff --git a/docs/inherit_graph_23.map b/docs/inherit_graph_23.map index c0a8dbe9..8360b045 100644 --- a/docs/inherit_graph_23.map +++ b/docs/inherit_graph_23.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_23.png b/docs/inherit_graph_23.png index 3f825a59..3c900f40 100644 Binary files a/docs/inherit_graph_23.png and b/docs/inherit_graph_23.png differ diff --git a/docs/inherit_graph_24.map b/docs/inherit_graph_24.map index f509b65d..104e8c30 100644 --- a/docs/inherit_graph_24.map +++ b/docs/inherit_graph_24.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_24.png b/docs/inherit_graph_24.png index 8ebf54b6..754dcf95 100644 Binary files a/docs/inherit_graph_24.png and b/docs/inherit_graph_24.png differ diff --git a/docs/inherit_graph_25.map b/docs/inherit_graph_25.map index b8dcfa47..c0a8dbe9 100644 --- a/docs/inherit_graph_25.map +++ b/docs/inherit_graph_25.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_25.png b/docs/inherit_graph_25.png index 540a3595..3f825a59 100644 Binary files a/docs/inherit_graph_25.png and b/docs/inherit_graph_25.png differ diff --git a/docs/inherit_graph_26.map b/docs/inherit_graph_26.map index f89e9285..f509b65d 100644 --- a/docs/inherit_graph_26.map +++ b/docs/inherit_graph_26.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_26.png b/docs/inherit_graph_26.png index 99484141..8ebf54b6 100644 Binary files a/docs/inherit_graph_26.png and b/docs/inherit_graph_26.png differ diff --git a/docs/inherit_graph_27.map b/docs/inherit_graph_27.map index 7a24519a..b8dcfa47 100644 --- a/docs/inherit_graph_27.map +++ b/docs/inherit_graph_27.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_27.png b/docs/inherit_graph_27.png index cc599cd0..540a3595 100644 Binary files a/docs/inherit_graph_27.png and b/docs/inherit_graph_27.png differ diff --git a/docs/inherit_graph_28.map b/docs/inherit_graph_28.map index 77777204..f89e9285 100644 --- a/docs/inherit_graph_28.map +++ b/docs/inherit_graph_28.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_28.png b/docs/inherit_graph_28.png index efe2a512..99484141 100644 Binary files a/docs/inherit_graph_28.png and b/docs/inherit_graph_28.png differ diff --git a/docs/inherit_graph_29.map b/docs/inherit_graph_29.map index bfe09ec3..7a24519a 100644 --- a/docs/inherit_graph_29.map +++ b/docs/inherit_graph_29.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_29.png b/docs/inherit_graph_29.png index 0878e122..cc599cd0 100644 Binary files a/docs/inherit_graph_29.png and b/docs/inherit_graph_29.png differ diff --git a/docs/inherit_graph_3.map b/docs/inherit_graph_3.map index 1f7e92a3..ff7ddc17 100644 --- a/docs/inherit_graph_3.map +++ b/docs/inherit_graph_3.map @@ -1,3 +1,9 @@ - + + + + + + + diff --git a/docs/inherit_graph_3.png b/docs/inherit_graph_3.png index 6d14fd33..b0761bee 100644 Binary files a/docs/inherit_graph_3.png and b/docs/inherit_graph_3.png differ diff --git a/docs/inherit_graph_30.map b/docs/inherit_graph_30.map index aa599539..27329a34 100644 --- a/docs/inherit_graph_30.map +++ b/docs/inherit_graph_30.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_30.png b/docs/inherit_graph_30.png index c76afc47..895bef6c 100644 Binary files a/docs/inherit_graph_30.png and b/docs/inherit_graph_30.png differ diff --git a/docs/inherit_graph_31.map b/docs/inherit_graph_31.map index f2055982..77777204 100644 --- a/docs/inherit_graph_31.map +++ b/docs/inherit_graph_31.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_31.png b/docs/inherit_graph_31.png index adf8075c..efe2a512 100644 Binary files a/docs/inherit_graph_31.png and b/docs/inherit_graph_31.png differ diff --git a/docs/inherit_graph_32.map b/docs/inherit_graph_32.map index 5e77dfdc..bfe09ec3 100644 --- a/docs/inherit_graph_32.map +++ b/docs/inherit_graph_32.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_32.png b/docs/inherit_graph_32.png index 66adbec7..0878e122 100644 Binary files a/docs/inherit_graph_32.png and b/docs/inherit_graph_32.png differ diff --git a/docs/inherit_graph_33.map b/docs/inherit_graph_33.map index 6882fb52..aa599539 100644 --- a/docs/inherit_graph_33.map +++ b/docs/inherit_graph_33.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_33.png b/docs/inherit_graph_33.png index 25a58e6a..c76afc47 100644 Binary files a/docs/inherit_graph_33.png and b/docs/inherit_graph_33.png differ diff --git a/docs/inherit_graph_34.map b/docs/inherit_graph_34.map index c012f290..f2055982 100644 --- a/docs/inherit_graph_34.map +++ b/docs/inherit_graph_34.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_34.png b/docs/inherit_graph_34.png index a410d18d..adf8075c 100644 Binary files a/docs/inherit_graph_34.png and b/docs/inherit_graph_34.png differ diff --git a/docs/inherit_graph_35.map b/docs/inherit_graph_35.map index f7874b36..5e77dfdc 100644 --- a/docs/inherit_graph_35.map +++ b/docs/inherit_graph_35.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_35.png b/docs/inherit_graph_35.png index 377283a0..66adbec7 100644 Binary files a/docs/inherit_graph_35.png and b/docs/inherit_graph_35.png differ diff --git a/docs/inherit_graph_36.map b/docs/inherit_graph_36.map index ca90d8bb..6882fb52 100644 --- a/docs/inherit_graph_36.map +++ b/docs/inherit_graph_36.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_36.png b/docs/inherit_graph_36.png index 3f8860ef..25a58e6a 100644 Binary files a/docs/inherit_graph_36.png and b/docs/inherit_graph_36.png differ diff --git a/docs/inherit_graph_37.map b/docs/inherit_graph_37.map index 088a209e..c012f290 100644 --- a/docs/inherit_graph_37.map +++ b/docs/inherit_graph_37.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_37.png b/docs/inherit_graph_37.png index ad65b26f..a410d18d 100644 Binary files a/docs/inherit_graph_37.png and b/docs/inherit_graph_37.png differ diff --git a/docs/inherit_graph_38.map b/docs/inherit_graph_38.map index 1dd20c66..f7874b36 100644 --- a/docs/inherit_graph_38.map +++ b/docs/inherit_graph_38.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_38.png b/docs/inherit_graph_38.png index 305948fc..377283a0 100644 Binary files a/docs/inherit_graph_38.png and b/docs/inherit_graph_38.png differ diff --git a/docs/inherit_graph_39.map b/docs/inherit_graph_39.map index dde49708..ca90d8bb 100644 --- a/docs/inherit_graph_39.map +++ b/docs/inherit_graph_39.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_39.png b/docs/inherit_graph_39.png index 5f8d9cd2..3f8860ef 100644 Binary files a/docs/inherit_graph_39.png and b/docs/inherit_graph_39.png differ diff --git a/docs/inherit_graph_4.map b/docs/inherit_graph_4.map index 3175b29b..d3510908 100644 --- a/docs/inherit_graph_4.map +++ b/docs/inherit_graph_4.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_4.png b/docs/inherit_graph_4.png index bb418e70..fc7146e0 100644 Binary files a/docs/inherit_graph_4.png and b/docs/inherit_graph_4.png differ diff --git a/docs/inherit_graph_40.map b/docs/inherit_graph_40.map index 733d9676..088a209e 100644 --- a/docs/inherit_graph_40.map +++ b/docs/inherit_graph_40.map @@ -1,4 +1,3 @@ - - + diff --git a/docs/inherit_graph_40.png b/docs/inherit_graph_40.png index de622b1b..ad65b26f 100644 Binary files a/docs/inherit_graph_40.png and b/docs/inherit_graph_40.png differ diff --git a/docs/inherit_graph_41.map b/docs/inherit_graph_41.map index 6dcb0f1b..1dd20c66 100644 --- a/docs/inherit_graph_41.map +++ b/docs/inherit_graph_41.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_41.png b/docs/inherit_graph_41.png index 3cc50adf..305948fc 100644 Binary files a/docs/inherit_graph_41.png and b/docs/inherit_graph_41.png differ diff --git a/docs/inherit_graph_42.map b/docs/inherit_graph_42.map index e5dd36cd..dde49708 100644 --- a/docs/inherit_graph_42.map +++ b/docs/inherit_graph_42.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_42.png b/docs/inherit_graph_42.png index ca694a18..5f8d9cd2 100644 Binary files a/docs/inherit_graph_42.png and b/docs/inherit_graph_42.png differ diff --git a/docs/inherit_graph_43.map b/docs/inherit_graph_43.map index 0d0fe754..5b43d1f7 100644 --- a/docs/inherit_graph_43.map +++ b/docs/inherit_graph_43.map @@ -1,3 +1,4 @@ - + + diff --git a/docs/inherit_graph_43.png b/docs/inherit_graph_43.png index 536fd0ac..de622b1b 100644 Binary files a/docs/inherit_graph_43.png and b/docs/inherit_graph_43.png differ diff --git a/docs/inherit_graph_44.map b/docs/inherit_graph_44.map index 8be79478..6dcb0f1b 100644 --- a/docs/inherit_graph_44.map +++ b/docs/inherit_graph_44.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_44.png b/docs/inherit_graph_44.png index 617ad7c1..3cc50adf 100644 Binary files a/docs/inherit_graph_44.png and b/docs/inherit_graph_44.png differ diff --git a/docs/inherit_graph_45.map b/docs/inherit_graph_45.map index 80806a37..e5dd36cd 100644 --- a/docs/inherit_graph_45.map +++ b/docs/inherit_graph_45.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_45.png b/docs/inherit_graph_45.png index c9eb7a60..ca694a18 100644 Binary files a/docs/inherit_graph_45.png and b/docs/inherit_graph_45.png differ diff --git a/docs/inherit_graph_46.map b/docs/inherit_graph_46.map index ee00b68f..0d0fe754 100644 --- a/docs/inherit_graph_46.map +++ b/docs/inherit_graph_46.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_46.png b/docs/inherit_graph_46.png index a809ae7b..536fd0ac 100644 Binary files a/docs/inherit_graph_46.png and b/docs/inherit_graph_46.png differ diff --git a/docs/inherit_graph_47.map b/docs/inherit_graph_47.map index d9d44a7c..8be79478 100644 --- a/docs/inherit_graph_47.map +++ b/docs/inherit_graph_47.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_47.png b/docs/inherit_graph_47.png index 3428ab75..617ad7c1 100644 Binary files a/docs/inherit_graph_47.png and b/docs/inherit_graph_47.png differ diff --git a/docs/inherit_graph_48.map b/docs/inherit_graph_48.map index c6d4e6eb..80806a37 100644 --- a/docs/inherit_graph_48.map +++ b/docs/inherit_graph_48.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_48.png b/docs/inherit_graph_48.png index d359c72c..c9eb7a60 100644 Binary files a/docs/inherit_graph_48.png and b/docs/inherit_graph_48.png differ diff --git a/docs/inherit_graph_49.map b/docs/inherit_graph_49.map index 4355a860..ee00b68f 100644 --- a/docs/inherit_graph_49.map +++ b/docs/inherit_graph_49.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_49.png b/docs/inherit_graph_49.png index 469783bc..a809ae7b 100644 Binary files a/docs/inherit_graph_49.png and b/docs/inherit_graph_49.png differ diff --git a/docs/inherit_graph_5.map b/docs/inherit_graph_5.map index 9101f5f2..1f7e92a3 100644 --- a/docs/inherit_graph_5.map +++ b/docs/inherit_graph_5.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_5.png b/docs/inherit_graph_5.png index 486977a2..6d14fd33 100644 Binary files a/docs/inherit_graph_5.png and b/docs/inherit_graph_5.png differ diff --git a/docs/inherit_graph_50.map b/docs/inherit_graph_50.map index ac1ab0e1..d9d44a7c 100644 --- a/docs/inherit_graph_50.map +++ b/docs/inherit_graph_50.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_50.png b/docs/inherit_graph_50.png index fc74960c..3428ab75 100644 Binary files a/docs/inherit_graph_50.png and b/docs/inherit_graph_50.png differ diff --git a/docs/inherit_graph_51.map b/docs/inherit_graph_51.map index f994c775..c6d4e6eb 100644 --- a/docs/inherit_graph_51.map +++ b/docs/inherit_graph_51.map @@ -1,10 +1,3 @@ - - - - - - - - + diff --git a/docs/inherit_graph_51.png b/docs/inherit_graph_51.png index 9f30c11e..d359c72c 100644 Binary files a/docs/inherit_graph_51.png and b/docs/inherit_graph_51.png differ diff --git a/docs/inherit_graph_52.map b/docs/inherit_graph_52.map index f994c775..4355a860 100644 --- a/docs/inherit_graph_52.map +++ b/docs/inherit_graph_52.map @@ -1,10 +1,3 @@ - - - - - - - - + diff --git a/docs/inherit_graph_52.png b/docs/inherit_graph_52.png index 9f30c11e..469783bc 100644 Binary files a/docs/inherit_graph_52.png and b/docs/inherit_graph_52.png differ diff --git a/docs/inherit_graph_53.map b/docs/inherit_graph_53.map new file mode 100644 index 00000000..ac1ab0e1 --- /dev/null +++ b/docs/inherit_graph_53.map @@ -0,0 +1,3 @@ + + + diff --git a/docs/inherit_graph_53.png b/docs/inherit_graph_53.png new file mode 100644 index 00000000..fc74960c Binary files /dev/null and b/docs/inherit_graph_53.png differ diff --git a/docs/inherit_graph_54.map b/docs/inherit_graph_54.map new file mode 100644 index 00000000..147c6bbd --- /dev/null +++ b/docs/inherit_graph_54.map @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/docs/inherit_graph_54.png b/docs/inherit_graph_54.png new file mode 100644 index 00000000..9f30c11e Binary files /dev/null and b/docs/inherit_graph_54.png differ diff --git a/docs/inherit_graph_6.map b/docs/inherit_graph_6.map index 53f1c3ea..3175b29b 100644 --- a/docs/inherit_graph_6.map +++ b/docs/inherit_graph_6.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_6.png b/docs/inherit_graph_6.png index 530b86c3..bb418e70 100644 Binary files a/docs/inherit_graph_6.png and b/docs/inherit_graph_6.png differ diff --git a/docs/inherit_graph_7.map b/docs/inherit_graph_7.map index 1456f60d..9101f5f2 100644 --- a/docs/inherit_graph_7.map +++ b/docs/inherit_graph_7.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_7.png b/docs/inherit_graph_7.png index 406a5efa..486977a2 100644 Binary files a/docs/inherit_graph_7.png and b/docs/inherit_graph_7.png differ diff --git a/docs/inherit_graph_8.map b/docs/inherit_graph_8.map index 0738e314..53f1c3ea 100644 --- a/docs/inherit_graph_8.map +++ b/docs/inherit_graph_8.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_8.png b/docs/inherit_graph_8.png index 5c3db221..530b86c3 100644 Binary files a/docs/inherit_graph_8.png and b/docs/inherit_graph_8.png differ diff --git a/docs/inherit_graph_9.map b/docs/inherit_graph_9.map index 63b8a95b..1456f60d 100644 --- a/docs/inherit_graph_9.map +++ b/docs/inherit_graph_9.map @@ -1,3 +1,3 @@ - + diff --git a/docs/inherit_graph_9.png b/docs/inherit_graph_9.png index 1b27a2ed..406a5efa 100644 Binary files a/docs/inherit_graph_9.png and b/docs/inherit_graph_9.png differ diff --git a/docs/inherits.html b/docs/inherits.html index ddf37739..992641e4 100644 --- a/docs/inherits.html +++ b/docs/inherits.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -114,213 +114,225 @@

    Go to the textual class hierarchy

    - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - -
    +
    + + +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    - +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    - +
    diff --git a/docs/modules.html b/docs/modules.html index 574243f5..c8cce7c6 100644 --- a/docs/modules.html +++ b/docs/modules.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -112,7 +112,7 @@ oEventsContains structures and handlers for taking care of global application events oGUIContains objects and wrapper classes for easily rendering things like text, menus, and other UI elements on-screen oGraphicsThis engine component contains a high-level graphics API that allows for manipulation of effects, lights, and other features without worrying about low-level details -oLevelsThis group encompasses a high-level API suitable for easily loading, importing, and creating highly customizable levels in order to faciliate rapid development of game worlds +oLevelsThis group encompasses a high-level API suitable for easily loading, importing, and creating highly customizable levels in order to facilitate rapid development of game worlds oMathThis group contains essentials for manipulation of objects throughout the rendering engine oNetworkA group with interfaces and routines for more simplified multiplayer or networked development that allows for an easy cross platform interface to be shared for a variety of architectures oObjectsA group containing renderable objects with a variety of controllable options and features like animation and collision detection diff --git a/docs/namespacemembers.html b/docs/namespacemembers.html index 04cca9e4..a79a8365 100644 --- a/docs/namespacemembers.html +++ b/docs/namespacemembers.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -128,7 +128,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -155,9 +155,9 @@

    - c -

    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -124,6 +124,9 @@
  • SocketType : zen::net
    • +
  • SpawnType +: zen::lvl +
    • diff --git a/docs/namespacemembers_eval.html b/docs/namespacemembers_eval.html index 53d06a9f..2eb2ad63 100644 --- a/docs/namespacemembers_eval.html +++ b/docs/namespacemembers_eval.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -104,7 +104,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -118,6 +118,9 @@
  • DEFAULT_SIZE : zen::net
    • +
  • ENEMY_SPAWN +: zen::lvl +
  • ICMP_DEST_UNREACHABLE : zen::net
    • @@ -127,6 +130,9 @@
  • ICMP_ECHO_REQUEST : zen::net
    • +
  • ITEM_SPAWN +: zen::lvl +
  • MAX_DATA_SIZE : zen::net
    • @@ -136,6 +142,9 @@
  • PACKET_SIZE : zen::net
    • +
  • PLAYER_SPAWN +: zen::lvl +
  • RAW : zen::net
    • diff --git a/docs/namespacemembers_func.html b/docs/namespacemembers_func.html index de8dfed1..6ec79773 100644 --- a/docs/namespacemembers_func.html +++ b/docs/namespacemembers_func.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -121,7 +121,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -138,9 +138,9 @@

    - c -

    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -133,6 +133,9 @@
  • real_t : zen
    • +
  • socket_t +: zen::net +
  • string_t : zen
    • diff --git a/docs/namespacemembers_vars.html b/docs/namespacemembers_vars.html index 8cfbe109..1f5c8010 100644 --- a/docs/namespacemembers_vars.html +++ b/docs/namespacemembers_vars.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -104,7 +104,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/namespacezen.html b/docs/namespacezen.html index 555c060b..67dadc2e 100644 --- a/docs/namespacezen.html +++ b/docs/namespacezen.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -245,7 +245,7 @@

    Typedef Documentation

    Examples:
    Fonts, and Polygons.
    -

    Definition at line 76 of file Types.hpp.

    +

    Definition at line 107 of file Types.hpp.

    @@ -261,7 +261,7 @@

    Typedef Documentation

    Currently, this just defaults to std::string, but there may be a future implementation in which there is a custom string class created tailored specifically for the engine.

    Examples:
    Logging.
    -

    Definition at line 84 of file Types.hpp.

    +

    Definition at line 115 of file Types.hpp.

    @@ -351,7 +351,7 @@

    Function Documentation

    -

    Definition at line 94 of file Types.hpp.

    +

    Definition at line 125 of file Types.hpp.

    @@ -375,7 +375,7 @@

    Function Documentation

    - +

    @@ -402,7 +402,7 @@

    Function Documentation

    - +

    diff --git a/docs/namespacezen_1_1asset.html b/docs/namespacezen_1_1asset.html index f58108ec..6fe91737 100644 --- a/docs/namespacezen_1_1asset.html +++ b/docs/namespacezen_1_1asset.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/namespacezen_1_1evt.html b/docs/namespacezen_1_1evt.html index 56b44598..e582d050 100644 --- a/docs/namespacezen_1_1evt.html +++ b/docs/namespacezen_1_1evt.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/namespacezen_1_1gfx.html b/docs/namespacezen_1_1gfx.html index fba2bcec..63aecb9f 100644 --- a/docs/namespacezen_1_1gfx.html +++ b/docs/namespacezen_1_1gfx.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -141,6 +141,7 @@  Creates a target for all subsequent rendering operations. More...
      class  zScene + A high-level rendering wrapper allowing for special effects and lighting. More...
      class  zWindow  Creates a renderable OpenGL context. More...
    @@ -233,7 +234,7 @@

    Variable Documentation

    -

    Definition at line 53 of file OpenGL.hpp.

    +

    Definition at line 58 of file OpenGL.hpp.

    diff --git a/docs/namespacezen_1_1gfxcore.html b/docs/namespacezen_1_1gfxcore.html index eba49f50..8cbaaad6 100644 --- a/docs/namespacezen_1_1gfxcore.html +++ b/docs/namespacezen_1_1gfxcore.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -217,7 +217,7 @@
    Examples:
    VertexArray.
    -

    Definition at line 96 of file OpenGL.hpp.

    +

    Definition at line 101 of file OpenGL.hpp.

    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/namespacezen_1_1lua.html b/docs/namespacezen_1_1lua.html index 7944d63a..9965fdfc 100644 --- a/docs/namespacezen_1_1lua.html +++ b/docs/namespacezen_1_1lua.html @@ -30,9 +30,9 @@
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/namespacezen_1_1lvl.html b/docs/namespacezen_1_1lvl.html index 37fd54dc..33d77e67 100644 --- a/docs/namespacezen_1_1lvl.html +++ b/docs/namespacezen_1_1lvl.html @@ -30,9 +30,9 @@
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -105,7 +105,8 @@
    -Data Structures
    +Data Structures | +Enumerations
    zen::lvl Namespace Reference
    @@ -122,6 +123,14 @@ +
    Data Fields
    @@ -348,7 +348,7 @@

    Function Documentation

    Returns
    true if there was no error, and false otherwise, though the assertion will exit the program.
    -

    Definition at line 73 of file OpenGL.hpp.

    +

    Definition at line 78 of file OpenGL.hpp.

    diff --git a/docs/namespacezen_1_1gui.html b/docs/namespacezen_1_1gui.html index bb1239e1..5a80ab50 100644 --- a/docs/namespacezen_1_1gui.html +++ b/docs/namespacezen_1_1gui.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    class  zLevelLoader
     Loads levels (go figure). More...
     
    + + +

    +Enumerations

    enum  SpawnType { SpawnType::PLAYER_SPAWN, +SpawnType::ENEMY_SPAWN, +SpawnType::ITEM_SPAWN + }
     

    Data Structure Documentation

    @@ -134,10 +143,16 @@
    -

    Definition at line 40 of file Level.hpp.

    +

    Definition at line 47 of file Level.hpp.

    + + + @@ -169,7 +184,7 @@
    Data Fields
    +SpawnType +type +
    vector_t position
    -

    Definition at line 47 of file Level.hpp.

    +

    Definition at line 55 of file Level.hpp.

    Data Fields
    @@ -198,7 +213,7 @@
    -

    Definition at line 53 of file Level.hpp.

    +

    Definition at line 61 of file Level.hpp.

    + + + @@ -233,6 +254,37 @@
    Data Fields
    @@ -220,6 +235,12 @@
    +vector< zEntity * > +physical +
    vector< zLight * > lights
    +
    + +

    Enumeration Type Documentation

    + +
    +
    + + + + + +
    + + + + +
    enum zen::lvl::SpawnType
    +     		+strong
    +
    + + + + +
    Enumerator
    PLAYER_SPAWN  +
    ENEMY_SPAWN  +
    ITEM_SPAWN  +
    + +

    Definition at line 40 of file Level.hpp.

    +
    diff --git a/docs/namespacezen_1_1lvl_dup.js b/docs/namespacezen_1_1lvl_dup.js index a0817f3a..e765c180 100644 --- a/docs/namespacezen_1_1lvl_dup.js +++ b/docs/namespacezen_1_1lvl_dup.js @@ -3,6 +3,7 @@ var namespacezen_1_1lvl_dup = [ "metadata", "namespacezen_1_1lvl.html#ab468f1c84927f9cff5a72f8b8f9fba2a", null ], [ "spawnpoints", "namespacezen_1_1lvl.html#a20532f985031396ba3bb0fbdd8b6deac", null ], [ "entities", "namespacezen_1_1lvl.html#a75e632ff82a8efeea13536f34416bde4", null ], + [ "physical", "namespacezen_1_1lvl.html#ad7d3e124aedb66291a07f84ca038391d", null ], [ "lights", "namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39", null ], [ "valid", "namespacezen_1_1lvl.html#ab19c575a197ebaa8853515c925605461", null ] ]; \ No newline at end of file diff --git a/docs/namespacezen_1_1math.html b/docs/namespacezen_1_1math.html index bbc9c470..1ec6662d 100644 --- a/docs/namespacezen_1_1math.html +++ b/docs/namespacezen_1_1math.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -131,6 +131,9 @@ struct  aabb_t  Represents an axis-aligned bounding box. More...
      +struct  cquery_t + A collision-quering structure. More...
    +  struct  zVector  Represents a point in 3D rectangular-coordinate space. More...
      @@ -195,12 +198,12 @@ bool in_range (const T &n, const T &minimum, const T &maximum)  Tests to see if a value is in a given range (inclusive). More...
      -bool collides (const tri_t &A, const tri_t &b, vector_t *pt=nullptr) - Detects collision between two triangles. More...
    -  -bool collides (const line_t &a, const line_t &b, vector_t *pt=nullptr) - This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
    -  +bool collides (const tri_t &A, const tri_t &b, cquery_t *q=nullptr) + Detects collision between two triangles. More...
    +  +bool collides (const line_t &a, const line_t &b, cquery_t *q=nullptr) + This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. More...
    +  bool orientation (const tri_t &Tri)  Finds orientation of a given set of points. More...
      @@ -495,7 +498,7 @@

    Function Documentation

    - +

    @@ -556,7 +559,7 @@

    Function Documentation

    - +

    @@ -708,7 +711,7 @@

    Function Documentation

    - +
    @@ -727,8 +730,8 @@

    Function Documentation

    - - + + @@ -741,17 +744,17 @@

    Function Documentation

    vector_t * pt = nullptr cquery_t * q = nullptr 
    - +
    AFirst triangle
    BSecond triangle
    ptThe exact point of intersection (optional)
    qCollision query data (optional)
    Returns
    true if they collide, false otherwise.
    -

    Definition at line 98 of file Shapes.cpp.

    +

    Definition at line 99 of file Shapes.cpp.

    - +
    @@ -770,8 +773,8 @@

    Function Documentation

    - - + + @@ -782,7 +785,7 @@

    Function Documentation

    See Also
    http://stackoverflow.com/a/565282
    -

    Definition at line 123 of file Shapes.cpp.

    +

    Definition at line 133 of file Shapes.cpp.

    @@ -807,14 +810,14 @@

    Function Documentation

    Returns
    true if clockwise, false if counter-clockwise.
    -

    Definition at line 150 of file Shapes.cpp.

    +

    Definition at line 160 of file Shapes.cpp.

    Here is the caller graph for this function:
    - +

    @@ -854,14 +857,14 @@

    Function Documentation

    Returns
    true if V is within T, false otherwise.
    See Also
    http://stackoverflow.com/a/13301035
    -

    Definition at line 156 of file Shapes.cpp.

    +

    Definition at line 166 of file Shapes.cpp.

    Here is the caller graph for this function:
    - +

    @@ -893,14 +896,14 @@

    Function Documentation

    http://gist.github.com/Ruskiy69/6526805
    Note
    Algorithmic complexity: O(n^3)
    -

    Definition at line 175 of file Shapes.cpp.

    +

    Definition at line 185 of file Shapes.cpp.

    Here is the caller graph for this function:
    - +

    diff --git a/docs/namespacezen_1_1math.js b/docs/namespacezen_1_1math.js index 9b7dbebd..20aee02a 100644 --- a/docs/namespacezen_1_1math.js +++ b/docs/namespacezen_1_1math.js @@ -4,6 +4,7 @@ var namespacezen_1_1math = [ "rect_t", "structzen_1_1math_1_1rect__t.html", "structzen_1_1math_1_1rect__t" ], [ "circle_t", "structzen_1_1math_1_1circle__t.html", "structzen_1_1math_1_1circle__t" ], [ "aabb_t", "structzen_1_1math_1_1aabb__t.html", "structzen_1_1math_1_1aabb__t" ], + [ "cquery_t", "structzen_1_1math_1_1cquery__t.html", "structzen_1_1math_1_1cquery__t" ], [ "zVector", "structzen_1_1math_1_1z_vector.html", "structzen_1_1math_1_1z_vector" ], [ "vector_t", "group___math.html#classzen_1_1math_1_1vector__t", null ] ]; \ No newline at end of file diff --git a/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.map b/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.map index be74f5ce..13c7e20b 100644 --- a/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.map +++ b/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.map @@ -1,12 +1,15 @@ - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.png b/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.png index 300707b8..a56175c6 100644 Binary files a/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.png and b/docs/namespacezen_1_1math_a1d4ffb053acae9b90121f0d9658680f0_icgraph.png differ diff --git a/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.map b/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.map index 2fbed20e..5049c0b5 100644 --- a/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.map +++ b/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.map @@ -1,11 +1,14 @@ - - - - - - - - - + + + + + + + + + + + + diff --git a/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.png b/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.png index 68651bce..f9ecaf3e 100644 Binary files a/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.png and b/docs/namespacezen_1_1math_a4f3d40ee0b2ca5a5ea75006260d1dede_icgraph.png differ diff --git a/docs/namespacezen_1_1math_a5a67238f55df8bebfac6b3ab4d2713d9_icgraph.map b/docs/namespacezen_1_1math_a5a67238f55df8bebfac6b3ab4d2713d9_icgraph.map deleted file mode 100644 index 805f1d99..00000000 --- a/docs/namespacezen_1_1math_a5a67238f55df8bebfac6b3ab4d2713d9_icgraph.map +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/docs/namespacezen_1_1math_a5a67238f55df8bebfac6b3ab4d2713d9_icgraph.png b/docs/namespacezen_1_1math_a5a67238f55df8bebfac6b3ab4d2713d9_icgraph.png deleted file mode 100644 index b89dadb4..00000000 Binary files a/docs/namespacezen_1_1math_a5a67238f55df8bebfac6b3ab4d2713d9_icgraph.png and /dev/null differ diff --git a/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.map b/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.map index 823d0ce9..ecc8258b 100644 --- a/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.map +++ b/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.map @@ -1,12 +1,15 @@ - - - - - - - - - - + + + + + + + + + + + + + diff --git a/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.png b/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.png index d12626d5..59e6149d 100644 Binary files a/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.png and b/docs/namespacezen_1_1math_a64218c752dcff51bfa84fbe3d3b52d66_icgraph.png differ diff --git a/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.map b/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.map index 475c7da6..6e734314 100644 --- a/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.map +++ b/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.map @@ -1,17 +1,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.png b/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.png index da11e12d..460a9d07 100644 Binary files a/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.png and b/docs/namespacezen_1_1math_aabd370ffdf05dd995a20fc89408cad16_icgraph.png differ diff --git a/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.map b/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.map index 7bfbef77..5f06e2db 100644 --- a/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.map +++ b/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.map @@ -1,12 +1,13 @@ - + - - - + + + - - + + + diff --git a/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.png b/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.png index a3a5f1ed..3a345923 100644 Binary files a/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.png and b/docs/namespacezen_1_1math_aba6f634f9ccda1de3a28e4e8f86f3da2_icgraph.png differ diff --git a/docs/namespacezen_1_1net.html b/docs/namespacezen_1_1net.html index aa23749b..73c7a767 100644 --- a/docs/namespacezen_1_1net.html +++ b/docs/namespacezen_1_1net.html @@ -30,9 +30,9 @@ @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -106,6 +106,7 @@
    Data Structures | +Typedefs | Enumerations
    zen::net Namespace Reference
    @@ -122,6 +123,11 @@
    vector_t * pt = nullptr cquery_t * q = nullptr 
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
     A low-level socket wrapper. More...
     
    + + + +

    +Typedefs

    typedef unsigned int socket_t
     

    Enumerations

    enum  ICMPReply { ICMP_ECHO_REPLY = 0, @@ -152,7 +158,7 @@
    -

    Definition at line 59 of file Socket.hpp.

    +

    Definition at line 61 of file Socket.hpp.

    Data Fields
    @@ -235,7 +241,7 @@
    -

    Definition at line 74 of file Socket.hpp.

    +

    Definition at line 76 of file Socket.hpp.

    Data Fields
    @@ -276,6 +282,21 @@
    +
    +
    +

    Typedef Documentation

    + +
    +
    + + + + +
    typedef unsigned int zen::net::socket_t
    +
    + +

    Definition at line 110 of file Socket.hpp.

    +

    Enumeration Type Documentation

    @@ -297,7 +318,7 @@

    Enumeration Type Documentation

    -

    Definition at line 85 of file Socket.hpp.

    +

    Definition at line 87 of file Socket.hpp.

    @@ -329,7 +350,7 @@

    Enumeration Type Documentation

    -

    Definition at line 93 of file Socket.hpp.

    +

    Definition at line 95 of file Socket.hpp.

    @@ -359,7 +380,7 @@

    Enumeration Type Documentation

    -

    Definition at line 102 of file Socket.hpp.

    +

    Definition at line 112 of file Socket.hpp.

    diff --git a/docs/namespacezen_1_1obj.html b/docs/namespacezen_1_1obj.html index 64fe568c..2996a03c 100644 --- a/docs/namespacezen_1_1obj.html +++ b/docs/namespacezen_1_1obj.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -119,6 +119,7 @@

    Data Structures

    class  zAnimation + An animated in-game object. More...
      class  zEntity  A base class for all "in-game" objects. More...
    @@ -157,7 +158,7 @@

    Variable Documentation

    Examples:
    Fonts, and Scenes.
    -

    Definition at line 31 of file Polygon.hpp.

    +

    Definition at line 33 of file Polygon.hpp.

    diff --git a/docs/namespacezen_1_1sfx.html b/docs/namespacezen_1_1sfx.html index fecc79db..560587b6 100644 --- a/docs/namespacezen_1_1sfx.html +++ b/docs/namespacezen_1_1sfx.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/namespacezen_1_1util.html b/docs/namespacezen_1_1util.html index 8809ea0f..7b1b74b1 100644 --- a/docs/namespacezen_1_1util.html +++ b/docs/namespacezen_1_1util.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -94,7 +94,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -236,7 +236,7 @@ name "body" -

    Definition at line 72 of file XMLParser.hpp.

    +

    Definition at line 73 of file XMLParser.hpp.

    Data Fields
    @@ -284,7 +284,7 @@

    Typedef Documentation

    -

    Definition at line 39 of file Timer.hpp.

    +

    Definition at line 44 of file Timer.hpp.

    @@ -298,7 +298,7 @@

    Typedef Documentation

    -

    Definition at line 43 of file XMLParser.hpp.

    +

    Definition at line 44 of file XMLParser.hpp.

    @@ -312,7 +312,7 @@

    Typedef Documentation

    -

    Definition at line 46 of file XMLParser.hpp.

    +

    Definition at line 47 of file XMLParser.hpp.

    @@ -398,6 +398,15 @@

    Function Documentation

    Definition at line 5 of file Helpers.cpp.

    +

    +Here is the caller graph for this function:
    +
    +
    + + +
    +

    + @@ -491,7 +500,7 @@

    Function Documentation

    - +

    @@ -569,7 +578,7 @@

    Function Documentation

    - +

    @@ -603,7 +612,7 @@

    Function Documentation

    - +

    @@ -686,7 +695,7 @@

    Function Documentation

    - +

    @@ -740,7 +749,7 @@

    Function Documentation

    - +

    @@ -757,7 +766,7 @@

    Variable Documentation

    -

    Definition at line 40 of file XMLParser.hpp.

    +

    Definition at line 41 of file XMLParser.hpp.

    diff --git a/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.map b/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.map index 553e116c..4c389a5b 100644 --- a/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.map +++ b/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.map @@ -2,7 +2,7 @@ - + diff --git a/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.png b/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.png index 2c021715..0596145c 100644 Binary files a/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.png and b/docs/namespacezen_1_1util_a3b73b2608dcb520f9cfc549406b602f1_icgraph.png differ diff --git a/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.map b/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.map index c31b2688..c309f378 100644 --- a/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.map +++ b/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.map @@ -1,6 +1,6 @@ - + diff --git a/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.png b/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.png index 58df0525..40966de6 100644 Binary files a/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.png and b/docs/namespacezen_1_1util_a613ef6d857cad323640de5c03bc87e4e_icgraph.png differ diff --git a/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.map b/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.map index 3a152917..13af52c9 100644 --- a/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.map +++ b/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.map @@ -1,7 +1,4 @@ - - - - - + + diff --git a/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.png b/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.png index 2dc865c5..cba137a3 100644 Binary files a/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.png and b/docs/namespacezen_1_1util_a9f970dca52b6ce6ba2f93af6a7acb4ea_icgraph.png differ diff --git a/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.map b/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.map index 115115dc..b919ca89 100644 --- a/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.map +++ b/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.map @@ -1,6 +1,7 @@ - - - - + + + + + diff --git a/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.png b/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.png index 9be7f07b..932c64ce 100644 Binary files a/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.png and b/docs/namespacezen_1_1util_aa5d0e652af4a8ef573c4300e10eb1767_icgraph.png differ diff --git a/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.map b/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.map index ba94748e..58c81ef9 100644 --- a/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.map +++ b/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.map @@ -1,5 +1,6 @@ - + + diff --git a/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.png b/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.png index 72c7ca15..d408a9e4 100644 Binary files a/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.png and b/docs/namespacezen_1_1util_abcd46d2b51e6e06f9d9c64e3d252c9ff_icgraph.png differ diff --git a/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.map b/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.map index 3744083b..9790936d 100644 --- a/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.map +++ b/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.map @@ -1,5 +1,6 @@ - - + + + diff --git a/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.png b/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.png index 82e4027d..a6e367c2 100644 Binary files a/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.png and b/docs/namespacezen_1_1util_ae654fd97afaaac2c3dd25dd18111385a_icgraph.png differ diff --git a/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.map b/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.map index 02e378b9..880c9443 100644 --- a/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.map +++ b/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.map @@ -1,5 +1,5 @@ - - - + + + diff --git a/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.png b/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.png index 7e9cc2ae..15569896 100644 Binary files a/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.png and b/docs/namespacezen_aca306dcb6040ec015324d8487c031048_icgraph.png differ diff --git a/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.map b/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.map index 68f7eb1d..385c89e2 100644 --- a/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.map +++ b/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.map @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.png b/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.png index 46486912..b6cca5f3 100644 Binary files a/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.png and b/docs/namespacezen_ae86875e1420651025bb26cc9132d34b4_icgraph.png differ diff --git a/docs/navtree.js b/docs/navtree.js index b0ae95a5..a50b34bd 100644 --- a/docs/navtree.js +++ b/docs/navtree.js @@ -52,6 +52,7 @@ var NAVTREE = [ "Functions", "functions_func.html", "functions_func" ], [ "Variables", "functions_vars.html", null ], [ "Typedefs", "functions_type.html", null ], + [ "Enumerator", "functions_eval.html", null ], [ "Related Functions", "functions_rela.html", null ] ] ] ] ], @@ -74,12 +75,12 @@ var NAVTREE = var NAVTREEINDEX = [ "_allocation-example.html", -"_log_8inl_source.html", -"_window_8cpp.html#a81af93c1ee0952eb0254c259125970f5", -"classzen_1_1gfx_1_1z_window.html#aab385dfc8835efbbb4b605997fb952a9", -"classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc", -"functions_0x6f.html", -"structzen_1_1math_1_1z_vector.html#a4eede96c16b22cc94a13418fbb471998" +"_light_8hpp.html#a22b39898b86d8171befa77c3fd16a10c", +"_vector_8inl.html", +"classzen_1_1gfx_1_1z_scene.html#a21bb49763f47748f0ba0eeee50107311", +"classzen_1_1net_1_1z_socket.html#a8ff0189e585fdbe0b1545e315e6b1986", +"dir_83649a668cc514157bc5eeec4c9e3f09.html", +"structzen_1_1evt_1_1key__t.html#ade5446443436a36bea1c945da1f51e84" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/docs/navtreeindex0.js b/docs/navtreeindex0.js index b1ce7434..9e144320 100644 --- a/docs/navtreeindex0.js +++ b/docs/navtreeindex0.js @@ -43,7 +43,7 @@ var NAVTREEINDEX0 = "_button_8hpp.html":[9,0,0,0,0,7,0], "_button_8hpp_source.html":[9,0,0,0,0,7,0], "_collision_test_8cpp.html":[9,0,0,1,11], -"_collision_test_8cpp.html#a8006ac13983b83591702d97d584fc0eb":[9,0,0,1,11,0], +"_collision_test_8cpp.html#a0e663f52efbc8593793d628b4259ce9b":[9,0,0,1,11,0], "_collision_test_8cpp_source.html":[9,0,0,1,11], "_concave_polygon_8cpp.html":[9,0,0,1,5,0], "_concave_polygon_8cpp.html#a2b9c107327c3a130314fb8c9ffa175f8":[9,0,0,1,5,0,0], @@ -231,23 +231,23 @@ var NAVTREEINDEX0 = "_keyboard_8hpp.html#afaafc315b95987fc2b071bcd8f698b81":[9,0,0,0,0,4,2,27], "_keyboard_8hpp_source.html":[9,0,0,0,0,4,2], "_level_8hpp.html":[9,0,0,0,0,8,0], +"_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8a":[9,0,0,0,0,8,0,3], +"_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8aa085bbb81788460fa0339067cc87c5c75":[9,0,0,0,0,8,0,3,1], +"_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8aa88073cc0d7023b0889799817211b0859":[9,0,0,0,0,8,0,3,2], +"_level_8hpp.html#aa2d0cacbcd853d22cc649f6a775aab8aaefeaff06f16214cf788e86a06c8d8c5b":[9,0,0,0,0,8,0,3,0], "_level_8hpp_source.html":[9,0,0,0,0,8,0], "_level_loader_8hpp.html":[9,0,0,0,0,8,1], "_level_loader_8hpp_source.html":[9,0,0,0,0,8,1], +"_level_test_8cpp.html":[9,0,0,1,14], +"_level_test_8cpp.html#a0777b1d05127a4abf7671f3d9b4b4622":[9,0,0,1,14,3], +"_level_test_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97":[9,0,0,1,14,7], +"_level_test_8cpp.html#a70a9344ab32a2cccf328642eeab901ae":[9,0,0,1,14,6], +"_level_test_8cpp.html#a833ae233ed0529bd108096453975af7b":[9,0,0,1,14,2], +"_level_test_8cpp.html#aa59a70e2ff40af3af6c08aafdca8c713":[9,0,0,1,14,5], +"_level_test_8cpp.html#af326d9b4cced6fd44a9f9567dc666014":[9,0,0,1,14,4], +"_level_test_8cpp_source.html":[9,0,0,1,14], "_light_8cpp.html":[9,0,0,1,5,2], "_light_8cpp_source.html":[9,0,0,1,5,2], "_light_8hpp.html":[9,0,0,0,0,6,4], -"_light_8hpp.html#a1f492ee4fab321b85987be8b02a5997d":[9,0,0,0,0,6,4,1], -"_light_8hpp.html#a22b39898b86d8171befa77c3fd16a10c":[9,0,0,0,0,6,4,0], -"_light_8hpp.html#a754448469aed26ac0cd782a899258b3c":[9,0,0,0,0,6,4,2], -"_light_8hpp.html#ad641af1cc674c0ff3af09bde37bd3760":[9,0,0,0,0,6,4,3], -"_light_8hpp_source.html":[9,0,0,0,0,6,4], -"_log_8cpp.html":[9,0,0,1,10,4], -"_log_8cpp_source.html":[9,0,0,1,10,4], -"_log_8hpp.html":[9,0,0,0,0,13,5], -"_log_8hpp.html#a1440131482f75f732766e96479be4b98":[9,0,0,0,0,13,5,0], -"_log_8hpp.html#a465f647e5347c6255cb2355528f55ad2":[9,0,0,0,0,13,5,1], -"_log_8hpp.html#aa0bacf4652d1d93c93180f75dde7de26":[9,0,0,0,0,13,5,2], -"_log_8hpp_source.html":[9,0,0,0,0,13,5], -"_log_8inl.html":[9,0,0,0,0,13,6] +"_light_8hpp.html#a1f492ee4fab321b85987be8b02a5997d":[9,0,0,0,0,6,4,1] }; diff --git a/docs/navtreeindex1.js b/docs/navtreeindex1.js index 2227dfa8..9e1aa112 100644 --- a/docs/navtreeindex1.js +++ b/docs/navtreeindex1.js @@ -1,5 +1,17 @@ var NAVTREEINDEX1 = { +"_light_8hpp.html#a22b39898b86d8171befa77c3fd16a10c":[9,0,0,0,0,6,4,0], +"_light_8hpp.html#a754448469aed26ac0cd782a899258b3c":[9,0,0,0,0,6,4,2], +"_light_8hpp.html#ad641af1cc674c0ff3af09bde37bd3760":[9,0,0,0,0,6,4,3], +"_light_8hpp_source.html":[9,0,0,0,0,6,4], +"_log_8cpp.html":[9,0,0,1,10,4], +"_log_8cpp_source.html":[9,0,0,1,10,4], +"_log_8hpp.html":[9,0,0,0,0,13,5], +"_log_8hpp.html#a1440131482f75f732766e96479be4b98":[9,0,0,0,0,13,5,0], +"_log_8hpp.html#a465f647e5347c6255cb2355528f55ad2":[9,0,0,0,0,13,5,1], +"_log_8hpp.html#aa0bacf4652d1d93c93180f75dde7de26":[9,0,0,0,0,13,5,2], +"_log_8hpp_source.html":[9,0,0,0,0,13,5], +"_log_8inl.html":[9,0,0,0,0,13,6], "_log_8inl_source.html":[9,0,0,0,0,13,6], "_logging-example.html":[10,3], "_material_8cpp.html":[9,0,0,1,5,3], @@ -75,35 +87,35 @@ var NAVTREEINDEX1 = "_polygon_8hpp.html#a3112ae30d7f3f81f60f61c3fa56a69f2":[9,0,0,0,0,6,6,0], "_polygon_8hpp_source.html":[9,0,0,0,0,6,6], "_polygons-example.html":[10,5], -"_pong_8cpp.html":[9,0,0,1,14], -"_pong_8cpp.html#a05b25dc9afee78bc28be5ed318874aee":[9,0,0,1,14,11], -"_pong_8cpp.html#a195881a23f1c443d163fab13cefd338f":[9,0,0,1,14,1], -"_pong_8cpp.html#a232e48cb66000f2afe8774ea9c30b480":[9,0,0,1,14,3], -"_pong_8cpp.html#a32d98163424b51c5d9d7576b55266bdf":[8,0,1,2], -"_pong_8cpp.html#a369ca9c65c8d96d97c55a4b151f87ba7":[8,0,1,3], -"_pong_8cpp.html#a4421d0c0b5dd0243a7655d9d73b734eb":[8,0,1,4], -"_pong_8cpp.html#a5b10b66252707bc1a2af033fedb13daa":[9,0,0,1,14,7], -"_pong_8cpp.html#a637c70a19336d9c6a75c3b3891e2b334":[9,0,0,1,14,6], -"_pong_8cpp.html#a6f341495c32e1c9c4cca59d84b85a94c":[9,0,0,1,14,4], -"_pong_8cpp.html#a770cc5852d04f70d2a03bd76e10eaeb8":[8,0,1,0], -"_pong_8cpp.html#a820fea2a5356fb4906694179880791a4":[9,0,0,1,14,10], -"_pong_8cpp.html#a98a1b5ac138d1987c46cd622078b22a1":[9,0,0,1,14,5], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155":[9,0,0,1,14,2], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a09a08bfb646254a7eac2cc0cdd22efc1":[9,0,0,1,14,2,7], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a274ccef15a21e829d03293a6fd1974f3":[9,0,0,1,14,2,9], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a5f241c8c8f985b3c51e05d39cf030f4c":[9,0,0,1,14,2,8], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a5f4cef4eeeaf2b7e1ebba036b623b3c8":[9,0,0,1,14,2,6], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a696b031073e74bf2cb98e5ef201d4aa3":[9,0,0,1,14,2,0], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a8b058feb48ad4f0db9c51b355fe6c299":[9,0,0,1,14,2,2], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155aa6fa1cdf9c1a71978751b35b88763f8f":[9,0,0,1,14,2,4], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155acef73b6a633afacda6884757c7c51504":[9,0,0,1,14,2,3], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155ad6e277d8e287c36e85ae7b80928338e2":[9,0,0,1,14,2,1], -"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155ae07ff41a486c27c095a15898dcca34d1":[9,0,0,1,14,2,5], -"_pong_8cpp.html#ac0c8980c0a2f69266305e18f72fa6901":[8,0,1,1], -"_pong_8cpp.html#ae2d1697fd03b28bff8fb7a35ded43576":[9,0,0,1,14,9], -"_pong_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4":[9,0,0,1,14,8], -"_pong_8cpp.html#struct_pong_packet":[8,0,1], -"_pong_8cpp_source.html":[9,0,0,1,14], +"_pong_8cpp.html":[9,0,0,1,15], +"_pong_8cpp.html#a05b25dc9afee78bc28be5ed318874aee":[9,0,0,1,15,11], +"_pong_8cpp.html#a195881a23f1c443d163fab13cefd338f":[9,0,0,1,15,1], +"_pong_8cpp.html#a232e48cb66000f2afe8774ea9c30b480":[9,0,0,1,15,3], +"_pong_8cpp.html#a32d98163424b51c5d9d7576b55266bdf":[8,0,3,2], +"_pong_8cpp.html#a369ca9c65c8d96d97c55a4b151f87ba7":[8,0,3,3], +"_pong_8cpp.html#a4421d0c0b5dd0243a7655d9d73b734eb":[8,0,3,4], +"_pong_8cpp.html#a5b10b66252707bc1a2af033fedb13daa":[9,0,0,1,15,7], +"_pong_8cpp.html#a637c70a19336d9c6a75c3b3891e2b334":[9,0,0,1,15,6], +"_pong_8cpp.html#a6f341495c32e1c9c4cca59d84b85a94c":[9,0,0,1,15,4], +"_pong_8cpp.html#a770cc5852d04f70d2a03bd76e10eaeb8":[8,0,3,0], +"_pong_8cpp.html#a8006ac13983b83591702d97d584fc0eb":[9,0,0,1,15,8], +"_pong_8cpp.html#a820fea2a5356fb4906694179880791a4":[9,0,0,1,15,10], +"_pong_8cpp.html#a98a1b5ac138d1987c46cd622078b22a1":[9,0,0,1,15,5], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155":[9,0,0,1,15,2], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a09a08bfb646254a7eac2cc0cdd22efc1":[9,0,0,1,15,2,7], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a274ccef15a21e829d03293a6fd1974f3":[9,0,0,1,15,2,9], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a5f241c8c8f985b3c51e05d39cf030f4c":[9,0,0,1,15,2,8], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a5f4cef4eeeaf2b7e1ebba036b623b3c8":[9,0,0,1,15,2,6], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a696b031073e74bf2cb98e5ef201d4aa3":[9,0,0,1,15,2,0], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a8b058feb48ad4f0db9c51b355fe6c299":[9,0,0,1,15,2,2], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155aa6fa1cdf9c1a71978751b35b88763f8f":[9,0,0,1,15,2,4], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155acef73b6a633afacda6884757c7c51504":[9,0,0,1,15,2,3], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155ad6e277d8e287c36e85ae7b80928338e2":[9,0,0,1,15,2,1], +"_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155ae07ff41a486c27c095a15898dcca34d1":[9,0,0,1,15,2,5], +"_pong_8cpp.html#ac0c8980c0a2f69266305e18f72fa6901":[8,0,3,1], +"_pong_8cpp.html#ae2d1697fd03b28bff8fb7a35ded43576":[9,0,0,1,15,9], +"_pong_8cpp.html#struct_pong_packet":[8,0,3], +"_pong_8cpp_source.html":[9,0,0,1,15], "_quad_8cpp.html":[9,0,0,1,5,5], "_quad_8cpp_source.html":[9,0,0,1,5,5], "_quad_8hpp.html":[9,0,0,0,0,6,7], @@ -169,30 +181,31 @@ var NAVTREEINDEX1 = "_shapes_8cpp.html":[9,0,0,1,7,2], "_shapes_8cpp_source.html":[9,0,0,1,7,2], "_shapes_8hpp.html":[9,0,0,0,0,9,4], -"_shapes_8hpp.html#a1d4ffb053acae9b90121f0d9658680f0":[9,0,0,0,0,9,4,8], -"_shapes_8hpp.html#a4f3d40ee0b2ca5a5ea75006260d1dede":[9,0,0,0,0,9,4,9], -"_shapes_8hpp.html#a64218c752dcff51bfa84fbe3d3b52d66":[9,0,0,0,0,9,4,7], -"_shapes_8hpp.html#a7c7f261f6eceee12104089778b1e342b":[9,0,0,0,0,9,4,6], -"_shapes_8hpp.html#abda8e557abe05d9768b9da6f8470ebe5":[9,0,0,0,0,9,4,4], -"_shapes_8hpp.html#ad5c361b3d7be88928e486f6b04b37ec7":[9,0,0,0,0,9,4,3], -"_shapes_8hpp.html#ae3df27df54d004f888b10187fe1c3077":[9,0,0,0,0,9,4,5], +"_shapes_8hpp.html#a1d4ffb053acae9b90121f0d9658680f0":[9,0,0,0,0,9,4,9], +"_shapes_8hpp.html#a36b4f55da484ea4e79631cc4bdd24cd2":[9,0,0,0,0,9,4,7], +"_shapes_8hpp.html#a4f3d40ee0b2ca5a5ea75006260d1dede":[9,0,0,0,0,9,4,10], +"_shapes_8hpp.html#a64218c752dcff51bfa84fbe3d3b52d66":[9,0,0,0,0,9,4,8], +"_shapes_8hpp.html#a96d8397d0fc2cc7a832a4b1e2f427e41":[9,0,0,0,0,9,4,6], +"_shapes_8hpp.html#abda8e557abe05d9768b9da6f8470ebe5":[9,0,0,0,0,9,4,5], +"_shapes_8hpp.html#ad5c361b3d7be88928e486f6b04b37ec7":[9,0,0,0,0,9,4,4], "_shapes_8hpp_source.html":[9,0,0,0,0,9,4], "_socket_8cpp.html":[9,0,0,1,8,0], "_socket_8cpp_source.html":[9,0,0,1,8,0], "_socket_8hpp.html":[9,0,0,0,0,10,0], -"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6b":[9,0,0,0,0,10,0,4], -"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6ba633d6abff0a3fc22404347728d195059":[9,0,0,0,0,10,0,4,2], -"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6bab136ef5f6a01d816991fe3cf7a6ac763":[9,0,0,0,0,10,0,4,0], -"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6baf5ef036b4d8b630721e51fe23489fbc9":[9,0,0,0,0,10,0,4,1], -"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18":[9,0,0,0,0,10,0,2], -"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18a5e4e888312c06d9457e6f40e9692453a":[9,0,0,0,0,10,0,2,0], -"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18af1a3fd0f7869e515dd2903e3d528a73e":[9,0,0,0,0,10,0,2,1], -"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18afcbc09abe01d689e657046c70710ca8e":[9,0,0,0,0,10,0,2,2], -"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267":[9,0,0,0,0,10,0,3], -"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267a115499a2d2c573658c6965620707abda":[9,0,0,0,0,10,0,3,2], -"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267a521042eea2807dffbd65bead5361d244":[9,0,0,0,0,10,0,3,3], -"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267a6715600bff264eb515f483e5a970d45d":[9,0,0,0,0,10,0,3,0], -"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267ada3de17abedf3e4b466a9d361ad96b6a":[9,0,0,0,0,10,0,3,1], +"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6b":[9,0,0,0,0,10,0,5], +"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6ba633d6abff0a3fc22404347728d195059":[9,0,0,0,0,10,0,5,2], +"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6bab136ef5f6a01d816991fe3cf7a6ac763":[9,0,0,0,0,10,0,5,0], +"_socket_8hpp.html#a15c79f474590b8e2bc0f5b34dbf99b6baf5ef036b4d8b630721e51fe23489fbc9":[9,0,0,0,0,10,0,5,1], +"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18":[9,0,0,0,0,10,0,3], +"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18a5e4e888312c06d9457e6f40e9692453a":[9,0,0,0,0,10,0,3,0], +"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18af1a3fd0f7869e515dd2903e3d528a73e":[9,0,0,0,0,10,0,3,1], +"_socket_8hpp.html#a33ebebe7a4cced99e9948d626fc57e18afcbc09abe01d689e657046c70710ca8e":[9,0,0,0,0,10,0,3,2], +"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267":[9,0,0,0,0,10,0,4], +"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267a115499a2d2c573658c6965620707abda":[9,0,0,0,0,10,0,4,2], +"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267a521042eea2807dffbd65bead5361d244":[9,0,0,0,0,10,0,4,3], +"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267a6715600bff264eb515f483e5a970d45d":[9,0,0,0,0,10,0,4,0], +"_socket_8hpp.html#a4bdae0e6c878054092dd6763ed62c267ada3de17abedf3e4b466a9d361ad96b6a":[9,0,0,0,0,10,0,4,1], +"_socket_8hpp.html#a911b6c81a3eca360b97dac64e3ee7fb9":[9,0,0,0,0,10,0,2], "_socket_8hpp_source.html":[9,0,0,0,0,10,0], "_sockets-example.html":[10,9], "_sorter_8cpp.html":[9,0,0,1,3,4], @@ -236,18 +249,5 @@ var NAVTREEINDEX1 = "_vector_8hpp.html#a71c569ab11cd6b1c7cb3ac90c20c79fb":[9,0,0,0,0,9,5,2], "_vector_8hpp.html#acb51fd6be4774f4ca9c580f69df0447b":[9,0,0,0,0,9,5,4], "_vector_8hpp.html#ade1d05c8acb460fc5fa322f41602fa93":[9,0,0,0,0,9,5,3], -"_vector_8hpp_source.html":[9,0,0,0,0,9,5], -"_vector_8inl.html":[9,0,0,0,0,9,6], -"_vector_8inl.html#a31292d7a37056f7bd56fbd5e7f6531d7":[9,0,0,0,0,9,6,1], -"_vector_8inl.html#a918377331bb4fc4ddf8aef82e130b812":[9,0,0,0,0,9,6,0], -"_vector_8inl_source.html":[9,0,0,0,0,9,6], -"_vertex_array-example.html":[10,12], -"_vertex_array_8cpp.html":[9,0,0,1,3,6], -"_vertex_array_8cpp_source.html":[9,0,0,1,3,6], -"_vertex_array_8hpp.html":[9,0,0,0,0,3,8], -"_vertex_array_8hpp.html#a328c12f24524e9a7224bd8a33810a1e8":[9,0,0,0,0,3,8,3], -"_vertex_array_8hpp.html#a3ceaac2530cd950ed97a4bb6f2e42c5e":[9,0,0,0,0,3,8,2], -"_vertex_array_8hpp.html#ga7359d9b6b9dfd56a112725d085aa2f53":[9,0,0,0,0,3,8,1], -"_vertex_array_8hpp_source.html":[9,0,0,0,0,3,8], -"_window_8cpp.html":[9,0,0,1,5,8] +"_vector_8hpp_source.html":[9,0,0,0,0,9,5] }; diff --git a/docs/navtreeindex2.js b/docs/navtreeindex2.js index 64ec0f2a..8bf5800e 100644 --- a/docs/navtreeindex2.js +++ b/docs/navtreeindex2.js @@ -1,5 +1,18 @@ var NAVTREEINDEX2 = { +"_vector_8inl.html":[9,0,0,0,0,9,6], +"_vector_8inl.html#a31292d7a37056f7bd56fbd5e7f6531d7":[9,0,0,0,0,9,6,1], +"_vector_8inl.html#a918377331bb4fc4ddf8aef82e130b812":[9,0,0,0,0,9,6,0], +"_vector_8inl_source.html":[9,0,0,0,0,9,6], +"_vertex_array-example.html":[10,12], +"_vertex_array_8cpp.html":[9,0,0,1,3,6], +"_vertex_array_8cpp_source.html":[9,0,0,1,3,6], +"_vertex_array_8hpp.html":[9,0,0,0,0,3,8], +"_vertex_array_8hpp.html#a328c12f24524e9a7224bd8a33810a1e8":[9,0,0,0,0,3,8,3], +"_vertex_array_8hpp.html#a3ceaac2530cd950ed97a4bb6f2e42c5e":[9,0,0,0,0,3,8,2], +"_vertex_array_8hpp.html#ga7359d9b6b9dfd56a112725d085aa2f53":[9,0,0,0,0,3,8,1], +"_vertex_array_8hpp_source.html":[9,0,0,0,0,3,8], +"_window_8cpp.html":[9,0,0,1,5,8], "_window_8cpp.html#a81af93c1ee0952eb0254c259125970f5":[9,0,0,1,5,8,0], "_window_8cpp.html#aeae8c3bbe97eb9a2c33b381c08c2a5ac":[9,0,0,1,5,8,1], "_window_8cpp_source.html":[9,0,0,1,5,8], @@ -13,14 +26,30 @@ var NAVTREEINDEX2 = "_x_m_l_parser_8hpp.html#a4677b5108726366018e20df6ac02844e":[9,0,0,0,0,13,11,3], "_x_m_l_parser_8hpp.html#acc81bb1b24b5f77e257ed0df7e08403d":[9,0,0,0,0,13,11,2], "_x_m_l_parser_8hpp_source.html":[9,0,0,0,0,13,11], -"_zenderer_8cpp.html":[9,0,0,1,15], -"_zenderer_8cpp_source.html":[9,0,0,1,15], +"_zenderer_8cpp.html":[9,0,0,1,16], +"_zenderer_8cpp_source.html":[9,0,0,1,16], "_zenderer_8hpp.html":[9,0,0,0,0,14], "_zenderer_8hpp.html#aca306dcb6040ec015324d8487c031048":[9,0,0,0,0,14,1], "_zenderer_8hpp.html#ae86875e1420651025bb26cc9132d34b4":[9,0,0,0,0,14,0], "_zenderer_8hpp_source.html":[9,0,0,0,0,14], "annotated.html":[8,0], "classes.html":[8,1], +"classg_bullet.html":[8,0,1], +"classg_bullet.html#a40c02599fddd70e6a7589275bd044e6a":[8,0,1,6], +"classg_bullet.html#a42a81cc48419d52e17d3a7b68ebc3f6a":[8,0,1,1], +"classg_bullet.html#a494c1047a643846d40f577bccb7bf773":[8,0,1,5], +"classg_bullet.html#a635a3488c596cf55141d416491fa44c4":[8,0,1,7], +"classg_bullet.html#a910af94772488e88054a93143aaccdb8":[8,0,1,4], +"classg_bullet.html#a99b2ce1395234c6d9b8b0c979d541084":[8,0,1,2], +"classg_bullet.html#ab1c1f6e32fc563c7fd13497387da1b6d":[8,0,1,3], +"classg_bullet.html#ace82350a968fa10022480fd362599f19":[8,0,1,0], +"classg_world.html":[8,0,2], +"classg_world.html#a49e59b401c95d16de2f2db26450d0ebf":[8,0,2,2], +"classg_world.html#a78e9f746cacd05afee871bea685b78c7":[8,0,2,3], +"classg_world.html#a8e50f4061f1f06919147b589c7e1a679":[8,0,2,1], +"classg_world.html#a91c2f296e6096c352eee81e10e2e6b4a":[8,0,2,0], +"classg_world.html#aa7665b4e000c72b337b6db1abd03097f":[8,0,2,5], +"classg_world.html#aa9ee395a82e26050fe1c39c542d264e2":[8,0,2,4], "classzen_1_1asset_1_1z_asset.html":[6,0,1], "classzen_1_1asset_1_1z_asset.html#a23948cdca1812c8fc2bed8a5bf3067e2":[6,0,1,11], "classzen_1_1asset_1_1z_asset.html#a272c6b1163fad9b7aa5df9192ab862dc":[6,0,1,13], @@ -77,9 +106,9 @@ var NAVTREEINDEX2 = "classzen_1_1evt_1_1z_event_handler.html#aa31fa6c30c9b57a2ac6ab1606ca02797":[6,4,1,2], "classzen_1_1evt_1_1z_event_handler.html#af1d2cf0a6e08e88986c88cf5ecabd613":[6,4,1,8], "classzen_1_1gfx_1_1z_concave_polygon.html":[6,6,1], -"classzen_1_1gfx_1_1z_concave_polygon.html#a10251b694ecba0fb2ec99fe53c05f79d":[6,6,1,2], "classzen_1_1gfx_1_1z_concave_polygon.html#a595421bc42e6ba537614c12d1a4ab371":[6,6,1,0], "classzen_1_1gfx_1_1z_concave_polygon.html#a63c8d13eb8b8983eeb0ca1912b38e889":[6,6,1,1], +"classzen_1_1gfx_1_1z_concave_polygon.html#ab9a368fae6346609c591204180b5ed04":[6,6,1,2], "classzen_1_1gfx_1_1z_effect.html":[6,6,2], "classzen_1_1gfx_1_1z_effect.html#a041c9497274cfbdf3f582b79018d255b":[6,6,2,1], "classzen_1_1gfx_1_1z_effect.html#a41984ac2a64d8bcb7d83a427f0806dd4":[6,6,2,4], @@ -144,55 +173,58 @@ var NAVTREEINDEX2 = "classzen_1_1gfx_1_1z_material.html#af84a61503a11b2cf804488ba25d88b82":[6,6,4,18], "classzen_1_1gfx_1_1z_material.html#afcc38d69492914de07023fdeb680cfa9":[6,6,4,13], "classzen_1_1gfx_1_1z_polygon.html":[6,6,5], -"classzen_1_1gfx_1_1z_polygon.html#a026724ee199a2350542cda402d981a25":[6,6,5,31], +"classzen_1_1gfx_1_1z_polygon.html#a026724ee199a2350542cda402d981a25":[6,6,5,34], +"classzen_1_1gfx_1_1z_polygon.html#a05f999895093561101c8016f43f2a464":[6,6,5,13], "classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3":[6,6,5,15], -"classzen_1_1gfx_1_1z_polygon.html#a1952d1ddbb16cae0816d03a4c284f5d6":[6,6,5,26], +"classzen_1_1gfx_1_1z_polygon.html#a1955ad2231b3b46bbf4f4e2408be3c62":[6,6,5,5], "classzen_1_1gfx_1_1z_polygon.html#a1e58cf0134e0693790713f7791f2d736":[6,6,5,9], -"classzen_1_1gfx_1_1z_polygon.html#a232d4b4224a1cc30f34c6a56f4d1e1a7":[6,6,5,19], -"classzen_1_1gfx_1_1z_polygon.html#a25865c535603d9bb9e3b39dbd60e1612":[6,6,5,30], -"classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe":[6,6,5,20], -"classzen_1_1gfx_1_1z_polygon.html#a3574b7e895e99b3aba9352083b86e36b":[6,6,5,13], -"classzen_1_1gfx_1_1z_polygon.html#a38b0280a87655f4d99e5168cc9feadd1":[6,6,5,34], -"classzen_1_1gfx_1_1z_polygon.html#a3fad6b6af1a44dac05b4cecb9bfdc31d":[6,6,5,25], +"classzen_1_1gfx_1_1z_polygon.html#a232d4b4224a1cc30f34c6a56f4d1e1a7":[6,6,5,20], +"classzen_1_1gfx_1_1z_polygon.html#a23ad8a42c4b82114209ee864c5be873e":[6,6,5,16], +"classzen_1_1gfx_1_1z_polygon.html#a25865c535603d9bb9e3b39dbd60e1612":[6,6,5,33], +"classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe":[6,6,5,21], +"classzen_1_1gfx_1_1z_polygon.html#a38b0280a87655f4d99e5168cc9feadd1":[6,6,5,37], "classzen_1_1gfx_1_1z_polygon.html#a40ae71e4df1b6fe15500d1367d749193":[6,6,5,6], -"classzen_1_1gfx_1_1z_polygon.html#a429c80360298608d83c56c74bae31e22":[6,6,5,23], -"classzen_1_1gfx_1_1z_polygon.html#a54a92a7768eafb28d57909f4313223bc":[6,6,5,28], -"classzen_1_1gfx_1_1z_polygon.html#a55d204431680f82b0016e5b290c25ccf":[6,6,5,24], -"classzen_1_1gfx_1_1z_polygon.html#a628b8c9b7ac1e7813faebe12c1a1b6db":[6,6,5,35], +"classzen_1_1gfx_1_1z_polygon.html#a429c80360298608d83c56c74bae31e22":[6,6,5,26], +"classzen_1_1gfx_1_1z_polygon.html#a445f57a850cd65629ba96595172d2ef4":[6,6,5,12], +"classzen_1_1gfx_1_1z_polygon.html#a44b2721ed65c2e2fb2b5391b4397ae9b":[6,6,5,24], +"classzen_1_1gfx_1_1z_polygon.html#a54a92a7768eafb28d57909f4313223bc":[6,6,5,31], +"classzen_1_1gfx_1_1z_polygon.html#a55d204431680f82b0016e5b290c25ccf":[6,6,5,27], +"classzen_1_1gfx_1_1z_polygon.html#a5d5880fa1e14f9b5622db4ef4322d1db":[6,6,5,29], +"classzen_1_1gfx_1_1z_polygon.html#a628b8c9b7ac1e7813faebe12c1a1b6db":[6,6,5,38], "classzen_1_1gfx_1_1z_polygon.html#a631f77c20d84f47ebebe768a405b5bf3":[6,6,5,7], "classzen_1_1gfx_1_1z_polygon.html#a671a04f2358287c3d03d5f296bf5077b":[6,6,5,2], "classzen_1_1gfx_1_1z_polygon.html#a679c54a2052d619caea511cdc1ce4e80":[6,6,5,8], "classzen_1_1gfx_1_1z_polygon.html#a67d8f5337c96b0ece89b582ef93115bc":[6,6,5,1], -"classzen_1_1gfx_1_1z_polygon.html#a6db564afe02fd3c10079cf3003d2bfd5":[6,6,5,36], -"classzen_1_1gfx_1_1z_polygon.html#a7cd1ed28b12be147b3567325035588ab":[6,6,5,12], +"classzen_1_1gfx_1_1z_polygon.html#a6db564afe02fd3c10079cf3003d2bfd5":[6,6,5,39], "classzen_1_1gfx_1_1z_polygon.html#a8477362b059957c20edb7dfe4ff04fd9":[6,6,5,11], -"classzen_1_1gfx_1_1z_polygon.html#a8f19764a95eab8010a529652d484635d":[6,6,5,21], -"classzen_1_1gfx_1_1z_polygon.html#a9b180bef3c8c36a7a17ec057f0bb3d2a":[6,6,5,32], -"classzen_1_1gfx_1_1z_polygon.html#aa2df331795d72f7554bba150831c332a":[6,6,5,29], -"classzen_1_1gfx_1_1z_polygon.html#aabb3fd590b40851176dcbc81edc10b47":[6,6,5,18], -"classzen_1_1gfx_1_1z_polygon.html#aaed8a4e7e4232d9a2f64032676995778":[6,6,5,16], +"classzen_1_1gfx_1_1z_polygon.html#a8f19764a95eab8010a529652d484635d":[6,6,5,22], +"classzen_1_1gfx_1_1z_polygon.html#a9b180bef3c8c36a7a17ec057f0bb3d2a":[6,6,5,35], +"classzen_1_1gfx_1_1z_polygon.html#aa2df331795d72f7554bba150831c332a":[6,6,5,32], +"classzen_1_1gfx_1_1z_polygon.html#aabb3fd590b40851176dcbc81edc10b47":[6,6,5,19], +"classzen_1_1gfx_1_1z_polygon.html#aaed8a4e7e4232d9a2f64032676995778":[6,6,5,17], "classzen_1_1gfx_1_1z_polygon.html#ab51b46d8382897edc481d19f1af419ef":[6,6,5,3], "classzen_1_1gfx_1_1z_polygon.html#ab7fb29249ab405cc610bb5e451397fea":[6,6,5,10], -"classzen_1_1gfx_1_1z_polygon.html#ac9df030c2f41e4454a7b6d260e0fd21a":[6,6,5,5], "classzen_1_1gfx_1_1z_polygon.html#ad399aace730d7c326ad6cae7522c2c7b":[6,6,5,0], "classzen_1_1gfx_1_1z_polygon.html#ad40c6155bf17ce17ebb5f3e95266820e":[6,6,5,4], -"classzen_1_1gfx_1_1z_polygon.html#ad957c880eed742790fb244ddf42c54d6":[6,6,5,27], -"classzen_1_1gfx_1_1z_polygon.html#ad9810bdc85ac5ccb72b0e07880b075b7":[6,6,5,22], -"classzen_1_1gfx_1_1z_polygon.html#ade8d718f4392ea6f7d36563363d667db":[6,6,5,17], -"classzen_1_1gfx_1_1z_polygon.html#ae7dd5ab3b431f88608ecdeb397b30726":[6,6,5,33], +"classzen_1_1gfx_1_1z_polygon.html#ad957c880eed742790fb244ddf42c54d6":[6,6,5,30], +"classzen_1_1gfx_1_1z_polygon.html#ad9810bdc85ac5ccb72b0e07880b075b7":[6,6,5,23], +"classzen_1_1gfx_1_1z_polygon.html#adc5878f6c1cb869b6e5ed4ba8911bd62":[6,6,5,25], +"classzen_1_1gfx_1_1z_polygon.html#ade8d718f4392ea6f7d36563363d667db":[6,6,5,18], +"classzen_1_1gfx_1_1z_polygon.html#ae7dd5ab3b431f88608ecdeb397b30726":[6,6,5,36], "classzen_1_1gfx_1_1z_polygon.html#ae812840875c700f99062aa1c34fe9a4f":[6,6,5,14], +"classzen_1_1gfx_1_1z_polygon.html#ae9034f5809ff965852ae22fa4d869b19":[6,6,5,28], "classzen_1_1gfx_1_1z_quad.html":[6,6,6], "classzen_1_1gfx_1_1z_quad.html#a2461053b411db584b9c3dd40364cdff2":[6,6,6,11], "classzen_1_1gfx_1_1z_quad.html#a432e755f175068c7e354053a37ac2365":[6,6,6,10], "classzen_1_1gfx_1_1z_quad.html#a5867cc5adb72ebb4b58718141db0f3bf":[6,6,6,3], -"classzen_1_1gfx_1_1z_quad.html#a5eb84d8851c72de252ee06a302d45e07":[6,6,6,7], +"classzen_1_1gfx_1_1z_quad.html#a5f5ed27f47eb430f1bc36eb6b046b04a":[6,6,6,7], "classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04":[6,6,6,9], +"classzen_1_1gfx_1_1z_quad.html#a67eeed3aa34f859af6f017bd081c4f4d":[6,6,6,8], "classzen_1_1gfx_1_1z_quad.html#a683d7e953f5018c035009a09bdbac4a7":[6,6,6,1], +"classzen_1_1gfx_1_1z_quad.html#a6ba50baedb76b9e4b966b9a3fa0333f4":[6,6,6,4], "classzen_1_1gfx_1_1z_quad.html#a6d50f5678187a56ba068cb04d96a5321":[6,6,6,2], -"classzen_1_1gfx_1_1z_quad.html#a8eaf715d98a3a11a202ad73f0f7e356d":[6,6,6,4], "classzen_1_1gfx_1_1z_quad.html#a953ae3f089d393c01b0e5acc58e0839e":[6,6,6,0], "classzen_1_1gfx_1_1z_quad.html#aa18ef578cfc4552effe995fa42e7ce59":[6,6,6,5], -"classzen_1_1gfx_1_1z_quad.html#ab47b202f4549acb2c691fad8199d45e7":[6,6,6,8], "classzen_1_1gfx_1_1z_quad.html#aecfed1edd9f86fdd22522ac869cae5a2":[6,6,6,6], "classzen_1_1gfx_1_1z_render_target.html":[6,6,7], "classzen_1_1gfx_1_1z_render_target.html#a06f5dba74fd295294e0e3528762265e7":[6,6,7,7], @@ -211,43 +243,11 @@ var NAVTREEINDEX2 = "classzen_1_1gfx_1_1z_render_target.html#ac33b26455487a4c2806149c992dd794b":[6,6,7,3], "classzen_1_1gfx_1_1z_render_target.html#ae0cda2660f0cefefd78df4b7ed8da01a":[6,6,7,6], "classzen_1_1gfx_1_1z_scene.html":[6,6,8], -"classzen_1_1gfx_1_1z_scene.html#a04fa7755a3bd91522d790a9fd206c967":[6,6,8,18], -"classzen_1_1gfx_1_1z_scene.html#a0a183be6fd9991d755849081c0511fb6":[6,6,8,22], +"classzen_1_1gfx_1_1z_scene.html#a04fa7755a3bd91522d790a9fd206c967":[6,6,8,20], +"classzen_1_1gfx_1_1z_scene.html#a0a183be6fd9991d755849081c0511fb6":[6,6,8,24], "classzen_1_1gfx_1_1z_scene.html#a1bbf433276d81e44483178df55a48843":[6,6,8,4], "classzen_1_1gfx_1_1z_scene.html#a1d1fd82ff263bde9632eaba2121f1f0b":[6,6,8,5], "classzen_1_1gfx_1_1z_scene.html#a1da8d9bef43e37b34a302faa35a986ba":[6,6,8,9], "classzen_1_1gfx_1_1z_scene.html#a20048957053138cc366344e16c614561":[6,6,8,10], -"classzen_1_1gfx_1_1z_scene.html#a2085559f18f301a068cb17563907bfea":[6,6,8,17], -"classzen_1_1gfx_1_1z_scene.html#a21bb49763f47748f0ba0eeee50107311":[6,6,8,25], -"classzen_1_1gfx_1_1z_scene.html#a21ddf27dc9fce17f73938184c37f77c2":[6,6,8,6], -"classzen_1_1gfx_1_1z_scene.html#a23003a267b5fc11dc8a59b65d0a3d800":[6,6,8,3], -"classzen_1_1gfx_1_1z_scene.html#a248965d615fe44c127b2a3f38d32b128":[6,6,8,19], -"classzen_1_1gfx_1_1z_scene.html#a3a24abd92b700d27e4f07ecfbdcaae2f":[6,6,8,1], -"classzen_1_1gfx_1_1z_scene.html#a43f9afebcf570907ba46648bed86c599":[6,6,8,20], -"classzen_1_1gfx_1_1z_scene.html#a4d1093c4a1572676f2465decfcd61f10":[6,6,8,7], -"classzen_1_1gfx_1_1z_scene.html#a7786082bd291405b9db93956a5aa849e":[6,6,8,2], -"classzen_1_1gfx_1_1z_scene.html#a894be27d94edac743016a8db6af64e6b":[6,6,8,16], -"classzen_1_1gfx_1_1z_scene.html#a9b6516532f8ea17083974643ffe3e188":[6,6,8,23], -"classzen_1_1gfx_1_1z_scene.html#aaca5f1d276abf91a593632200f8b8dc3":[6,6,8,0], -"classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1":[6,6,8,13], -"classzen_1_1gfx_1_1z_scene.html#ad3636d08d2f1492469b8af350d0b6062":[6,6,8,11], -"classzen_1_1gfx_1_1z_scene.html#ad38c58aba5fc0fd4c5d6db43a6befa6b":[6,6,8,14], -"classzen_1_1gfx_1_1z_scene.html#adc73d17a4d7ac30dad9ee5f5de77de06":[6,6,8,21], -"classzen_1_1gfx_1_1z_scene.html#af6845c571c20107f4258ec66da0b2f65":[6,6,8,24], -"classzen_1_1gfx_1_1z_scene.html#af6b595895bdc0cfcd832435f714ec3b6":[6,6,8,12], -"classzen_1_1gfx_1_1z_scene.html#afa62919c59db8f3259878930abeca7a2":[6,6,8,15], -"classzen_1_1gfx_1_1z_scene.html#afe9179ffd2a0e19b01e8d7a83b56f5fb":[6,6,8,8], -"classzen_1_1gfx_1_1z_window.html":[6,6,9], -"classzen_1_1gfx_1_1z_window.html#a038cb46b55e0dc76a7fd7c374dc0bf45":[6,6,9,4], -"classzen_1_1gfx_1_1z_window.html#a209b1176b9e7b6ff57956d8faa6886e8":[6,6,9,0], -"classzen_1_1gfx_1_1z_window.html#a3b712bb81a6adca8c6419d3c0bde7568":[6,6,9,7], -"classzen_1_1gfx_1_1z_window.html#a3b76061c6b36212c45101b9b9a2ffa0e":[6,6,9,3], -"classzen_1_1gfx_1_1z_window.html#a3c04896622b89d18359691970d843877":[6,6,9,5], -"classzen_1_1gfx_1_1z_window.html#a3d18497cbf3fc8f8a0231761fbf3bf9e":[6,6,9,12], -"classzen_1_1gfx_1_1z_window.html#a4e18b63bbfc80abe615292e1e5eea72a":[6,6,9,9], -"classzen_1_1gfx_1_1z_window.html#a58c929b8631dbcf8e1d5b25bdec9d181":[6,6,9,1], -"classzen_1_1gfx_1_1z_window.html#a5f087fafc6f8367d16913cfe06b83199":[6,6,9,2], -"classzen_1_1gfx_1_1z_window.html#a689d967f3f24ff0a45d8cbce5ae41090":[6,6,9,8], -"classzen_1_1gfx_1_1z_window.html#a842bda949d45c6cedb9c7eabc090e23f":[6,6,9,17], -"classzen_1_1gfx_1_1z_window.html#a9716300787873b7ff91f3db7af20321f":[6,6,9,16] +"classzen_1_1gfx_1_1z_scene.html#a2085559f18f301a068cb17563907bfea":[6,6,8,19] }; diff --git a/docs/navtreeindex3.js b/docs/navtreeindex3.js index c3fc13cc..af6e17f5 100644 --- a/docs/navtreeindex3.js +++ b/docs/navtreeindex3.js @@ -1,5 +1,39 @@ var NAVTREEINDEX3 = { +"classzen_1_1gfx_1_1z_scene.html#a21bb49763f47748f0ba0eeee50107311":[6,6,8,27], +"classzen_1_1gfx_1_1z_scene.html#a21ddf27dc9fce17f73938184c37f77c2":[6,6,8,6], +"classzen_1_1gfx_1_1z_scene.html#a23003a267b5fc11dc8a59b65d0a3d800":[6,6,8,3], +"classzen_1_1gfx_1_1z_scene.html#a248965d615fe44c127b2a3f38d32b128":[6,6,8,21], +"classzen_1_1gfx_1_1z_scene.html#a3a24abd92b700d27e4f07ecfbdcaae2f":[6,6,8,1], +"classzen_1_1gfx_1_1z_scene.html#a3d15fe6db75f5b1e8190f28b0fda1d5f":[6,6,8,13], +"classzen_1_1gfx_1_1z_scene.html#a43f9afebcf570907ba46648bed86c599":[6,6,8,22], +"classzen_1_1gfx_1_1z_scene.html#a4d1093c4a1572676f2465decfcd61f10":[6,6,8,7], +"classzen_1_1gfx_1_1z_scene.html#a7786082bd291405b9db93956a5aa849e":[6,6,8,2], +"classzen_1_1gfx_1_1z_scene.html#a894be27d94edac743016a8db6af64e6b":[6,6,8,18], +"classzen_1_1gfx_1_1z_scene.html#a9b6516532f8ea17083974643ffe3e188":[6,6,8,25], +"classzen_1_1gfx_1_1z_scene.html#aaca5f1d276abf91a593632200f8b8dc3":[6,6,8,0], +"classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1":[6,6,8,15], +"classzen_1_1gfx_1_1z_scene.html#ace7ecda0222bcc628b4d1e548fbafb7f":[6,6,8,12], +"classzen_1_1gfx_1_1z_scene.html#ad3636d08d2f1492469b8af350d0b6062":[6,6,8,11], +"classzen_1_1gfx_1_1z_scene.html#ad38c58aba5fc0fd4c5d6db43a6befa6b":[6,6,8,16], +"classzen_1_1gfx_1_1z_scene.html#adc73d17a4d7ac30dad9ee5f5de77de06":[6,6,8,23], +"classzen_1_1gfx_1_1z_scene.html#af6845c571c20107f4258ec66da0b2f65":[6,6,8,26], +"classzen_1_1gfx_1_1z_scene.html#af6b595895bdc0cfcd832435f714ec3b6":[6,6,8,14], +"classzen_1_1gfx_1_1z_scene.html#afa62919c59db8f3259878930abeca7a2":[6,6,8,17], +"classzen_1_1gfx_1_1z_scene.html#afe9179ffd2a0e19b01e8d7a83b56f5fb":[6,6,8,8], +"classzen_1_1gfx_1_1z_window.html":[6,6,9], +"classzen_1_1gfx_1_1z_window.html#a038cb46b55e0dc76a7fd7c374dc0bf45":[6,6,9,4], +"classzen_1_1gfx_1_1z_window.html#a209b1176b9e7b6ff57956d8faa6886e8":[6,6,9,0], +"classzen_1_1gfx_1_1z_window.html#a3b712bb81a6adca8c6419d3c0bde7568":[6,6,9,7], +"classzen_1_1gfx_1_1z_window.html#a3b76061c6b36212c45101b9b9a2ffa0e":[6,6,9,3], +"classzen_1_1gfx_1_1z_window.html#a3c04896622b89d18359691970d843877":[6,6,9,5], +"classzen_1_1gfx_1_1z_window.html#a3d18497cbf3fc8f8a0231761fbf3bf9e":[6,6,9,12], +"classzen_1_1gfx_1_1z_window.html#a4e18b63bbfc80abe615292e1e5eea72a":[6,6,9,9], +"classzen_1_1gfx_1_1z_window.html#a58c929b8631dbcf8e1d5b25bdec9d181":[6,6,9,1], +"classzen_1_1gfx_1_1z_window.html#a5f087fafc6f8367d16913cfe06b83199":[6,6,9,2], +"classzen_1_1gfx_1_1z_window.html#a689d967f3f24ff0a45d8cbce5ae41090":[6,6,9,8], +"classzen_1_1gfx_1_1z_window.html#a842bda949d45c6cedb9c7eabc090e23f":[6,6,9,17], +"classzen_1_1gfx_1_1z_window.html#a9716300787873b7ff91f3db7af20321f":[6,6,9,16], "classzen_1_1gfx_1_1z_window.html#aab385dfc8835efbbb4b605997fb952a9":[6,6,9,19], "classzen_1_1gfx_1_1z_window.html#ab43e8c6d204819da11380772da928561":[6,6,9,6], "classzen_1_1gfx_1_1z_window.html#abcb441d17f9b7bd2f3d1ce72c6e8d356":[6,6,9,10], @@ -134,20 +168,21 @@ var NAVTREEINDEX3 = "classzen_1_1gui_1_1z_button.html#aec51e4c4215268466e6c49b06d33cd86":[6,5,1,10], "classzen_1_1gui_1_1z_button.html#af82c10df023cbfda8b404a0f3d6fcbb3":[6,5,1,4], "classzen_1_1gui_1_1z_font.html":[8,0,0,6,1], -"classzen_1_1gui_1_1z_font.html#a04913d2942bdf76b1732cddd3b37056c":[8,0,0,6,1,13], +"classzen_1_1gui_1_1z_font.html#a04913d2942bdf76b1732cddd3b37056c":[8,0,0,6,1,14], "classzen_1_1gui_1_1z_font.html#a2f9507a44dfa2664a9c3b4aad6ee2f33":[8,0,0,6,1,3], "classzen_1_1gui_1_1z_font.html#a2ff0c9cff415a035b0e38855d7c25cc5":[8,0,0,6,1,2], "classzen_1_1gui_1_1z_font.html#a3a8c98b442728bb8476d37957e03faff":[8,0,0,6,1,6], -"classzen_1_1gui_1_1z_font.html#a3ab8b4e8391ba35b398935bb727ab5f2":[8,0,0,6,1,10], -"classzen_1_1gui_1_1z_font.html#a5aa68ad2c5f6d57b8cfca1d6fcc5db5e":[8,0,0,6,1,14], -"classzen_1_1gui_1_1z_font.html#a75c0aba3263ef5c4e305a1a821c5142b":[8,0,0,6,1,11], +"classzen_1_1gui_1_1z_font.html#a3ab8b4e8391ba35b398935bb727ab5f2":[8,0,0,6,1,11], +"classzen_1_1gui_1_1z_font.html#a5aa68ad2c5f6d57b8cfca1d6fcc5db5e":[8,0,0,6,1,15], +"classzen_1_1gui_1_1z_font.html#a75c0aba3263ef5c4e305a1a821c5142b":[8,0,0,6,1,12], "classzen_1_1gui_1_1z_font.html#a7727aa647d1a37a921cc0b03c20079f9":[8,0,0,6,1,5], "classzen_1_1gui_1_1z_font.html#a7b0b112028e0b914316708e263dac625":[8,0,0,6,1,4], "classzen_1_1gui_1_1z_font.html#a7b62160ec76e8daccc2a199b9fc71777":[8,0,0,6,1,8], -"classzen_1_1gui_1_1z_font.html#a80e2b87420d997b627faab2c41bdc6f1":[8,0,0,6,1,12], +"classzen_1_1gui_1_1z_font.html#a80e2b87420d997b627faab2c41bdc6f1":[8,0,0,6,1,13], "classzen_1_1gui_1_1z_font.html#a84e10b9897cd494d0c20f26cc8bdf856":[8,0,0,6,1,0], "classzen_1_1gui_1_1z_font.html#a8cd1236470fb602bbe20237a8a44398b":[8,0,0,6,1,9], "classzen_1_1gui_1_1z_font.html#a9805153394f3cd01041ccfa51eacc8b9":[8,0,0,6,1,7], +"classzen_1_1gui_1_1z_font.html#aabe8618c807f1830296c293387a07f95":[8,0,0,6,1,10], "classzen_1_1gui_1_1z_font.html#abcae4257f909a7b75e3a6aec488af162":[8,0,0,6,1,1], "classzen_1_1gui_1_1z_font_library.html":[6,5,3], "classzen_1_1gui_1_1z_font_library.html#a1cf14f5723c1975db84691ee7896b3be":[6,5,3,3], @@ -214,40 +249,5 @@ var NAVTREEINDEX3 = "classzen_1_1net_1_1z_socket.html#a4beb617e14e19f25629ceb15a79d2157":[6,9,1,9], "classzen_1_1net_1_1z_socket.html#a57703ef78e748877079de834f05850b8":[6,9,1,7], "classzen_1_1net_1_1z_socket.html#a6677fe8d1b9591753ff19934bca684cb":[6,9,1,1], -"classzen_1_1net_1_1z_socket.html#a84b237af94d765cc8cc150f48b4de853":[6,9,1,0], -"classzen_1_1net_1_1z_socket.html#a8ff0189e585fdbe0b1545e315e6b1986":[6,9,1,3], -"classzen_1_1net_1_1z_socket.html#ae3c8f4c58ab2ca65afe52195e63a36ad":[6,9,1,4], -"classzen_1_1obj_1_1z_animation.html":[8,0,0,5,0], -"classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07":[8,0,0,5,0,7], -"classzen_1_1obj_1_1z_animation.html#a45db59d983ba8e5ff681fe2757f901bc":[8,0,0,5,0,8], -"classzen_1_1obj_1_1z_animation.html#a5e43a113a9b7e662c2fa1f9c3cae3e49":[8,0,0,5,0,1], -"classzen_1_1obj_1_1z_animation.html#a64d58d1759855bbf4d673b1b6ed4c1f6":[8,0,0,5,0,10], -"classzen_1_1obj_1_1z_animation.html#a7622374cda2d6d88bc9e2bcfafb7275b":[8,0,0,5,0,9], -"classzen_1_1obj_1_1z_animation.html#a7d3ef5c8303886c20ab2c38e161e35ed":[8,0,0,5,0,12], -"classzen_1_1obj_1_1z_animation.html#a8d9a58895fbc85d08a940d82eb0c156a":[8,0,0,5,0,2], -"classzen_1_1obj_1_1z_animation.html#a9cf28d26b86a4d2e385818a8ead225e5":[8,0,0,5,0,0], -"classzen_1_1obj_1_1z_animation.html#ab0c8efb8cbd5959143235c46671a2f86":[8,0,0,5,0,11], -"classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063":[8,0,0,5,0,5], -"classzen_1_1obj_1_1z_animation.html#ac435855d325d13b4ae4319d2931223f7":[8,0,0,5,0,4], -"classzen_1_1obj_1_1z_animation.html#adcba40fcbe415c8fc02eeebdc63f63ff":[8,0,0,5,0,3], -"classzen_1_1obj_1_1z_animation.html#af9f2e332f17dbe5bddd6e507549c6dd7":[8,0,0,5,0,6], -"classzen_1_1obj_1_1z_entity.html":[6,10,5], -"classzen_1_1obj_1_1z_entity.html#a06631189f514c4c4d6f86ec2c4180159":[6,10,5,40], -"classzen_1_1obj_1_1z_entity.html#a0a27bfedc1899ec3909f69d7061f7a7f":[6,10,5,5], -"classzen_1_1obj_1_1z_entity.html#a0c09afd745bbde3ee9dcf17e1bf0557b":[6,10,5,21], -"classzen_1_1obj_1_1z_entity.html#a0d08f234b8a4481c4aa776d965812931":[6,10,5,25], -"classzen_1_1obj_1_1z_entity.html#a0fabb7a8eb2c7e4b060fd121dfcbc6ad":[6,10,5,20], -"classzen_1_1obj_1_1z_entity.html#a11dce838f80f098387aed0123eef9208":[6,10,5,14], -"classzen_1_1obj_1_1z_entity.html#a12daa37cf2b47890da2540c5d0997f9b":[6,10,5,2], -"classzen_1_1obj_1_1z_entity.html#a14fa187a69a6c5dba0199d6fdbef8cdb":[6,10,5,36], -"classzen_1_1obj_1_1z_entity.html#a19f6d5563c71ef3fb51e44f33fe830a7":[6,10,5,8], -"classzen_1_1obj_1_1z_entity.html#a1b00bde3276274b582490b9c50430708":[6,10,5,15], -"classzen_1_1obj_1_1z_entity.html#a1c125e6e0c1b2ff3f49ae0149af8557a":[6,10,5,47], -"classzen_1_1obj_1_1z_entity.html#a1e482bcc7d010db11da731eb4ae913ea":[6,10,5,13], -"classzen_1_1obj_1_1z_entity.html#a2ca996948f259af706995c06267a4bb8":[6,10,5,29], -"classzen_1_1obj_1_1z_entity.html#a2cba45d96f6b9f7e2b42d12acbf1353a":[6,10,5,35], -"classzen_1_1obj_1_1z_entity.html#a32d257c18d288407f015d4694fbf8fd1":[6,10,5,45], -"classzen_1_1obj_1_1z_entity.html#a386392e27ecd5ea8832d55bd57a1534c":[6,10,5,37], -"classzen_1_1obj_1_1z_entity.html#a3939c963059737469174625b5ef38248":[6,10,5,41], -"classzen_1_1obj_1_1z_entity.html#a3c201ca568e29bb36c93d19339670e45":[6,10,5,18] +"classzen_1_1net_1_1z_socket.html#a84b237af94d765cc8cc150f48b4de853":[6,9,1,0] }; diff --git a/docs/navtreeindex4.js b/docs/navtreeindex4.js index 97fd16db..d8dfa5e5 100644 --- a/docs/navtreeindex4.js +++ b/docs/navtreeindex4.js @@ -1,36 +1,72 @@ var NAVTREEINDEX4 = { -"classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc":[6,10,5,7], -"classzen_1_1obj_1_1z_entity.html#a449dec82dda90aa7a6dfc40efbcd65a9":[6,10,5,42], -"classzen_1_1obj_1_1z_entity.html#a4a54332aed144c626327fd1e4bb658bb":[6,10,5,48], -"classzen_1_1obj_1_1z_entity.html#a4d107b01ae3550171b060fcd44237f3f":[6,10,5,43], -"classzen_1_1obj_1_1z_entity.html#a53381ea55dc552df56f462bcc03bb84a":[6,10,5,6], -"classzen_1_1obj_1_1z_entity.html#a590c5e0bf98f75a137f537a74181ab54":[6,10,5,9], -"classzen_1_1obj_1_1z_entity.html#a5b134c4828b26cc7129c4d320b47ac73":[6,10,5,1], -"classzen_1_1obj_1_1z_entity.html#a5e45836b1864f010ea57b2540980022a":[6,10,5,17], -"classzen_1_1obj_1_1z_entity.html#a5feabee3a6c74a9cb4c75dff978d4752":[6,10,5,16], -"classzen_1_1obj_1_1z_entity.html#a64b8d1b956f87aff6cb05ad012107fe0":[6,10,5,38], -"classzen_1_1obj_1_1z_entity.html#a656737f613535329c7580156623e957d":[6,10,5,10], -"classzen_1_1obj_1_1z_entity.html#a707b60029a9a9cbe59981022a8b8110b":[6,10,5,34], -"classzen_1_1obj_1_1z_entity.html#a73cfeabce7776b30a3316ac58f9209a3":[6,10,5,24], -"classzen_1_1obj_1_1z_entity.html#a79da790a6d30da351793c3969c650ae1":[6,10,5,0], -"classzen_1_1obj_1_1z_entity.html#a7c8997abe3efcdcebe92dbb0d1aeff74":[6,10,5,4], -"classzen_1_1obj_1_1z_entity.html#a83c0539d7fbedbdca32fba4dff603dbe":[6,10,5,12], -"classzen_1_1obj_1_1z_entity.html#a903736be5f221a26c27505daa4c92854":[6,10,5,28], -"classzen_1_1obj_1_1z_entity.html#a97f63b13f8d18df82b07248ab498ffcd":[6,10,5,22], -"classzen_1_1obj_1_1z_entity.html#a98a25ae2297bb4a20e2bde022d51e087":[6,10,5,11], -"classzen_1_1obj_1_1z_entity.html#a9cd13b4361754c59bcb2a2a60a521732":[6,10,5,32], -"classzen_1_1obj_1_1z_entity.html#a9e2f50d4f740bafa9a232b931ea52ad5":[6,10,5,46], -"classzen_1_1obj_1_1z_entity.html#aa5e83a4f574c58349080ae6dd2f0d743":[6,10,5,31], -"classzen_1_1obj_1_1z_entity.html#aab105bb9a975be55bec1165839c75ca3":[6,10,5,19], -"classzen_1_1obj_1_1z_entity.html#aad6f5bd0a5e765f0082b3fbd253b1f68":[6,10,5,3], -"classzen_1_1obj_1_1z_entity.html#acaf234556b4960422bc2a6882667767e":[6,10,5,23], -"classzen_1_1obj_1_1z_entity.html#adc287a6ea165c9f0d50e159284ec6123":[6,10,5,33], -"classzen_1_1obj_1_1z_entity.html#aeb0b1fff556b047ec883730f67b3a25e":[6,10,5,39], -"classzen_1_1obj_1_1z_entity.html#aec6363ad5d3af581c4759ad8d68c43c6":[6,10,5,27], -"classzen_1_1obj_1_1z_entity.html#aef3735a1a52ed956672a61be5314dba7":[6,10,5,44], -"classzen_1_1obj_1_1z_entity.html#af6802dca2ddf3532e4e6648ef416e77c":[6,10,5,26], -"classzen_1_1obj_1_1z_entity.html#af9a8bd0519937b8f6f08e7d3a0fa676a":[6,10,5,30], +"classzen_1_1net_1_1z_socket.html#a8ff0189e585fdbe0b1545e315e6b1986":[6,9,1,3], +"classzen_1_1net_1_1z_socket.html#ae3c8f4c58ab2ca65afe52195e63a36ad":[6,9,1,4], +"classzen_1_1obj_1_1z_animation.html":[6,10,5], +"classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07":[6,10,5,11], +"classzen_1_1obj_1_1z_animation.html#a33cd5b24da0db101668b121f47de4538":[6,10,5,10], +"classzen_1_1obj_1_1z_animation.html#a5e43a113a9b7e662c2fa1f9c3cae3e49":[6,10,5,1], +"classzen_1_1obj_1_1z_animation.html#a64d58d1759855bbf4d673b1b6ed4c1f6":[6,10,5,5], +"classzen_1_1obj_1_1z_animation.html#a7622374cda2d6d88bc9e2bcfafb7275b":[6,10,5,12], +"classzen_1_1obj_1_1z_animation.html#a7d3ef5c8303886c20ab2c38e161e35ed":[6,10,5,8], +"classzen_1_1obj_1_1z_animation.html#a8d9a58895fbc85d08a940d82eb0c156a":[6,10,5,2], +"classzen_1_1obj_1_1z_animation.html#a9cf28d26b86a4d2e385818a8ead225e5":[6,10,5,0], +"classzen_1_1obj_1_1z_animation.html#ab0c8efb8cbd5959143235c46671a2f86":[6,10,5,6], +"classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063":[6,10,5,7], +"classzen_1_1obj_1_1z_animation.html#ac435855d325d13b4ae4319d2931223f7":[6,10,5,4], +"classzen_1_1obj_1_1z_animation.html#adcba40fcbe415c8fc02eeebdc63f63ff":[6,10,5,3], +"classzen_1_1obj_1_1z_animation.html#adfa021b895a6673393ac751286500f40":[6,10,5,13], +"classzen_1_1obj_1_1z_animation.html#af9f2e332f17dbe5bddd6e507549c6dd7":[6,10,5,9], +"classzen_1_1obj_1_1z_entity.html":[6,10,6], +"classzen_1_1obj_1_1z_entity.html#a06631189f514c4c4d6f86ec2c4180159":[6,10,6,40], +"classzen_1_1obj_1_1z_entity.html#a0a27bfedc1899ec3909f69d7061f7a7f":[6,10,6,5], +"classzen_1_1obj_1_1z_entity.html#a0c553e6ddb51ebc2b3bf321e92e61aea":[6,10,6,23], +"classzen_1_1obj_1_1z_entity.html#a0d08f234b8a4481c4aa776d965812931":[6,10,6,25], +"classzen_1_1obj_1_1z_entity.html#a11dce838f80f098387aed0123eef9208":[6,10,6,14], +"classzen_1_1obj_1_1z_entity.html#a12daa37cf2b47890da2540c5d0997f9b":[6,10,6,2], +"classzen_1_1obj_1_1z_entity.html#a14fa187a69a6c5dba0199d6fdbef8cdb":[6,10,6,36], +"classzen_1_1obj_1_1z_entity.html#a19f6d5563c71ef3fb51e44f33fe830a7":[6,10,6,8], +"classzen_1_1obj_1_1z_entity.html#a1b00bde3276274b582490b9c50430708":[6,10,6,15], +"classzen_1_1obj_1_1z_entity.html#a1be62235d46a4e5b5e1aeb7fb6df5068":[6,10,6,21], +"classzen_1_1obj_1_1z_entity.html#a1c125e6e0c1b2ff3f49ae0149af8557a":[6,10,6,47], +"classzen_1_1obj_1_1z_entity.html#a1e482bcc7d010db11da731eb4ae913ea":[6,10,6,13], +"classzen_1_1obj_1_1z_entity.html#a2a8b391f1405b50097201fc3deff567f":[6,10,6,19], +"classzen_1_1obj_1_1z_entity.html#a2ca996948f259af706995c06267a4bb8":[6,10,6,29], +"classzen_1_1obj_1_1z_entity.html#a2cba45d96f6b9f7e2b42d12acbf1353a":[6,10,6,35], +"classzen_1_1obj_1_1z_entity.html#a2e4ba22ce1d4e73fd0f863028627e952":[6,10,6,20], +"classzen_1_1obj_1_1z_entity.html#a32d257c18d288407f015d4694fbf8fd1":[6,10,6,45], +"classzen_1_1obj_1_1z_entity.html#a386392e27ecd5ea8832d55bd57a1534c":[6,10,6,37], +"classzen_1_1obj_1_1z_entity.html#a3939c963059737469174625b5ef38248":[6,10,6,41], +"classzen_1_1obj_1_1z_entity.html#a3c201ca568e29bb36c93d19339670e45":[6,10,6,18], +"classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc":[6,10,6,7], +"classzen_1_1obj_1_1z_entity.html#a449dec82dda90aa7a6dfc40efbcd65a9":[6,10,6,42], +"classzen_1_1obj_1_1z_entity.html#a4a54332aed144c626327fd1e4bb658bb":[6,10,6,48], +"classzen_1_1obj_1_1z_entity.html#a4d107b01ae3550171b060fcd44237f3f":[6,10,6,43], +"classzen_1_1obj_1_1z_entity.html#a53381ea55dc552df56f462bcc03bb84a":[6,10,6,6], +"classzen_1_1obj_1_1z_entity.html#a590c5e0bf98f75a137f537a74181ab54":[6,10,6,9], +"classzen_1_1obj_1_1z_entity.html#a5b134c4828b26cc7129c4d320b47ac73":[6,10,6,1], +"classzen_1_1obj_1_1z_entity.html#a5e45836b1864f010ea57b2540980022a":[6,10,6,17], +"classzen_1_1obj_1_1z_entity.html#a5feabee3a6c74a9cb4c75dff978d4752":[6,10,6,16], +"classzen_1_1obj_1_1z_entity.html#a64b8d1b956f87aff6cb05ad012107fe0":[6,10,6,38], +"classzen_1_1obj_1_1z_entity.html#a656737f613535329c7580156623e957d":[6,10,6,10], +"classzen_1_1obj_1_1z_entity.html#a707b60029a9a9cbe59981022a8b8110b":[6,10,6,34], +"classzen_1_1obj_1_1z_entity.html#a73cfeabce7776b30a3316ac58f9209a3":[6,10,6,24], +"classzen_1_1obj_1_1z_entity.html#a75dc7487405c30be0f668a0a4ac23207":[6,10,6,22], +"classzen_1_1obj_1_1z_entity.html#a79da790a6d30da351793c3969c650ae1":[6,10,6,0], +"classzen_1_1obj_1_1z_entity.html#a7c8997abe3efcdcebe92dbb0d1aeff74":[6,10,6,4], +"classzen_1_1obj_1_1z_entity.html#a83c0539d7fbedbdca32fba4dff603dbe":[6,10,6,12], +"classzen_1_1obj_1_1z_entity.html#a903736be5f221a26c27505daa4c92854":[6,10,6,28], +"classzen_1_1obj_1_1z_entity.html#a98a25ae2297bb4a20e2bde022d51e087":[6,10,6,11], +"classzen_1_1obj_1_1z_entity.html#a9cd13b4361754c59bcb2a2a60a521732":[6,10,6,32], +"classzen_1_1obj_1_1z_entity.html#a9e2f50d4f740bafa9a232b931ea52ad5":[6,10,6,46], +"classzen_1_1obj_1_1z_entity.html#aa5e83a4f574c58349080ae6dd2f0d743":[6,10,6,31], +"classzen_1_1obj_1_1z_entity.html#aad6f5bd0a5e765f0082b3fbd253b1f68":[6,10,6,3], +"classzen_1_1obj_1_1z_entity.html#adc287a6ea165c9f0d50e159284ec6123":[6,10,6,33], +"classzen_1_1obj_1_1z_entity.html#aeb0b1fff556b047ec883730f67b3a25e":[6,10,6,39], +"classzen_1_1obj_1_1z_entity.html#aec6363ad5d3af581c4759ad8d68c43c6":[6,10,6,27], +"classzen_1_1obj_1_1z_entity.html#aef3735a1a52ed956672a61be5314dba7":[6,10,6,44], +"classzen_1_1obj_1_1z_entity.html#af6802dca2ddf3532e4e6648ef416e77c":[6,10,6,26], +"classzen_1_1obj_1_1z_entity.html#af9a8bd0519937b8f6f08e7d3a0fa676a":[6,10,6,30], "classzen_1_1sfx_1_1_c_sound2_d.html":[6,1,4], "classzen_1_1sfx_1_1_c_sound2_d.html#a1ddd9fd90ee82b85d46a6d21bd09a503":[6,1,4,1], "classzen_1_1sfx_1_1_c_sound2_d.html#a473c6d5ae4d86c5ea06c7b1389786108":[6,1,4,5], @@ -74,17 +110,17 @@ var NAVTREEINDEX4 = "classzen_1_1sfx_1_1z_music2_d.html#afcd5133c4f288f09aa7d2a8d58d67a5a":[6,1,3,3], "classzen_1_1sfx_1_1z_music2_d.html#afe2b58376246241018bfc95d57234c8a":[6,1,3,1], "classzen_1_1util_1_1z_file_parser.html":[8,0,0,11,0], +"classzen_1_1util_1_1z_file_parser.html#a264a42f7c8879c34710f15a31a639bae":[8,0,0,11,0,3], "classzen_1_1util_1_1z_file_parser.html#a4125da033c5afa59c8987fa74e0b0d60":[8,0,0,11,0,2], "classzen_1_1util_1_1z_file_parser.html#a4e5cc1ad7347d7d09c1c1bd728afd47b":[8,0,0,11,0,0], "classzen_1_1util_1_1z_file_parser.html#a56f7717381124624cd7e1efcd3c7bf21":[8,0,0,11,0,5], -"classzen_1_1util_1_1z_file_parser.html#a6ca2fe02ff85919a2c76dfb4445fc62d":[8,0,0,11,0,4], "classzen_1_1util_1_1z_file_parser.html#a7c4a7903e417cd09b31fae28c95310b8":[8,0,0,11,0,10], +"classzen_1_1util_1_1z_file_parser.html#a8a8e702d15b655d041d949830ca43527":[8,0,0,11,0,4], "classzen_1_1util_1_1z_file_parser.html#a94e7a9736e7777a611662a8c27dc0acc":[8,0,0,11,0,6], "classzen_1_1util_1_1z_file_parser.html#a968e2922cf9841539199a0c7debbc7c8":[8,0,0,11,0,1], "classzen_1_1util_1_1z_file_parser.html#a9758037437c028ded13fd2462e5e22e5":[8,0,0,11,0,9], "classzen_1_1util_1_1z_file_parser.html#a9a30a5210c76a64ecd7e131b885c481b":[8,0,0,11,0,8], "classzen_1_1util_1_1z_file_parser.html#ab2b838120a61de3df5963b16c53f36c4":[8,0,0,11,0,7], -"classzen_1_1util_1_1z_file_parser.html#adeb9b19a83a1a6c2827a036318d9c209":[8,0,0,11,0,3], "classzen_1_1util_1_1z_log.html":[6,12,2], "classzen_1_1util_1_1z_log.html#a028f25d9efc8a8e02130f592e15bb6ce":[6,12,2,3], "classzen_1_1util_1_1z_log.html#a050d764d3b818e2619b0e4880edf749e":[6,12,2,15], @@ -213,41 +249,5 @@ var NAVTREEINDEX4 = "dir_581b39117fad9c901c881a5f767a7292.html":[9,0,0,0,0,6], "dir_6ba1276ecb08e799aefa47925204b56c.html":[9,0,0,0,0,5,0], "dir_6bb5ebe70616dc0e02dd1d9a005c6c8d.html":[9,0,0,1,4], -"dir_7eb9af5f8eadb34b65292da9b9c705b3.html":[9,0,0,1,6], -"dir_83649a668cc514157bc5eeec4c9e3f09.html":[9,0,0,0,0,13], -"dir_83ce8f1182b9a0b14e91c4d6ff3d804c.html":[9,0,0,0], -"dir_853c2b543f5b384380d1698b48cfe19a.html":[9,0,0,0,0,2], -"dir_88424f08fb9f6b5a5a3c5d8b116f9405.html":[9,0,0,0,0,3], -"dir_898b4fac06b0f172e3b3e37f4fca246b.html":[9,0,0,0,0,5], -"dir_8c7877d0c820b41d5685825b6f58f6c7.html":[9,0,0,1], -"dir_94ce42b34006fee834f667cb91576700.html":[9,0,0,0,0,11], -"dir_96f7981e552f469cdf3f1e7386a3bf14.html":[9,0,0,0,0,12], -"dir_9faa2ec350053c3b81bde887e1e8ddde.html":[9,0,0,1,8], -"dir_c188e09dd5fcdf29b608e01fc7b48ab8.html":[9,0,0,0,0,10], -"dir_c41963e08dd1fdd0c8449c288287ef04.html":[9,0,0,1,10], -"dir_cd6979e7ce7ff2c8aeadb4e183fb34c4.html":[9,0,0], -"dir_d434dd89545c808cdb27ee1725e3c16d.html":[9,0,0,0,0,4], -"dir_d64bb876af14358c61c373e2d9f7ff4e.html":[9,0,0,1,2], -"dir_de81990a9045b37d9965bbcd70fef2f3.html":[9,0,0,0,0,8], -"dir_e18839c54a81f7f7540c9f21f37582f0.html":[9,0,0,1,5], -"dir_e1addd992e85f136b9e0af733a0c4dc3.html":[9,0,0,0,0,7], -"dir_ed5a72cd7c500fb83d60e97a060edfe5.html":[9,0,0,0,0], -"dir_ee74c1ad1e693386ed3571c11b538ae5.html":[9,0,0,1,1], -"dir_fb506ce3840802e4699f44ecb313702e.html":[9,0,0,0,0,9], -"examples.html":[10], -"files.html":[9,0], -"functions.html":[8,3,0,0], -"functions.html":[8,3,0], -"functions_0x62.html":[8,3,0,1], -"functions_0x63.html":[8,3,0,2], -"functions_0x64.html":[8,3,0,3], -"functions_0x65.html":[8,3,0,4], -"functions_0x66.html":[8,3,0,5], -"functions_0x67.html":[8,3,0,6], -"functions_0x68.html":[8,3,0,7], -"functions_0x69.html":[8,3,0,8], -"functions_0x6b.html":[8,3,0,9], -"functions_0x6c.html":[8,3,0,10], -"functions_0x6d.html":[8,3,0,11], -"functions_0x6e.html":[8,3,0,12] +"dir_7eb9af5f8eadb34b65292da9b9c705b3.html":[9,0,0,1,6] }; diff --git a/docs/navtreeindex5.js b/docs/navtreeindex5.js index 2306aabb..9d696114 100644 --- a/docs/navtreeindex5.js +++ b/docs/navtreeindex5.js @@ -1,5 +1,41 @@ var NAVTREEINDEX5 = { +"dir_83649a668cc514157bc5eeec4c9e3f09.html":[9,0,0,0,0,13], +"dir_83ce8f1182b9a0b14e91c4d6ff3d804c.html":[9,0,0,0], +"dir_853c2b543f5b384380d1698b48cfe19a.html":[9,0,0,0,0,2], +"dir_88424f08fb9f6b5a5a3c5d8b116f9405.html":[9,0,0,0,0,3], +"dir_898b4fac06b0f172e3b3e37f4fca246b.html":[9,0,0,0,0,5], +"dir_8c7877d0c820b41d5685825b6f58f6c7.html":[9,0,0,1], +"dir_94ce42b34006fee834f667cb91576700.html":[9,0,0,0,0,11], +"dir_96f7981e552f469cdf3f1e7386a3bf14.html":[9,0,0,0,0,12], +"dir_9faa2ec350053c3b81bde887e1e8ddde.html":[9,0,0,1,8], +"dir_c188e09dd5fcdf29b608e01fc7b48ab8.html":[9,0,0,0,0,10], +"dir_c41963e08dd1fdd0c8449c288287ef04.html":[9,0,0,1,10], +"dir_cd6979e7ce7ff2c8aeadb4e183fb34c4.html":[9,0,0], +"dir_d434dd89545c808cdb27ee1725e3c16d.html":[9,0,0,0,0,4], +"dir_d64bb876af14358c61c373e2d9f7ff4e.html":[9,0,0,1,2], +"dir_de81990a9045b37d9965bbcd70fef2f3.html":[9,0,0,0,0,8], +"dir_e18839c54a81f7f7540c9f21f37582f0.html":[9,0,0,1,5], +"dir_e1addd992e85f136b9e0af733a0c4dc3.html":[9,0,0,0,0,7], +"dir_ed5a72cd7c500fb83d60e97a060edfe5.html":[9,0,0,0,0], +"dir_ee74c1ad1e693386ed3571c11b538ae5.html":[9,0,0,1,1], +"dir_fb506ce3840802e4699f44ecb313702e.html":[9,0,0,0,0,9], +"examples.html":[10], +"files.html":[9,0], +"functions.html":[8,3,0], +"functions.html":[8,3,0,0], +"functions_0x62.html":[8,3,0,1], +"functions_0x63.html":[8,3,0,2], +"functions_0x64.html":[8,3,0,3], +"functions_0x65.html":[8,3,0,4], +"functions_0x66.html":[8,3,0,5], +"functions_0x67.html":[8,3,0,6], +"functions_0x68.html":[8,3,0,7], +"functions_0x69.html":[8,3,0,8], +"functions_0x6b.html":[8,3,0,9], +"functions_0x6c.html":[8,3,0,10], +"functions_0x6d.html":[8,3,0,11], +"functions_0x6e.html":[8,3,0,12], "functions_0x6f.html":[8,3,0,13], "functions_0x70.html":[8,3,0,14], "functions_0x71.html":[8,3,0,15], @@ -13,6 +49,7 @@ var NAVTREEINDEX5 = "functions_0x79.html":[8,3,0,23], "functions_0x7a.html":[8,3,0,24], "functions_0x7e.html":[8,3,0,25], +"functions_eval.html":[8,3,4], "functions_func.html":[8,3,1,0], "functions_func.html":[8,3,1], "functions_func_0x62.html":[8,3,1,1], @@ -36,7 +73,7 @@ var NAVTREEINDEX5 = "functions_func_0x77.html":[8,3,1,19], "functions_func_0x7a.html":[8,3,1,20], "functions_func_0x7e.html":[8,3,1,21], -"functions_rela.html":[8,3,4], +"functions_rela.html":[8,3,5], "functions_type.html":[8,3,3], "functions_vars.html":[8,3,2], "globals.html":[9,1,0], @@ -66,18 +103,18 @@ var NAVTREEINDEX5 = "group___math.html#classzen_1_1math_1_1vector__t":[6,8,2], "group___network.html":[6,9], "group___objects.html":[6,10], -"group___objects.html#ga18bea3a1e52819aedaab745a949eabab":[6,10,7], -"group___objects.html#ga34bcf56f3a3a6ca6fa19bd6c0170c97d":[6,10,8], +"group___objects.html#ga18bea3a1e52819aedaab745a949eabab":[6,10,8], +"group___objects.html#ga34bcf56f3a3a6ca6fa19bd6c0170c97d":[6,10,9], "group___objects.html#ga34bcf56f3a3a6ca6fa19bd6c0170c97d":[6,10,2,0], -"group___objects.html#ga3623283095e9780bb2d04872ba70b972":[6,10,9], "group___objects.html#ga3623283095e9780bb2d04872ba70b972":[6,10,2,1], +"group___objects.html#ga3623283095e9780bb2d04872ba70b972":[6,10,10], "group___objects.html#ga4c09246cff275551ea63fd24ea89fc01":[6,10,3,1], -"group___objects.html#ga4c09246cff275551ea63fd24ea89fc01":[6,10,11], -"group___objects.html#ga925e8bd382dc3a99ce61fd2b9635aaf0":[6,10,6], -"group___objects.html#gadd5fad4ba953ede084f71bac6aedaa71":[6,10,12], +"group___objects.html#ga4c09246cff275551ea63fd24ea89fc01":[6,10,12], +"group___objects.html#ga925e8bd382dc3a99ce61fd2b9635aaf0":[6,10,7], "group___objects.html#gadd5fad4ba953ede084f71bac6aedaa71":[6,10,4,0], +"group___objects.html#gadd5fad4ba953ede084f71bac6aedaa71":[6,10,13], +"group___objects.html#gaeccc93d696d0f1e0b5c7aa73e51caf3a":[6,10,11], "group___objects.html#gaeccc93d696d0f1e0b5c7aa73e51caf3a":[6,10,3,0], -"group___objects.html#gaeccc93d696d0f1e0b5c7aa73e51caf3a":[6,10,10], "group___objects.html#structzen_1_1obj_1_1bbox__t":[6,10,2], "group___objects.html#structzen_1_1obj_1_1circle__t":[6,10,3], "group___objects.html#structzen_1_1obj_1_1material__t":[6,10,4], @@ -135,13 +172,15 @@ var NAVTREEINDEX5 = "namespacezen_1_1lvl.html#a13d0fd7c54ce90543b9ef634500fceaf":[8,0,0,7,1,0], "namespacezen_1_1lvl.html#a20532f985031396ba3bb0fbdd8b6deac":[8,0,0,7,2,1], "namespacezen_1_1lvl.html#a3705ac2a95924b36fcc162b183b6b350":[8,0,0,7,1,1], -"namespacezen_1_1lvl.html#a4465479c53f0a8cd38ce315f20f5c024":[8,0,0,7,0,2], -"namespacezen_1_1lvl.html#a485dcd48c31a1cbedf472dd04d2148ab":[8,0,0,7,0,0], -"namespacezen_1_1lvl.html#a5072412ea19f98b884c3c4e09bb481bd":[8,0,0,7,0,1], +"namespacezen_1_1lvl.html#a4465479c53f0a8cd38ce315f20f5c024":[8,0,0,7,0,3], +"namespacezen_1_1lvl.html#a485dcd48c31a1cbedf472dd04d2148ab":[8,0,0,7,0,1], +"namespacezen_1_1lvl.html#a5072412ea19f98b884c3c4e09bb481bd":[8,0,0,7,0,2], "namespacezen_1_1lvl.html#a75e632ff82a8efeea13536f34416bde4":[8,0,0,7,2,2], -"namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39":[8,0,0,7,2,3], -"namespacezen_1_1lvl.html#ab19c575a197ebaa8853515c925605461":[8,0,0,7,2,4], +"namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39":[8,0,0,7,2,4], +"namespacezen_1_1lvl.html#ab19c575a197ebaa8853515c925605461":[8,0,0,7,2,5], +"namespacezen_1_1lvl.html#ab23ca0d4cd1931da4928a4411d8c921b":[8,0,0,7,0,0], "namespacezen_1_1lvl.html#ab468f1c84927f9cff5a72f8b8f9fba2a":[8,0,0,7,2,0], +"namespacezen_1_1lvl.html#ad7d3e124aedb66291a07f84ca038391d":[8,0,0,7,2,3], "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1level__t":[8,0,0,7,2], "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1metalevel__t":[8,0,0,7,1], "namespacezen_1_1lvl.html#structzen_1_1lvl_1_1spawn__t":[8,0,0,7,0], @@ -210,44 +249,5 @@ var NAVTREEINDEX5 = "structzen_1_1evt_1_1event__t.html#acbe83d53881a0128caf597b353770cca":[8,0,0,4,0,5], "structzen_1_1evt_1_1key__t.html":[8,0,0,4,2], "structzen_1_1evt_1_1key__t.html#a4a76a9336e640961f601badab565332e":[8,0,0,4,2,3], -"structzen_1_1evt_1_1key__t.html#abaf00d855bb4a97803a1d8469d5c403c":[8,0,0,4,2,4], -"structzen_1_1evt_1_1key__t.html#ade5446443436a36bea1c945da1f51e84":[8,0,0,4,2,1], -"structzen_1_1evt_1_1key__t.html#adfc756c4a23b1b5126380e66468acb92":[8,0,0,4,2,0], -"structzen_1_1evt_1_1key__t.html#aec05fc4c5734eb6c9654b576e414bd8a":[8,0,0,4,2,2], -"structzen_1_1evt_1_1mouse__t.html":[8,0,0,4,3], -"structzen_1_1evt_1_1mouse__t.html#a91dffe98c5b279c338a7e400c61ccafe":[8,0,0,4,3,0], -"structzen_1_1evt_1_1mouse__t.html#a9781ef6800b370ef8e984ba276ce38a3":[8,0,0,4,3,1], -"structzen_1_1evt_1_1mouse__t.html#a9b2bc9ed6ec2c1fb8f0e914089101f00":[8,0,0,4,3,3], -"structzen_1_1evt_1_1mouse__t.html#aa839bcf70e59bca6dc4fe0952e52d520":[8,0,0,4,3,2], -"structzen_1_1evt_1_1mouse__t.html#ab42526a61c7d44b79d5541ad70cd320f":[8,0,0,4,3,4], -"structzen_1_1math_1_1aabb__t.html":[8,0,0,8,3], -"structzen_1_1math_1_1aabb__t.html#a172aff17b1ace616b210e8d7f84bcbcc":[8,0,0,8,3,4], -"structzen_1_1math_1_1aabb__t.html#a18b68d868db5d40ba56d9fd0fe02f0e1":[8,0,0,8,3,3], -"structzen_1_1math_1_1aabb__t.html#a2b94c69c6c4fa71cf53597d63b606c75":[8,0,0,8,3,1], -"structzen_1_1math_1_1aabb__t.html#a6bb204d8381941b3f6bc00003acdbdc4":[8,0,0,8,3,0], -"structzen_1_1math_1_1aabb__t.html#a7126b98c6462a78d6cb2169390bfdb6f":[8,0,0,8,3,6], -"structzen_1_1math_1_1aabb__t.html#a7af36642567cc7215209a7e55f3b1d73":[8,0,0,8,3,5], -"structzen_1_1math_1_1aabb__t.html#af248b10236c0f14c404a65b316daa403":[8,0,0,8,3,2], -"structzen_1_1math_1_1circle__t.html":[8,0,0,8,2], -"structzen_1_1math_1_1circle__t.html#a13b71e1629731bf37b0b234a9eae88a9":[8,0,0,8,2,0], -"structzen_1_1math_1_1circle__t.html#a308f209094b37020a14c1256cfff7edc":[8,0,0,8,2,2], -"structzen_1_1math_1_1circle__t.html#a695509e4743f150a1c69a251bd22548e":[8,0,0,8,2,5], -"structzen_1_1math_1_1circle__t.html#a6c6c2707cc0f7ad3f6de214536fcb26f":[8,0,0,8,2,3], -"structzen_1_1math_1_1circle__t.html#ad4bb585734f9733ee54ecaf9c39cbcde":[8,0,0,8,2,4], -"structzen_1_1math_1_1circle__t.html#ade83b73646fc631b044678c645a38ca5":[8,0,0,8,2,1], -"structzen_1_1math_1_1rect__t.html":[8,0,0,8,1], -"structzen_1_1math_1_1rect__t.html#a1f4008364992e31c29fd8aac0be98dc3":[8,0,0,8,1,2], -"structzen_1_1math_1_1rect__t.html#a5a13393802c38a76bf78d735a24cebdb":[8,0,0,8,1,3], -"structzen_1_1math_1_1rect__t.html#a642d6535748f7979a8b17c94f1092062":[8,0,0,8,1,1], -"structzen_1_1math_1_1rect__t.html#a66306e9a93c9761fbaf5f607f19bb711":[8,0,0,8,1,5], -"structzen_1_1math_1_1rect__t.html#a7a1526b88224e896ce2d75e9ea891c01":[8,0,0,8,1,0], -"structzen_1_1math_1_1rect__t.html#afe06b693d14d9ec5871a2e5e3f6b513c":[8,0,0,8,1,4], -"structzen_1_1math_1_1z_vector.html":[8,0,0,8,4], -"structzen_1_1math_1_1z_vector.html#a0d52a98e610988d5e9e9a456a5db7f0a":[8,0,0,8,4,26], -"structzen_1_1math_1_1z_vector.html#a203b9e170d6cacd18f711dcd78210023":[8,0,0,8,4,33], -"structzen_1_1math_1_1z_vector.html#a2430d98889cbd1cb518b25b18ec9717e":[8,0,0,8,4,16], -"structzen_1_1math_1_1z_vector.html#a30c2bed1cb6a136f0260994b64e968d2":[8,0,0,8,4,31], -"structzen_1_1math_1_1z_vector.html#a3e6691cee13a4a6667b5ddb300e5fbe3":[8,0,0,8,4,17], -"structzen_1_1math_1_1z_vector.html#a3e6691cee13a4a6667b5ddb300e5fbe3":[8,0,0,8,4,29], -"structzen_1_1math_1_1z_vector.html#a4972a817a184f041b29ff9b51bedf5cb":[8,0,0,8,4,10] +"structzen_1_1evt_1_1key__t.html#abaf00d855bb4a97803a1d8469d5c403c":[8,0,0,4,2,4] }; diff --git a/docs/navtreeindex6.js b/docs/navtreeindex6.js index 7151f509..eac1e150 100644 --- a/docs/navtreeindex6.js +++ b/docs/navtreeindex6.js @@ -1,31 +1,80 @@ var NAVTREEINDEX6 = { -"structzen_1_1math_1_1z_vector.html#a4eede96c16b22cc94a13418fbb471998":[8,0,0,8,4,22], -"structzen_1_1math_1_1z_vector.html#a4eede96c16b22cc94a13418fbb471998":[8,0,0,8,4,5], -"structzen_1_1math_1_1z_vector.html#a4f3591744e5d3c728f6acc49b5af892b":[8,0,0,8,4,3], -"structzen_1_1math_1_1z_vector.html#a60bbab7b4a42c9149f988bcb99dfa5f3":[8,0,0,8,4,30], -"structzen_1_1math_1_1z_vector.html#a637289f48df67a492f56c234afcb1ed3":[8,0,0,8,4,1], -"structzen_1_1math_1_1z_vector.html#a7989864d3fe4478b117f90cab0e34249":[8,0,0,8,4,23], -"structzen_1_1math_1_1z_vector.html#a7b6c9047ecfe899350b46730ceeec684":[8,0,0,8,4,9], -"structzen_1_1math_1_1z_vector.html#a7e62fe4161570ef2b2dd9e49811bcdbe":[8,0,0,8,4,19], -"structzen_1_1math_1_1z_vector.html#a87cc173f3a71e96a89bc892e2c3ff62f":[8,0,0,8,4,20], -"structzen_1_1math_1_1z_vector.html#a896d9b7ff98e840e2e7bba3ff0b734fe":[8,0,0,8,4,21], -"structzen_1_1math_1_1z_vector.html#a896d9b7ff98e840e2e7bba3ff0b734fe":[8,0,0,8,4,4], -"structzen_1_1math_1_1z_vector.html#aa491bbd8d9809113d6317f61011b6a3d":[8,0,0,8,4,11], -"structzen_1_1math_1_1z_vector.html#ab3ff19238545227d422d4dc61bac1747":[8,0,0,8,4,6], -"structzen_1_1math_1_1z_vector.html#ab613b43e9bd695012e9fb1c85584177f":[8,0,0,8,4,2], -"structzen_1_1math_1_1z_vector.html#abdec7227655adaabc93f169c2271b731":[8,0,0,8,4,24], -"structzen_1_1math_1_1z_vector.html#abdec7227655adaabc93f169c2271b731":[8,0,0,8,4,7], -"structzen_1_1math_1_1z_vector.html#abe201e8065219b1747357e0ec0a472b9":[8,0,0,8,4,13], -"structzen_1_1math_1_1z_vector.html#ac2470840ac86c3860ec745104dce3f34":[8,0,0,8,4,25], -"structzen_1_1math_1_1z_vector.html#ac4cad5a69b1546359cb8ed42e3086072":[8,0,0,8,4,28], -"structzen_1_1math_1_1z_vector.html#ac81b76be21dd5a1c8790b095ab03b23b":[8,0,0,8,4,8], -"structzen_1_1math_1_1z_vector.html#ac9ca9cc5adb430ec34306df49e0ff17c":[8,0,0,8,4,14], -"structzen_1_1math_1_1z_vector.html#aeca918e19b05664b552a458a32bd6fae":[8,0,0,8,4,12], -"structzen_1_1math_1_1z_vector.html#af8af20c71bc3eec6eed2581e0c9d95d2":[8,0,0,8,4,0], -"structzen_1_1math_1_1z_vector.html#af9784b38c52b56e4343495170b976091":[8,0,0,8,4,32], -"structzen_1_1math_1_1z_vector.html#af99254faa132c28fdbfd75e471018891":[8,0,0,8,4,18], -"structzen_1_1math_1_1z_vector.html#afc2dd6340fa6ebe3d26b173ae4837230":[8,0,0,8,4,27], -"structzen_1_1math_1_1z_vector.html#affdb455acc7582c5b526b4729a6367dd":[8,0,0,8,4,15], +"structzen_1_1evt_1_1key__t.html#ade5446443436a36bea1c945da1f51e84":[8,0,0,4,2,1], +"structzen_1_1evt_1_1key__t.html#adfc756c4a23b1b5126380e66468acb92":[8,0,0,4,2,0], +"structzen_1_1evt_1_1key__t.html#aec05fc4c5734eb6c9654b576e414bd8a":[8,0,0,4,2,2], +"structzen_1_1evt_1_1mouse__t.html":[8,0,0,4,3], +"structzen_1_1evt_1_1mouse__t.html#a91dffe98c5b279c338a7e400c61ccafe":[8,0,0,4,3,0], +"structzen_1_1evt_1_1mouse__t.html#a9781ef6800b370ef8e984ba276ce38a3":[8,0,0,4,3,1], +"structzen_1_1evt_1_1mouse__t.html#a9b2bc9ed6ec2c1fb8f0e914089101f00":[8,0,0,4,3,3], +"structzen_1_1evt_1_1mouse__t.html#aa839bcf70e59bca6dc4fe0952e52d520":[8,0,0,4,3,2], +"structzen_1_1evt_1_1mouse__t.html#ab42526a61c7d44b79d5541ad70cd320f":[8,0,0,4,3,4], +"structzen_1_1math_1_1aabb__t.html":[8,0,0,8,3], +"structzen_1_1math_1_1aabb__t.html#a172aff17b1ace616b210e8d7f84bcbcc":[8,0,0,8,3,4], +"structzen_1_1math_1_1aabb__t.html#a18b68d868db5d40ba56d9fd0fe02f0e1":[8,0,0,8,3,3], +"structzen_1_1math_1_1aabb__t.html#a2b94c69c6c4fa71cf53597d63b606c75":[8,0,0,8,3,1], +"structzen_1_1math_1_1aabb__t.html#a6bb204d8381941b3f6bc00003acdbdc4":[8,0,0,8,3,0], +"structzen_1_1math_1_1aabb__t.html#a7126b98c6462a78d6cb2169390bfdb6f":[8,0,0,8,3,6], +"structzen_1_1math_1_1aabb__t.html#a7af36642567cc7215209a7e55f3b1d73":[8,0,0,8,3,5], +"structzen_1_1math_1_1aabb__t.html#af248b10236c0f14c404a65b316daa403":[8,0,0,8,3,2], +"structzen_1_1math_1_1circle__t.html":[8,0,0,8,2], +"structzen_1_1math_1_1circle__t.html#a13b71e1629731bf37b0b234a9eae88a9":[8,0,0,8,2,0], +"structzen_1_1math_1_1circle__t.html#a308f209094b37020a14c1256cfff7edc":[8,0,0,8,2,2], +"structzen_1_1math_1_1circle__t.html#a695509e4743f150a1c69a251bd22548e":[8,0,0,8,2,5], +"structzen_1_1math_1_1circle__t.html#a6c6c2707cc0f7ad3f6de214536fcb26f":[8,0,0,8,2,3], +"structzen_1_1math_1_1circle__t.html#ad4bb585734f9733ee54ecaf9c39cbcde":[8,0,0,8,2,4], +"structzen_1_1math_1_1circle__t.html#ade83b73646fc631b044678c645a38ca5":[8,0,0,8,2,1], +"structzen_1_1math_1_1cquery__t.html":[8,0,0,8,4], +"structzen_1_1math_1_1cquery__t.html#a06be46d2205712500186115c682eccf9":[8,0,0,8,4,6], +"structzen_1_1math_1_1cquery__t.html#a19350f27be27962c6feedffa68341e05":[8,0,0,8,4,5], +"structzen_1_1math_1_1cquery__t.html#a520a1e7d3d94d630d9f8e7ef69fda72a":[8,0,0,8,4,3], +"structzen_1_1math_1_1cquery__t.html#a68fd57e277ef67047a8b20b386914f85":[8,0,0,8,4,2], +"structzen_1_1math_1_1cquery__t.html#a70b5263e947f4120540dcd6cd167f89d":[8,0,0,8,4,7], +"structzen_1_1math_1_1cquery__t.html#aab37db7191a1aeeaca9869e5d032dd73":[8,0,0,8,4,0], +"structzen_1_1math_1_1cquery__t.html#acdee2a05c3f7d45509b28fc3be0c25b5":[8,0,0,8,4,1], +"structzen_1_1math_1_1cquery__t.html#adb33e9eab6670832dadc0303fef776fa":[8,0,0,8,4,4], +"structzen_1_1math_1_1cquery__t.html#afc8ce3b4de8e85705e4e8e7c8ba1296c":[8,0,0,8,4,8], +"structzen_1_1math_1_1rect__t.html":[8,0,0,8,1], +"structzen_1_1math_1_1rect__t.html#a1f4008364992e31c29fd8aac0be98dc3":[8,0,0,8,1,2], +"structzen_1_1math_1_1rect__t.html#a5a13393802c38a76bf78d735a24cebdb":[8,0,0,8,1,3], +"structzen_1_1math_1_1rect__t.html#a642d6535748f7979a8b17c94f1092062":[8,0,0,8,1,1], +"structzen_1_1math_1_1rect__t.html#a66306e9a93c9761fbaf5f607f19bb711":[8,0,0,8,1,5], +"structzen_1_1math_1_1rect__t.html#a7a1526b88224e896ce2d75e9ea891c01":[8,0,0,8,1,0], +"structzen_1_1math_1_1rect__t.html#afe06b693d14d9ec5871a2e5e3f6b513c":[8,0,0,8,1,4], +"structzen_1_1math_1_1z_vector.html":[8,0,0,8,5], +"structzen_1_1math_1_1z_vector.html#a0d52a98e610988d5e9e9a456a5db7f0a":[8,0,0,8,5,26], +"structzen_1_1math_1_1z_vector.html#a203b9e170d6cacd18f711dcd78210023":[8,0,0,8,5,33], +"structzen_1_1math_1_1z_vector.html#a2430d98889cbd1cb518b25b18ec9717e":[8,0,0,8,5,16], +"structzen_1_1math_1_1z_vector.html#a30c2bed1cb6a136f0260994b64e968d2":[8,0,0,8,5,31], +"structzen_1_1math_1_1z_vector.html#a3e6691cee13a4a6667b5ddb300e5fbe3":[8,0,0,8,5,29], +"structzen_1_1math_1_1z_vector.html#a3e6691cee13a4a6667b5ddb300e5fbe3":[8,0,0,8,5,17], +"structzen_1_1math_1_1z_vector.html#a4972a817a184f041b29ff9b51bedf5cb":[8,0,0,8,5,10], +"structzen_1_1math_1_1z_vector.html#a4eede96c16b22cc94a13418fbb471998":[8,0,0,8,5,22], +"structzen_1_1math_1_1z_vector.html#a4eede96c16b22cc94a13418fbb471998":[8,0,0,8,5,5], +"structzen_1_1math_1_1z_vector.html#a4f3591744e5d3c728f6acc49b5af892b":[8,0,0,8,5,3], +"structzen_1_1math_1_1z_vector.html#a60bbab7b4a42c9149f988bcb99dfa5f3":[8,0,0,8,5,30], +"structzen_1_1math_1_1z_vector.html#a637289f48df67a492f56c234afcb1ed3":[8,0,0,8,5,1], +"structzen_1_1math_1_1z_vector.html#a7989864d3fe4478b117f90cab0e34249":[8,0,0,8,5,23], +"structzen_1_1math_1_1z_vector.html#a7b6c9047ecfe899350b46730ceeec684":[8,0,0,8,5,9], +"structzen_1_1math_1_1z_vector.html#a87cc173f3a71e96a89bc892e2c3ff62f":[8,0,0,8,5,20], +"structzen_1_1math_1_1z_vector.html#a896d9b7ff98e840e2e7bba3ff0b734fe":[8,0,0,8,5,4], +"structzen_1_1math_1_1z_vector.html#a896d9b7ff98e840e2e7bba3ff0b734fe":[8,0,0,8,5,21], +"structzen_1_1math_1_1z_vector.html#aa491bbd8d9809113d6317f61011b6a3d":[8,0,0,8,5,11], +"structzen_1_1math_1_1z_vector.html#ab3ff19238545227d422d4dc61bac1747":[8,0,0,8,5,6], +"structzen_1_1math_1_1z_vector.html#ab613b43e9bd695012e9fb1c85584177f":[8,0,0,8,5,2], +"structzen_1_1math_1_1z_vector.html#ab7eebffaaaac96cf48eb6f6139716e75":[8,0,0,8,5,19], +"structzen_1_1math_1_1z_vector.html#abdec7227655adaabc93f169c2271b731":[8,0,0,8,5,7], +"structzen_1_1math_1_1z_vector.html#abdec7227655adaabc93f169c2271b731":[8,0,0,8,5,24], +"structzen_1_1math_1_1z_vector.html#abe201e8065219b1747357e0ec0a472b9":[8,0,0,8,5,13], +"structzen_1_1math_1_1z_vector.html#ac2470840ac86c3860ec745104dce3f34":[8,0,0,8,5,25], +"structzen_1_1math_1_1z_vector.html#ac4cad5a69b1546359cb8ed42e3086072":[8,0,0,8,5,28], +"structzen_1_1math_1_1z_vector.html#ac81b76be21dd5a1c8790b095ab03b23b":[8,0,0,8,5,8], +"structzen_1_1math_1_1z_vector.html#ac9ca9cc5adb430ec34306df49e0ff17c":[8,0,0,8,5,14], +"structzen_1_1math_1_1z_vector.html#aeca918e19b05664b552a458a32bd6fae":[8,0,0,8,5,12], +"structzen_1_1math_1_1z_vector.html#af8af20c71bc3eec6eed2581e0c9d95d2":[8,0,0,8,5,0], +"structzen_1_1math_1_1z_vector.html#af9784b38c52b56e4343495170b976091":[8,0,0,8,5,32], +"structzen_1_1math_1_1z_vector.html#af99254faa132c28fdbfd75e471018891":[8,0,0,8,5,18], +"structzen_1_1math_1_1z_vector.html#afc2dd6340fa6ebe3d26b173ae4837230":[8,0,0,8,5,27], +"structzen_1_1math_1_1z_vector.html#affdb455acc7582c5b526b4729a6367dd":[8,0,0,8,5,15], "todo.html":[5] }; diff --git a/docs/pages.html b/docs/pages.html index f0286ac1..fbba5de7 100644 --- a/docs/pages.html +++ b/docs/pages.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/search/all_61.js b/docs/search/all_61.js index 89ecea82..baeb6b11 100644 --- a/docs/search/all_61.js +++ b/docs/search/all_61.js @@ -24,6 +24,7 @@ var searchData= ['alpha_5fflag',['ALPHA_FLAG',['../classzen_1_1gfxcore_1_1z_sorter.html#aa6d7b320637ab1301d82e23df033d5c3',1,'zen::gfxcore::zSorter']]], ['alpha_5foffset',['ALPHA_OFFSET',['../classzen_1_1gfxcore_1_1z_sorter.html#ae77042d5eeb3582252fcc9d4018336ea',1,'zen::gfxcore::zSorter']]], ['ambientlight_5ffs',['AMBIENTLIGHT_FS',['../namespacezen_1_1gfxcore.html#a0e89f93b32effac93e4b9349629c45e8',1,'zen::gfxcore']]], + ['animation',['ANIMATION',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842a28ff0af6199e0baf97bb71b4b4422057',1,'zen::lvl::zLevelLoader']]], ['animation_2ecpp',['Animation.cpp',['../_animation_8cpp.html',1,'']]], ['animation_2ehpp',['Animation.hpp',['../_animation_8hpp.html',1,'']]], ['apostrophe',['APOSTROPHE',['../_keyboard_8hpp.html#ad2166d2430b6d938adb193a08e2cd27b',1,'Keyboard.hpp']]], diff --git a/docs/search/all_62.js b/docs/search/all_62.js index bab6dd3a..e4ea2779 100644 --- a/docs/search/all_62.js +++ b/docs/search/all_62.js @@ -12,6 +12,8 @@ var searchData= ['bindtexture',['BindTexture',['../classzen_1_1gfx_1_1z_render_target.html#a06f5dba74fd295294e0e3528762265e7',1,'zen::gfx::zRenderTarget']]], ['blacklist',['blacklist',['../namespacezen_1_1lvl.html#a4465479c53f0a8cd38ce315f20f5c024',1,'zen::lvl::spawn_t']]], ['blendoperation',['BlendOperation',['../classzen_1_1gfxcore_1_1z_renderer.html#aa62f4347b6755ed1d0642fcec027b0b3',1,'zen::gfxcore::zRenderer']]], + ['box1',['box1',['../structzen_1_1math_1_1cquery__t.html#acdee2a05c3f7d45509b28fc3be0c25b5',1,'zen::math::cquery_t']]], + ['box2',['box2',['../structzen_1_1math_1_1cquery__t.html#a68fd57e277ef67047a8b20b386914f85',1,'zen::math::cquery_t']]], ['br',['br',['../structzen_1_1math_1_1aabb__t.html#a7126b98c6462a78d6cb2169390bfdb6f',1,'zen::math::aabb_t']]], ['buffer_5fcount',['buffer_count',['../classzen_1_1sfx_1_1z_audio2_d.html#a1129676aaf7cb9160f8dce0a5d5f0e89',1,'zen::sfx::zAudio2D::ALData']]], ['buffers',['buffers',['../classzen_1_1sfx_1_1z_audio2_d.html#a7c4845e05581f91360c48d3ace297ab9',1,'zen::sfx::zAudio2D::ALData']]], diff --git a/docs/search/all_63.js b/docs/search/all_63.js index c48f3dfb..b4bdb68c 100644 --- a/docs/search/all_63.js +++ b/docs/search/all_63.js @@ -3,17 +3,20 @@ var searchData= ['c',['C',['../_keyboard_8hpp.html#aaa53ca0b650dfd85c4f59fa156f7a2cc',1,'Keyboard.hpp']]], ['calch',['CalcH',['../classzen_1_1gfx_1_1z_polygon.html#a429c80360298608d83c56c74bae31e22',1,'zen::gfx::zPolygon']]], ['calcw',['CalcW',['../classzen_1_1gfx_1_1z_polygon.html#a55d204431680f82b0016e5b290c25ccf',1,'zen::gfx::zPolygon']]], + ['calcx',['CalcX',['../classzen_1_1gfx_1_1z_polygon.html#a44b2721ed65c2e2fb2b5391b4397ae9b',1,'zen::gfx::zPolygon']]], + ['calcy',['CalcY',['../classzen_1_1gfx_1_1z_polygon.html#adc5878f6c1cb869b6e5ed4ba8911bd62',1,'zen::gfx::zPolygon']]], ['caps_5flock',['CAPS_LOCK',['../_keyboard_8hpp.html#ae2519f3aaf22c6b013050c4b05f9c09e',1,'Keyboard.hpp']]], ['cbegin',['cbegin',['../classzen_1_1asset_1_1z_asset_manager.html#a7dbf837809ef6fa8907ba34f3416c5be',1,'zen::asset::zAssetManager::cbegin()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#af6e1877802a20308c2cccd137f58928e',1,'zen::util::zXMLParser::cbegin()']]], ['cend',['cend',['../classzen_1_1asset_1_1z_asset_manager.html#a3c18de41b277ae600dd657474d0c7d78',1,'zen::asset::zAssetManager::cend()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#a739208d2e8591f83f325114f0ba008a9',1,'zen::util::zXMLParser::cend()']]], ['center',['Center',['../classzen_1_1obj_1_1z_entity.html#a656737f613535329c7580156623e957d',1,'zen::obj::zEntity']]], ['cfontatlas',['CFontAtlas',['../classzen_1_1gui_1_1_c_font_atlas.html',1,'zen::gui']]], ['charactercallback',['CharacterCallback',['../classzen_1_1evt_1_1z_event_handler.html#a906ec870ab93a4e262dc31a42c4e37f4',1,'zen::evt::zEventHandler']]], + ['check',['CHECK',['../_level_test_8cpp.html#aa59a70e2ff40af3af6c08aafdca8c713',1,'LevelTest.cpp']]], ['children',['children',['../namespacezen_1_1util.html#a31fa35bfe9b153c6b190080134d166a1',1,'zen::util::XMLNode']]], ['chk',['chk',['../namespacezen_1_1net.html#a3d6beb76f6288820b20b946271f747aa',1,'zen::net::IPHeader::chk()'],['../namespacezen_1_1net.html#af4685ac237640265688a189aa1cf1ccb',1,'zen::net::ICMPHeader::chk()']]], ['choice',['choice',['../classzen_1_1util_1_1z_random.html#a16813c80703663f76e60930ee990882c',1,'zen::util::zRandom']]], - ['circle_5ft',['circle_t',['../structzen_1_1math_1_1circle__t.html#a13b71e1629731bf37b0b234a9eae88a9',1,'zen::math::circle_t::circle_t()'],['../structzen_1_1math_1_1circle__t.html#ade83b73646fc631b044678c645a38ca5',1,'zen::math::circle_t::circle_t(real_t x, real_t y, real_t r)']]], ['circle_5ft',['circle_t',['../structzen_1_1math_1_1circle__t.html',1,'zen::math']]], + ['circle_5ft',['circle_t',['../structzen_1_1math_1_1circle__t.html#a13b71e1629731bf37b0b234a9eae88a9',1,'zen::math::circle_t::circle_t()'],['../structzen_1_1math_1_1circle__t.html#ade83b73646fc631b044678c645a38ca5',1,'zen::math::circle_t::circle_t(real_t x, real_t y, real_t r)']]], ['circle_5ft',['circle_t',['../group___objects.html#structzen_1_1obj_1_1circle__t',1,'zen::obj']]], ['clamp',['clamp',['../namespacezen.html#abd3a983dbbe128f38063986a90b05d0a',1,'zen']]], ['clear',['Clear',['../classzen_1_1gfxcore_1_1z_vertex_array.html#ab7fa4653cb7e9483e4d5bf1ad97b402e',1,'zen::gfxcore::zVertexArray::Clear()'],['../classzen_1_1gfx_1_1z_render_target.html#a5a3c2ed88bffcb4a815f2ffb9c102b77',1,'zen::gfx::zRenderTarget::Clear()'],['../classzen_1_1gfx_1_1z_scene.html#af6b595895bdc0cfcd832435f714ec3b6',1,'zen::gfx::zScene::Clear()'],['../classzen_1_1gfx_1_1z_window.html#a038cb46b55e0dc76a7fd7c374dc0bf45',1,'zen::gfx::zWindow::Clear()'],['../classzen_1_1gfx_1_1z_window.html#a3c04896622b89d18359691970d843877',1,'zen::gfx::zWindow::Clear(const color4f_t &Color)']]], @@ -22,11 +25,12 @@ var searchData= ['clock_5ft',['clock_t',['../classzen_1_1util_1_1z_timer.html#aec134ada7a1f2624620fabd81e60c535',1,'zen::util::zTimer']]], ['close',['Close',['../classzen_1_1gfx_1_1z_window.html#a3d18497cbf3fc8f8a0231761fbf3bf9e',1,'zen::gfx::zWindow']]], ['code',['code',['../namespacezen_1_1net.html#a726424d15d813920d1f5f43dd0c61606',1,'zen::net::ICMPHeader']]], - ['collides',['collides',['../structzen_1_1math_1_1circle__t.html#a308f209094b37020a14c1256cfff7edc',1,'zen::math::circle_t::collides()'],['../structzen_1_1math_1_1aabb__t.html#a18b68d868db5d40ba56d9fd0fe02f0e1',1,'zen::math::aabb_t::collides(const aabb_t &b) const '],['../structzen_1_1math_1_1aabb__t.html#a172aff17b1ace616b210e8d7f84bcbcc',1,'zen::math::aabb_t::collides(const tri_t &tri) const '],['../classzen_1_1gfx_1_1z_polygon.html#a7cd1ed28b12be147b3567325035588ab',1,'zen::gfx::zPolygon::Collides(const zPolygon &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1gfx_1_1z_polygon.html#a3574b7e895e99b3aba9352083b86e36b',1,'zen::gfx::zPolygon::Collides(const math::aabb_t &other)'],['../classzen_1_1gfx_1_1z_quad.html#a5eb84d8851c72de252ee06a302d45e07',1,'zen::gfx::zQuad::Collides(const zPolygon &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1gfx_1_1z_quad.html#ab47b202f4549acb2c691fad8199d45e7',1,'zen::gfx::zQuad::Collides(const zQuad &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04',1,'zen::gfx::zQuad::Collides(const math::aabb_t &other)'],['../classzen_1_1obj_1_1z_entity.html#aab105bb9a975be55bec1165839c75ca3',1,'zen::obj::zEntity::Collides(const zEntity &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1obj_1_1z_entity.html#a0fabb7a8eb2c7e4b060fd121dfcbc6ad',1,'zen::obj::zEntity::Collides(const math::rect_t &other)'],['../classzen_1_1obj_1_1z_entity.html#a0c09afd745bbde3ee9dcf17e1bf0557b',1,'zen::obj::zEntity::Collides(const math::aabb_t &other)'],['../classzen_1_1obj_1_1z_entity.html#a97f63b13f8d18df82b07248ab498ffcd',1,'zen::obj::zEntity::Collides(const math::vector_t &Pos)'],['../namespacezen_1_1math.html#ae3df27df54d004f888b10187fe1c3077',1,'zen::math::collides(const tri_t &A, const tri_t &b, vector_t *pt=nullptr)'],['../namespacezen_1_1math.html#a7c7f261f6eceee12104089778b1e342b',1,'zen::math::collides(const line_t &a, const line_t &b, vector_t *pt=nullptr)'],['../group___objects.html#ga925e8bd382dc3a99ce61fd2b9635aaf0',1,'zen::obj::collides(const bbox_t &a, const bbox_t &b)'],['../group___objects.html#ga18bea3a1e52819aedaab745a949eabab',1,'zen::obj::collides(const circle_t &a, const circle_t &b)']]], + ['collides',['collides',['../structzen_1_1math_1_1circle__t.html#a308f209094b37020a14c1256cfff7edc',1,'zen::math::circle_t::collides()'],['../structzen_1_1math_1_1aabb__t.html#a18b68d868db5d40ba56d9fd0fe02f0e1',1,'zen::math::aabb_t::collides(const aabb_t &b) const '],['../structzen_1_1math_1_1aabb__t.html#a172aff17b1ace616b210e8d7f84bcbcc',1,'zen::math::aabb_t::collides(const tri_t &tri) const '],['../classzen_1_1gfx_1_1z_polygon.html#a445f57a850cd65629ba96595172d2ef4',1,'zen::gfx::zPolygon::Collides(const zPolygon &Other, math::cquery_t *q=nullptr) const '],['../classzen_1_1gfx_1_1z_polygon.html#a05f999895093561101c8016f43f2a464',1,'zen::gfx::zPolygon::Collides(const math::aabb_t &other) const '],['../classzen_1_1gfx_1_1z_quad.html#a5f5ed27f47eb430f1bc36eb6b046b04a',1,'zen::gfx::zQuad::Collides(const zPolygon &Other, math::cquery_t *q) const '],['../classzen_1_1gfx_1_1z_quad.html#a67eeed3aa34f859af6f017bd081c4f4d',1,'zen::gfx::zQuad::Collides(const zQuad &Other, math::cquery_t *q) const '],['../classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04',1,'zen::gfx::zQuad::Collides(const math::aabb_t &other)'],['../classzen_1_1obj_1_1z_entity.html#a2a8b391f1405b50097201fc3deff567f',1,'zen::obj::zEntity::Collides(const zEntity &Other, math::cquery_t *q=nullptr) const '],['../classzen_1_1obj_1_1z_entity.html#a2e4ba22ce1d4e73fd0f863028627e952',1,'zen::obj::zEntity::Collides(const math::rect_t &other) const '],['../classzen_1_1obj_1_1z_entity.html#a1be62235d46a4e5b5e1aeb7fb6df5068',1,'zen::obj::zEntity::Collides(const math::aabb_t &other) const '],['../classzen_1_1obj_1_1z_entity.html#a75dc7487405c30be0f668a0a4ac23207',1,'zen::obj::zEntity::Collides(const math::vector_t &Pos) const '],['../classg_bullet.html#a635a3488c596cf55141d416491fa44c4',1,'gBullet::Collides()'],['../namespacezen_1_1math.html#a96d8397d0fc2cc7a832a4b1e2f427e41',1,'zen::math::collides(const tri_t &A, const tri_t &b, cquery_t *q=nullptr)'],['../namespacezen_1_1math.html#a36b4f55da484ea4e79631cc4bdd24cd2',1,'zen::math::collides(const line_t &a, const line_t &b, cquery_t *q=nullptr)'],['../group___objects.html#ga925e8bd382dc3a99ce61fd2b9635aaf0',1,'zen::obj::collides(const bbox_t &a, const bbox_t &b)'],['../group___objects.html#ga18bea3a1e52819aedaab745a949eabab',1,'zen::obj::collides(const circle_t &a, const circle_t &b)']]], + ['collision',['collision',['../structzen_1_1math_1_1cquery__t.html#afc8ce3b4de8e85705e4e8e7c8ba1296c',1,'zen::math::cquery_t']]], ['collisiontest_2ecpp',['CollisionTest.cpp',['../_collision_test_8cpp.html',1,'']]], ['color',['color',['../namespacezen_1_1gfxcore.html#a6924733c1ccf66bbc26e0e941f723162',1,'zen::gfxcore::vertex_t']]], - ['color3f_5ft',['color3f_t',['../structzen_1_1color3f__t.html',1,'zen']]], ['color3f_5ft',['color3f_t',['../structzen_1_1color3f__t.html#a096d6de7f738d20a0c9e6d6bde7e7768',1,'zen::color3f_t']]], + ['color3f_5ft',['color3f_t',['../structzen_1_1color3f__t.html',1,'zen']]], ['color4f_5ft',['color4f_t',['../structzen_1_1color4f__t.html#a7bc228324527278bf8e2c54cb0c6626f',1,'zen::color4f_t']]], ['color4f_5ft',['color4f_t',['../structzen_1_1color4f__t.html',1,'zen']]], ['comma',['COMMA',['../_keyboard_8hpp.html#a28073488d2463f84f89bd8482d9f95a9',1,'Keyboard.hpp']]], @@ -36,7 +40,9 @@ var searchData= ['content',['content',['../namespacezen_1_1util.html#a0e12a71a7e2fa6a9183d046c462ab61d',1,'zen::util::XMLNode']]], ['copyfromexisting',['CopyFromExisting',['../classzen_1_1gfxcore_1_1z_texture.html#af0fbeef6c917ec51b1ae5296c42201b6',1,'zen::gfxcore::zTexture']]], ['coregraphics',['CoreGraphics',['../group___core_graphics.html',1,'']]], - ['create',['Create',['../classzen_1_1asset_1_1z_asset_manager.html#a913db0d2386a2a6d70ac7f14bc87d350',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a0ad8c78766fe785c045a85f13d86fee6',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a4b0f1b14550967c2862c84c6905be830',1,'zen::asset::zAssetManager::Create(const void *const owner=nullptr)'],['../classzen_1_1gfx_1_1z_concave_polygon.html#a10251b694ecba0fb2ec99fe53c05f79d',1,'zen::gfx::zConcavePolygon::Create()'],['../classzen_1_1gfx_1_1z_polygon.html#ac9df030c2f41e4454a7b6d260e0fd21a',1,'zen::gfx::zPolygon::Create()'],['../classzen_1_1gfx_1_1z_quad.html#a8eaf715d98a3a11a202ad73f0f7e356d',1,'zen::gfx::zQuad::Create()'],['../classzen_1_1asset_1_1z_asset_manager.html#a12d6426e1292260614774c17c37aa167',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#abe99604de5f4e7aa650f0e02902f7efc',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#adc7d5608484aa2dca5b3cfa27613bbae',1,'zen::asset::zAssetManager::Create(const void *const owner)']]], + ['cquery_5ft',['cquery_t',['../structzen_1_1math_1_1cquery__t.html#aab37db7191a1aeeaca9869e5d032dd73',1,'zen::math::cquery_t']]], + ['cquery_5ft',['cquery_t',['../structzen_1_1math_1_1cquery__t.html',1,'zen::math']]], + ['create',['Create',['../classzen_1_1asset_1_1z_asset_manager.html#a913db0d2386a2a6d70ac7f14bc87d350',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a0ad8c78766fe785c045a85f13d86fee6',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a4b0f1b14550967c2862c84c6905be830',1,'zen::asset::zAssetManager::Create(const void *const owner=nullptr)'],['../classzen_1_1gfx_1_1z_concave_polygon.html#ab9a368fae6346609c591204180b5ed04',1,'zen::gfx::zConcavePolygon::Create()'],['../classzen_1_1gfx_1_1z_polygon.html#a1955ad2231b3b46bbf4f4e2408be3c62',1,'zen::gfx::zPolygon::Create()'],['../classzen_1_1gfx_1_1z_quad.html#a6ba50baedb76b9e4b966b9a3fa0333f4',1,'zen::gfx::zQuad::Create()'],['../classzen_1_1asset_1_1z_asset_manager.html#a12d6426e1292260614774c17c37aa167',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#abe99604de5f4e7aa650f0e02902f7efc',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#adc7d5608484aa2dca5b3cfa27613bbae',1,'zen::asset::zAssetManager::Create(const void *const owner)']]], ['createidentitymatrix',['CreateIdentityMatrix',['../classzen_1_1math_1_1matrix4x4__t.html#afd5ac2890e4956d80553a9539e20ea5a',1,'zen::math::matrix4x4_t']]], ['createshaderobject',['CreateShaderObject',['../classzen_1_1gfxcore_1_1z_shader_set.html#a3dfcee25bfda15b88549e798a9ac9009',1,'zen::gfxcore::zShaderSet']]], ['createsortflag',['CreateSortFlag',['../classzen_1_1gfxcore_1_1z_sorter.html#a55b42b6f90a534d9b06a519a38f91de8',1,'zen::gfxcore::zSorter']]], diff --git a/docs/search/all_64.js b/docs/search/all_64.js index bca4ead5..89345d36 100644 --- a/docs/search/all_64.js +++ b/docs/search/all_64.js @@ -21,7 +21,7 @@ var searchData= ['disablelighting',['DisableLighting',['../classzen_1_1gfx_1_1z_scene.html#a248965d615fe44c127b2a3f38d32b128',1,'zen::gfx::zScene']]], ['disablepostprocessing',['DisablePostProcessing',['../classzen_1_1gfx_1_1z_scene.html#a0a183be6fd9991d755849081c0511fb6',1,'zen::gfx::zScene']]], ['disabletexture',['DisableTexture',['../classzen_1_1gfxcore_1_1z_renderer.html#a6e2d08809b5a7d6960928fd13a157016',1,'zen::gfxcore::zRenderer::DisableTexture()'],['../classzen_1_1gfx_1_1z_material.html#a5dd5fdc7ea1311e3cf671b17594988a5',1,'zen::gfx::zMaterial::DisableTexture()']]], - ['distance',['distance',['../structzen_1_1math_1_1z_vector.html#a7e62fe4161570ef2b2dd9e49811bcdbe',1,'zen::math::zVector::distance()'],['../namespacezen_1_1math.html#ad0590aed15a517ae91eb37d5640f55f8',1,'zen::math::distance(const real_t x1, const real_t y1, const real_t x2, const real_t y2, const bool do_sqrt=false)'],['../namespacezen_1_1math.html#a5fa06496e5a992ad54ad59b5ee9174c1',1,'zen::math::distance(const zVector< T > &A, const zVector< U > &B, const bool do_sqrt)'],['../_vector_8inl.html#a31292d7a37056f7bd56fbd5e7f6531d7',1,'distance(): Vector.inl']]], + ['distance',['distance',['../structzen_1_1math_1_1z_vector.html#ab7eebffaaaac96cf48eb6f6139716e75',1,'zen::math::zVector::distance()'],['../namespacezen_1_1math.html#ad0590aed15a517ae91eb37d5640f55f8',1,'zen::math::distance(const real_t x1, const real_t y1, const real_t x2, const real_t y2, const bool do_sqrt=false)'],['../namespacezen_1_1math.html#a5fa06496e5a992ad54ad59b5ee9174c1',1,'zen::math::distance(const zVector< T > &A, const zVector< U > &B, const bool do_sqrt)'],['../_vector_8inl.html#a31292d7a37056f7bd56fbd5e7f6531d7',1,'distance(): Vector.inl']]], ['dllmain_2ecpp',['DLLMain.cpp',['../_d_l_l_main_8cpp.html',1,'']]], ['down',['down',['../structzen_1_1evt_1_1mouse__t.html#a9b2bc9ed6ec2c1fb8f0e914089101f00',1,'zen::evt::mouse_t::down()'],['../_keyboard_8hpp.html#a4ebb08896e48bdf5c496da779cbd955c',1,'DOWN(): Keyboard.hpp']]], ['draw',['Draw',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a8b153d9cc48a11886f9b75a7ed9438ec',1,'zen::gfxcore::zVertexArray::Draw()'],['../classzen_1_1gfx_1_1z_polygon.html#ab7fb29249ab405cc610bb5e451397fea',1,'zen::gfx::zPolygon::Draw()'],['../classzen_1_1obj_1_1z_entity.html#a53381ea55dc552df56f462bcc03bb84a',1,'zen::obj::zEntity::Draw()']]], diff --git a/docs/search/all_65.js b/docs/search/all_65.js index b061c7be..52ec31e9 100644 --- a/docs/search/all_65.js +++ b/docs/search/all_65.js @@ -15,6 +15,7 @@ var searchData= ['enabletexture',['EnableTexture',['../classzen_1_1gfxcore_1_1z_renderer.html#a8d3f69c379d55590d11391b2d26836d3',1,'zen::gfxcore::zRenderer::EnableTexture()'],['../classzen_1_1gfx_1_1z_material.html#a6f9b1d7c2df944e3dfa0a70fa3982e7f',1,'zen::gfx::zMaterial::EnableTexture()']]], ['end',['end',['../classzen_1_1obj_1_1z_entity.html#adc287a6ea165c9f0d50e159284ec6123',1,'zen::obj::zEntity::end()'],['../classzen_1_1util_1_1z_settings.html#a28b790da88827a5c218b15994e624d55',1,'zen::util::zSettings::end()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#a9c0b31a07388637a385beacb8a43fee1',1,'zen::util::zXMLParser::end()'],['../_keyboard_8hpp.html#a1de54bd922161dd5c6a353647f448fd6',1,'END(): Keyboard.hpp']]], ['endl',['endl',['../classzen_1_1util_1_1z_log.html#aa93dc9b819da9e2bee15100933edfaad',1,'zen::util::zLog']]], + ['enemy_5fspawn',['ENEMY_SPAWN',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8aa085bbb81788460fa0339067cc87c5c75',1,'zen::lvl']]], ['engine',['Engine',['../group___engine.html',1,'']]], ['enginetest_2ecpp',['EngineTest.cpp',['../_engine_test_8cpp.html',1,'']]], ['enter',['ENTER',['../_keyboard_8hpp.html#a137f5235d173df6d58a954b8c3c71b6b',1,'Keyboard.hpp']]], diff --git a/docs/search/all_66.js b/docs/search/all_66.js index bdd353bc..9eaf4bd9 100644 --- a/docs/search/all_66.js +++ b/docs/search/all_66.js @@ -28,6 +28,7 @@ var searchData= ['flags',['flags',['../namespacezen_1_1net.html#aceb27dec37d7f570f5f68ea55ef83f65',1,'zen::net::IPHeader']]], ['font_2ecpp',['Font.cpp',['../_font_8cpp.html',1,'']]], ['font_2ehpp',['Font.hpp',['../_font_8hpp.html',1,'']]], + ['font_5fpath',['FONT_PATH',['../_level_test_8cpp.html#af326d9b4cced6fd44a9f9567dc666014',1,'LevelTest.cpp']]], ['fontatlas_2ehpp',['FontAtlas.hpp',['../_font_atlas_8hpp.html',1,'']]], ['fontcore_2ehpp',['FontCore.hpp',['../_font_core_8hpp.html',1,'']]], ['four',['FOUR',['../_keyboard_8hpp.html#a0a04eb9a514fbe0829cf48049cc69fc7',1,'Keyboard.hpp']]], diff --git a/docs/search/all_67.js b/docs/search/all_67.js index 3ada3d46..0a134e24 100644 --- a/docs/search/all_67.js +++ b/docs/search/all_67.js @@ -6,6 +6,7 @@ var searchData= ['gaussianblur_5fvs',['GAUSSIANBLUR_VS',['../namespacezen_1_1gfxcore.html#a2e6b759c28ed489da220aa1b33bb24cf',1,'zen::gfxcore']]], ['gaussianblurh_5ffs',['GAUSSIANBLURH_FS',['../namespacezen_1_1gfxcore.html#a47ae4c39ff5d22809e163387c6a7de5c',1,'zen::gfxcore']]], ['gaussianblurv_5ffs',['GAUSSIANBLURV_FS',['../namespacezen_1_1gfxcore.html#a63f82515bfddfb01b830bdc80a6eddba',1,'zen::gfxcore']]], + ['gbullet',['gBullet',['../classg_bullet.html',1,'gBullet'],['../classg_bullet.html#ace82350a968fa10022480fd362599f19',1,'gBullet::gBullet()']]], ['get',['get',['../classzen_1_1z_allocator.html#a829c780ca192db07a2e536744a648add',1,'zen::zAllocator::get(size_t count=1)'],['../classzen_1_1z_allocator.html#a472973ee0cdbc2965245327333cdc43c',1,'zen::zAllocator::Get()']]], ['getassetcount',['GetAssetCount',['../classzen_1_1asset_1_1z_asset_manager.html#a07a0677f1a05e0f76481e447b0292cbe',1,'zen::asset::zAssetManager']]], ['getassetid',['GetAssetID',['../classzen_1_1asset_1_1z_asset.html#a938213616b2e467c9957885af5ecae32',1,'zen::asset::zAsset']]], @@ -39,11 +40,11 @@ var searchData= ['getindexcount',['GetIndexCount',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a1f40c5fff5ca6574db24fa6f53146a24',1,'zen::gfxcore::zVertexArray']]], ['getindicesfromgpu',['GetIndicesFromGPU',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a64ea4e035b4e5c77a6d8f495cace39af',1,'zen::gfxcore::zVertexArray']]], ['getinstance',['GetInstance',['../classzen_1_1evt_1_1z_event_handler.html#a4cf62909dfc2748816282abde1e4486a',1,'zen::evt::zEventHandler']]], - ['getleftpoint',['GetLeftPoint',['../classzen_1_1gfx_1_1z_polygon.html#a1952d1ddbb16cae0816d03a4c284f5d6',1,'zen::gfx::zPolygon']]], + ['getleftpoint',['GetLeftPoint',['../classzen_1_1gfx_1_1z_polygon.html#a5d5880fa1e14f9b5622db4ef4322d1db',1,'zen::gfx::zPolygon']]], ['getlibrary',['GetLibrary',['../classzen_1_1gui_1_1z_font_library.html#aeafc692f64655ec31a3b0dac69d74924',1,'zen::gui::zFontLibrary']]], ['getlineheight',['GetLineHeight',['../classzen_1_1gui_1_1z_font.html#a5aa68ad2c5f6d57b8cfca1d6fcc5db5e',1,'zen::gui::zFont']]], ['getlinkerlog',['GetLinkerLog',['../classzen_1_1gfxcore_1_1z_shader_set.html#aaab9066add07f23fd160ceb05831eb86',1,'zen::gfxcore::zShaderSet']]], - ['getlowpoint',['GetLowPoint',['../classzen_1_1gfx_1_1z_polygon.html#a3fad6b6af1a44dac05b4cecb9bfdc31d',1,'zen::gfx::zPolygon']]], + ['getlowpoint',['GetLowPoint',['../classzen_1_1gfx_1_1z_polygon.html#ae9034f5809ff965852ae22fa4d869b19',1,'zen::gfx::zPolygon']]], ['getmaterial',['GetMaterial',['../classzen_1_1gfx_1_1z_polygon.html#a54a92a7768eafb28d57909f4313223bc',1,'zen::gfx::zPolygon']]], ['getmouseposition',['GetMousePosition',['../classzen_1_1gfx_1_1z_window.html#a842bda949d45c6cedb9c7eabc090e23f',1,'zen::gfx::zWindow::GetMousePosition()'],['../namespacezen_1_1evt.html#a936d1cbb9682e660e2b1da249e137af0',1,'zen::evt::GetMousePosition()']]], ['getmousestate',['GetMouseState',['../classzen_1_1gfx_1_1z_window.html#ad2a883491d08d85b6e101dbef3cebef5',1,'zen::gfx::zWindow::GetMouseState()'],['../namespacezen_1_1evt.html#a99695098183c4a3750d66515c95c6103',1,'zen::evt::GetMouseState()']]], @@ -55,6 +56,7 @@ var searchData= ['getpointer',['GetPointer',['../classzen_1_1math_1_1matrix4x4__t.html#a082d67aac74477832c4c9165c2a62b3d',1,'zen::math::matrix4x4_t']]], ['getposition',['GetPosition',['../classzen_1_1gfx_1_1z_light.html#aa9ada375f64ef1578b9be6962d0f650a',1,'zen::gfx::zLight::GetPosition()'],['../classzen_1_1gfx_1_1z_polygon.html#ade8d718f4392ea6f7d36563363d667db',1,'zen::gfx::zPolygon::GetPosition()'],['../classzen_1_1obj_1_1z_entity.html#af6802dca2ddf3532e4e6648ef416e77c',1,'zen::obj::zEntity::GetPosition()']]], ['getprojectionmatrix',['GetProjectionMatrix',['../classzen_1_1gfxcore_1_1z_renderer.html#a1e101eb52b27cb1f4d37a30f1bce6c14',1,'zen::gfxcore::zRenderer::GetProjectionMatrix()'],['../classzen_1_1gfx_1_1z_window.html#ac5d44160b572c687abf1d76be0c30ebc',1,'zen::gfx::zWindow::GetProjectionMatrix()']]], + ['getrate',['GetRate',['../classg_bullet.html#a910af94772488e88054a93143aaccdb8',1,'gBullet']]], ['getresultcount',['GetResultCount',['../classzen_1_1util_1_1z_file_parser.html#a9758037437c028ded13fd2462e5e22e5',1,'zen::util::zFileParser']]], ['getresults',['GetResults',['../classzen_1_1util_1_1z_file_parser.html#a9a30a5210c76a64ecd7e131b885c481b',1,'zen::util::zFileParser']]], ['getshaderlog',['GetShaderLog',['../classzen_1_1gfxcore_1_1z_shader.html#a4863dc27c0c73c12730178572b441cdd',1,'zen::gfxcore::zShader']]], @@ -79,15 +81,16 @@ var searchData= ['getverticesfromgpu',['GetVerticesFromGPU',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a3d368e58af1958da194c5c85e7086285',1,'zen::gfxcore::zVertexArray']]], ['getw',['GetW',['../classzen_1_1gfx_1_1z_polygon.html#ad9810bdc85ac5ccb72b0e07880b075b7',1,'zen::gfx::zPolygon::GetW()'],['../classzen_1_1obj_1_1z_entity.html#a2ca996948f259af706995c06267a4bb8',1,'zen::obj::zEntity::GetW()']]], ['getwidth',['GetWidth',['../classzen_1_1gfxcore_1_1z_texture.html#a23cb398f680bd7dd2f4a7451207469e5',1,'zen::gfxcore::zTexture::GetWidth()'],['../classzen_1_1gfx_1_1z_render_target.html#a4a502b9d08550f6cf41f106b85880686',1,'zen::gfx::zRenderTarget::GetWidth()'],['../classzen_1_1gfx_1_1z_scene.html#a894be27d94edac743016a8db6af64e6b',1,'zen::gfx::zScene::GetWidth()'],['../classzen_1_1gfx_1_1z_window.html#ad90088168177bb1e68dd531405b76a2a',1,'zen::gfx::zWindow::GetWidth()']]], - ['getx',['GetX',['../classzen_1_1gfx_1_1z_polygon.html#a232d4b4224a1cc30f34c6a56f4d1e1a7',1,'zen::gfx::zPolygon::GetX()'],['../classzen_1_1obj_1_1z_entity.html#aec6363ad5d3af581c4759ad8d68c43c6',1,'zen::obj::zEntity::GetX()']]], - ['gety',['GetY',['../classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe',1,'zen::gfx::zPolygon::GetY()'],['../classzen_1_1obj_1_1z_entity.html#a903736be5f221a26c27505daa4c92854',1,'zen::obj::zEntity::GetY()']]], + ['getx',['GetX',['../classzen_1_1gfx_1_1z_polygon.html#a232d4b4224a1cc30f34c6a56f4d1e1a7',1,'zen::gfx::zPolygon::GetX()'],['../classzen_1_1obj_1_1z_entity.html#aec6363ad5d3af581c4759ad8d68c43c6',1,'zen::obj::zEntity::GetX()'],['../classg_bullet.html#a494c1047a643846d40f577bccb7bf773',1,'gBullet::GetX()']]], + ['gety',['GetY',['../classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe',1,'zen::gfx::zPolygon::GetY()'],['../classzen_1_1obj_1_1z_entity.html#a903736be5f221a26c27505daa4c92854',1,'zen::obj::zEntity::GetY()'],['../classg_bullet.html#a40c02599fddd70e6a7589275bd044e6a',1,'gBullet::GetY()']]], ['gl',['GL',['../group___core_graphics.html#gadd7e49d426171a52326fe77251d93c3d',1,'OpenGL.hpp']]], ['glcheck',['glCheck',['../namespacezen_1_1gfxcore.html#ae4533b6d5c7873ea5ba0de62ad7af968',1,'zen::gfxcore']]], - ['glyph_5ft',['glyph_t',['../namespacezen.html#structzen_1_1glyph__t',1,'zen']]], ['glyph_5ft',['glyph_t',['../namespacezen_1_1gui.html#structzen_1_1gui_1_1glyph__t',1,'zen::gui']]], + ['glyph_5ft',['glyph_t',['../namespacezen.html#structzen_1_1glyph__t',1,'zen']]], ['graphics',['Graphics',['../group___graphics.html',1,'']]], ['grave',['GRAVE',['../_keyboard_8hpp.html#ad6624cec5fef7fc3b98133caf7752578',1,'Keyboard.hpp']]], ['grayscale',['GRAYSCALE',['../_effect_8hpp.html#acfc17ee54296caaf8b57003b3a7f8642',1,'Effect.hpp']]], ['grayscale_5ffs',['GRAYSCALE_FS',['../namespacezen_1_1gfxcore.html#a6ed0ba359a7aa57cb8d3cb87ab66d509',1,'zen::gfxcore']]], - ['gui',['GUI',['../group___g_u_i.html',1,'']]] + ['gui',['GUI',['../group___g_u_i.html',1,'']]], + ['gworld',['gWorld',['../classg_world.html',1,'gWorld'],['../classg_world.html#a91c2f296e6096c352eee81e10e2e6b4a',1,'gWorld::gWorld()']]] ]; diff --git a/docs/search/all_68.js b/docs/search/all_68.js index 696aff57..13751bd4 100644 --- a/docs/search/all_68.js +++ b/docs/search/all_68.js @@ -2,7 +2,7 @@ var searchData= [ ['h',['h',['../structzen_1_1math_1_1rect__t.html#a66306e9a93c9761fbaf5f607f19bb711',1,'zen::math::rect_t::h()'],['../_keyboard_8hpp.html#afaafc315b95987fc2b071bcd8f698b81',1,'H(): Keyboard.hpp']]], ['h_5flen',['h_len',['../namespacezen_1_1net.html#aa4d7a7fba6a839a35be30379335b972f',1,'zen::net::IPHeader']]], - ['handleevent',['HandleEvent',['../classzen_1_1gui_1_1z_menu.html#a32705a29a503823e30e0de126de32080',1,'zen::gui::zMenu']]], + ['handleevent',['HandleEvent',['../classzen_1_1gui_1_1z_menu.html#a32705a29a503823e30e0de126de32080',1,'zen::gui::zMenu::HandleEvent()'],['../classg_world.html#aa7665b4e000c72b337b6db1abd03097f',1,'gWorld::HandleEvent()']]], ['hash',['hash',['../namespacezen_1_1util.html#a3b73b2608dcb520f9cfc549406b602f1',1,'zen::util']]], ['helpers_2ecpp',['Helpers.cpp',['../_helpers_8cpp.html',1,'']]], ['helpers_2ehpp',['Helpers.hpp',['../_helpers_8hpp.html',1,'']]], diff --git a/docs/search/all_69.js b/docs/search/all_69.js index 0345b63c..cc0ac8d9 100644 --- a/docs/search/all_69.js +++ b/docs/search/all_69.js @@ -22,6 +22,7 @@ var searchData= ['insert',['INSERT',['../_keyboard_8hpp.html#a7413a7bd185dd81a3b5df334bc212303',1,'Keyboard.hpp']]], ['insertentity',['InsertEntity',['../classzen_1_1gfx_1_1z_scene.html#a1da8d9bef43e37b34a302faa35a986ba',1,'zen::gfx::zScene']]], ['invert',['Invert',['../classzen_1_1obj_1_1z_entity.html#a5feabee3a6c74a9cb4c75dff978d4752',1,'zen::obj::zEntity']]], + ['invisible',['INVISIBLE',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842a5fb351568336ebb294804f81e3c8663d',1,'zen::lvl::zLevelLoader']]], ['ipheader',['IPHeader',['../namespacezen_1_1net.html#structzen_1_1net_1_1_i_p_header',1,'zen::net']]], ['is_5fenabled',['IS_ENABLED',['../_renderer_8hpp.html#a697fb96c0a5b3fe358e31b57a15db586',1,'Renderer.hpp']]], ['isfullscreen',['IsFullscreen',['../classzen_1_1gfx_1_1z_window.html#afc51d4cfd5d173b332591c1237a15014',1,'zen::gfx::zWindow']]], @@ -30,5 +31,6 @@ var searchData= ['ismodifiable',['IsModifiable',['../classzen_1_1gfx_1_1z_polygon.html#ad957c880eed742790fb244ddf42c54d6',1,'zen::gfx::zPolygon']]], ['isopen',['IsOpen',['../classzen_1_1gfx_1_1z_window.html#abcb441d17f9b7bd2f3d1ce72c6e8d356',1,'zen::gfx::zWindow']]], ['isover',['IsOver',['../classzen_1_1gui_1_1z_button.html#a2ff8c3d62f78a67ccd18a9cd04e723f8',1,'zen::gui::zButton::IsOver(const math::vector_t &Pos)'],['../classzen_1_1gui_1_1z_button.html#a9459ec702c9ea16899626e34a01ed9d1',1,'zen::gui::zButton::IsOver(const math::rect_t &Box)']]], - ['isvalidentityindex',['IsValidEntityIndex',['../classzen_1_1gfx_1_1z_scene.html#ad38c58aba5fc0fd4c5d6db43a6befa6b',1,'zen::gfx::zScene']]] + ['isvalidentityindex',['IsValidEntityIndex',['../classzen_1_1gfx_1_1z_scene.html#ad38c58aba5fc0fd4c5d6db43a6befa6b',1,'zen::gfx::zScene']]], + ['item_5fspawn',['ITEM_SPAWN',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8aa88073cc0d7023b0889799817211b0859',1,'zen::lvl']]] ]; diff --git a/docs/search/all_6c.js b/docs/search/all_6c.js index f98411b0..02f28fa1 100644 --- a/docs/search/all_6c.js +++ b/docs/search/all_6c.js @@ -9,13 +9,17 @@ var searchData= ['left_5fsuper',['LEFT_SUPER',['../_keyboard_8hpp.html#a3b015542a847d2fc3b9ee501073538df',1,'Keyboard.hpp']]], ['lerp',['lerp',['../namespacezen_1_1math.html#aa04e1aca8290a6b0ee2b2ecc5ae2301e',1,'zen::math::lerp(const T &Start, const T &End, real_t weight)'],['../namespacezen_1_1math.html#a11a2003de96579faca9c94a27a66fc0c',1,'zen::math::lerp(const T &Start, const T &End, real_t weight)'],['../_math_core_8inl.html#a9119e0badd313a0af4d0a8be2591709c',1,'lerp(): MathCore.inl']]], ['level_2ehpp',['Level.hpp',['../_level_8hpp.html',1,'']]], + ['level_5fpath',['LEVEL_PATH',['../_level_test_8cpp.html#a833ae233ed0529bd108096453975af7b',1,'LevelTest.cpp']]], ['level_5ft',['level_t',['../namespacezen_1_1lvl.html#structzen_1_1lvl_1_1level__t',1,'zen::lvl']]], ['levelloader_2ehpp',['LevelLoader.hpp',['../_level_loader_8hpp.html',1,'']]], ['levels',['Levels',['../group___levels.html',1,'']]], + ['leveltest_2ecpp',['LevelTest.cpp',['../_level_test_8cpp.html',1,'']]], ['light_2ecpp',['Light.cpp',['../_light_8cpp.html',1,'']]], ['light_2ehpp',['Light.hpp',['../_light_8hpp.html',1,'']]], ['lights',['lights',['../namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39',1,'zen::lvl::level_t']]], ['lightset_5ft',['LightSet_t',['../namespacezen_1_1gfx.html#a22b39898b86d8171befa77c3fd16a10c',1,'zen::gfx']]], + ['line1',['line1',['../structzen_1_1math_1_1cquery__t.html#a520a1e7d3d94d630d9f8e7ef69fda72a',1,'zen::math::cquery_t']]], + ['line2',['line2',['../structzen_1_1math_1_1cquery__t.html#adb33e9eab6670832dadc0303fef776fa',1,'zen::math::cquery_t']]], ['line_5ft',['line_t',['../namespacezen_1_1math.html#abda8e557abe05d9768b9da6f8470ebe5',1,'zen::math']]], ['loadeffect',['LoadEffect',['../classzen_1_1gfx_1_1z_material.html#a4cbfde3e3944b735e9e67a4b55fe7594',1,'zen::gfx::zMaterial']]], ['loadfile',['LoadFile',['../classzen_1_1lua_1_1z_lua.html#a1290dc44571f305c4f007598653f180f',1,'zen::lua::zLua']]], @@ -25,11 +29,12 @@ var searchData= ['loadfromfile',['LoadFromFile',['../classzen_1_1asset_1_1z_asset.html#a6648910c3da736572071300ddac7dae2',1,'zen::asset::zAsset::LoadFromFile()'],['../classzen_1_1sfx_1_1z_audio2_d.html#a22e3a275687da414246c9cdcb419932f',1,'zen::sfx::zAudio2D::LoadFromFile()'],['../classzen_1_1sfx_1_1z_music2_d.html#afe2b58376246241018bfc95d57234c8a',1,'zen::sfx::zMusic2D::LoadFromFile()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#a1ddd9fd90ee82b85d46a6d21bd09a503',1,'zen::sfx::CSound2D::LoadFromFile()'],['../classzen_1_1gfxcore_1_1z_shader.html#a2a86ee7e7602b7d29c0556f9b7212fde',1,'zen::gfxcore::zShader::LoadFromFile()'],['../classzen_1_1gfxcore_1_1z_shader_set.html#a5d423c6aa3ea56a99d8b6957ac2a888e',1,'zen::gfxcore::zShaderSet::LoadFromFile()'],['../classzen_1_1gfxcore_1_1z_texture.html#ab13cf970986b01c8ec336ee6482de664',1,'zen::gfxcore::zTexture::LoadFromFile()'],['../classzen_1_1gfx_1_1z_material.html#a4bc7f7cf0e7d5b50a2b6c3bb16a50d5a',1,'zen::gfx::zMaterial::LoadFromFile()'],['../classzen_1_1gui_1_1z_font.html#a2ff0c9cff415a035b0e38855d7c25cc5',1,'zen::gui::zFont::LoadFromFile()'],['../classzen_1_1gui_1_1_c_font_atlas.html#ad8f2bab0ba9424845c7a6dabade8d4a8',1,'zen::gui::CFontAtlas::LoadFromFile()'],['../classzen_1_1lvl_1_1z_level_loader.html#abbdb81078346ea39b698975ff9b77c59',1,'zen::lvl::zLevelLoader::LoadFromFile()'],['../classzen_1_1obj_1_1z_animation.html#adcba40fcbe415c8fc02eeebdc63f63ff',1,'zen::obj::zAnimation::LoadFromFile()'],['../classzen_1_1obj_1_1z_entity.html#a12daa37cf2b47890da2540c5d0997f9b',1,'zen::obj::zEntity::LoadFromFile()'],['../classzen_1_1util_1_1z_file_parser.html#a4125da033c5afa59c8987fa74e0b0d60',1,'zen::util::zFileParser::LoadFromFile()'],['../classzen_1_1util_1_1z_parser.html#a047531e22d4a7c024082696156a15333',1,'zen::util::zParser::LoadFromFile()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#a2321daa3ee66d147209c094a87bb3f30',1,'zen::util::zXMLParser::LoadFromFile()']]], ['loadfromraw',['LoadFromRaw',['../classzen_1_1gfxcore_1_1z_shader.html#afc778e41ce5536481c3c727037b2f7ec',1,'zen::gfxcore::zShader::LoadFromRaw()'],['../classzen_1_1gfxcore_1_1z_texture.html#a34ce25f6efa6199e516aa7114f0f7c6c',1,'zen::gfxcore::zTexture::LoadFromRaw()']]], ['loadfromstr',['LoadFromStr',['../classzen_1_1gfxcore_1_1z_shader_set.html#ab57defd932dfa4192221fcea6bbf25ed',1,'zen::gfxcore::zShaderSet']]], - ['loadfromstream',['LoadFromStream',['../classzen_1_1gfx_1_1z_material.html#a767c6590268bef4eec587e49abe91116',1,'zen::gfx::zMaterial::LoadFromStream()'],['../classzen_1_1util_1_1z_file_parser.html#adeb9b19a83a1a6c2827a036318d9c209',1,'zen::util::zFileParser::LoadFromStream()'],['../classzen_1_1util_1_1z_parser.html#a3b51640e20788ab80f4933daa552f5ef',1,'zen::util::zParser::LoadFromStream(std::ifstream &file, const std::streampos &start=0, const std::streampos &finish=-1, const char *fn="file")'],['../classzen_1_1util_1_1z_parser.html#a9aa89d42ab16b1c8710d288b40a09cb8',1,'zen::util::zParser::LoadFromStream(const char **str, const uint32_t start, const uint32_t finish)']]], - ['loadfromstreamuntil',['LoadFromStreamUntil',['../classzen_1_1util_1_1z_file_parser.html#a6ca2fe02ff85919a2c76dfb4445fc62d',1,'zen::util::zFileParser']]], + ['loadfromstream',['LoadFromStream',['../classzen_1_1gfx_1_1z_material.html#a767c6590268bef4eec587e49abe91116',1,'zen::gfx::zMaterial::LoadFromStream()'],['../classzen_1_1util_1_1z_file_parser.html#a264a42f7c8879c34710f15a31a639bae',1,'zen::util::zFileParser::LoadFromStream()'],['../classzen_1_1util_1_1z_parser.html#a3b51640e20788ab80f4933daa552f5ef',1,'zen::util::zParser::LoadFromStream(std::ifstream &file, const std::streampos &start=0, const std::streampos &finish=-1, const char *fn="file")'],['../classzen_1_1util_1_1z_parser.html#a9aa89d42ab16b1c8710d288b40a09cb8',1,'zen::util::zParser::LoadFromStream(const char **str, const uint32_t start, const uint32_t finish)']]], + ['loadfromstreamuntil',['LoadFromStreamUntil',['../classzen_1_1util_1_1z_file_parser.html#a8a8e702d15b655d041d949830ca43527',1,'zen::util::zFileParser']]], ['loadfromstring',['LoadFromString',['../classzen_1_1util_1_1z_x_m_l_parser.html#a0b8ed96d2152a22feefd68cb98b7ba7d',1,'zen::util::zXMLParser']]], ['loadfromtexture',['LoadFromTexture',['../classzen_1_1obj_1_1z_animation.html#a8d9a58895fbc85d08a940d82eb0c156a',1,'zen::obj::zAnimation::LoadFromTexture()'],['../classzen_1_1obj_1_1z_entity.html#aad6f5bd0a5e765f0082b3fbd253b1f68',1,'zen::obj::zEntity::LoadFromTexture()']]], ['loadintovao',['LoadIntoVAO',['../classzen_1_1gfx_1_1z_polygon.html#a8477362b059957c20edb7dfe4ff04fd9',1,'zen::gfx::zPolygon']]], + ['loadlevel',['LoadLevel',['../classg_world.html#a49e59b401c95d16de2f2db26450d0ebf',1,'gWorld']]], ['loadtexture',['LoadTexture',['../classzen_1_1gfx_1_1z_material.html#ad2efdd2bd417020f5044d40a81cd7db2',1,'zen::gfx::zMaterial']]], ['loadtexturefromfile',['LoadTextureFromFile',['../classzen_1_1gfx_1_1z_material.html#aceadc7675f220a26dc57ac615ee8a856',1,'zen::gfx::zMaterial']]], ['loadtexturefromhandle',['LoadTextureFromHandle',['../classzen_1_1gfx_1_1z_material.html#ac77e0edd9c6d88159dea61fe382e912b',1,'zen::gfx::zMaterial']]], @@ -38,7 +43,7 @@ var searchData= ['log_2ecpp',['Log.cpp',['../_log_8cpp.html',1,'']]], ['log_2ehpp',['Log.hpp',['../_log_8hpp.html',1,'']]], ['log_2einl',['Log.inl',['../_log_8inl.html',1,'']]], - ['lua_2ehpp',['lua.hpp',['../_external_2lua_2lua_8hpp.html',1,'']]], ['lua_2ehpp',['Lua.hpp',['../_scripting_2lua_8hpp.html',1,'']]], + ['lua_2ehpp',['lua.hpp',['../_external_2lua_2lua_8hpp.html',1,'']]], ['lualibs_5ft',['luaLibs_t',['../namespacezen_1_1lua.html#a57ac6f8212288a7e3d198eee356a93b6',1,'zen::lua']]] ]; diff --git a/docs/search/all_6d.js b/docs/search/all_6d.js index f4c98070..328198ae 100644 --- a/docs/search/all_6d.js +++ b/docs/search/all_6d.js @@ -32,9 +32,9 @@ var searchData= ['m_5ftris',['m_Tris',['../classzen_1_1gfx_1_1z_polygon.html#a026724ee199a2350542cda402d981a25',1,'zen::gfx::zPolygon']]], ['m_5fverts',['m_Verts',['../classzen_1_1gfx_1_1z_polygon.html#a25865c535603d9bb9e3b39dbd60e1612',1,'zen::gfx::zPolygon']]], ['magnitude',['Magnitude',['../structzen_1_1math_1_1z_vector.html#ac9ca9cc5adb430ec34306df49e0ff17c',1,'zen::math::zVector']]], - ['main',['main',['../_pong_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4',1,'Pong.cpp']]], - ['main1',['main1',['../_collision_test_8cpp.html#a8006ac13983b83591702d97d584fc0eb',1,'CollisionTest.cpp']]], - ['main2',['main2',['../_engine_test_8cpp.html#a75c2e94360fa8e46050b4f66fe444d6b',1,'EngineTest.cpp']]], + ['main',['main',['../_level_test_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97',1,'LevelTest.cpp']]], + ['main1',['main1',['../_pong_8cpp.html#a8006ac13983b83591702d97d584fc0eb',1,'Pong.cpp']]], + ['main2',['main2',['../_collision_test_8cpp.html#a0e663f52efbc8593793d628b4259ce9b',1,'main2(): CollisionTest.cpp'],['../_engine_test_8cpp.html#a75c2e94360fa8e46050b4f66fe444d6b',1,'main2(int argc, char *argv[]): EngineTest.cpp']]], ['make_5fball',['make_ball',['../_pong_8cpp.html#a98a1b5ac138d1987c46cd622078b22a1',1,'Pong.cpp']]], ['maptexcoords',['MapTexCoords',['../classzen_1_1gfx_1_1z_polygon.html#aa2df331795d72f7554bba150831c332a',1,'zen::gfx::zPolygon']]], ['material_2ecpp',['Material.cpp',['../_material_8cpp.html',1,'']]], diff --git a/docs/search/all_6e.js b/docs/search/all_6e.js index 96a27c1e..93cf6fcc 100644 --- a/docs/search/all_6e.js +++ b/docs/search/all_6e.js @@ -5,7 +5,7 @@ var searchData= ['network',['Network',['../group___network.html',1,'']]], ['nine',['NINE',['../_keyboard_8hpp.html#ad55f564ff7fc61ce422a41d50b47244f',1,'Keyboard.hpp']]], ['no_5feffect',['NO_EFFECT',['../_effect_8hpp.html#a3b793e2413dfb01ad00980cec0fd235e',1,'Effect.hpp']]], - ['none',['NONE',['../_event_8hpp.html#a899caa602e4fff675b17cdbab33607ec',1,'Event.hpp']]], + ['none',['NONE',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842ab50339a10e1de285ac99d4c3990b8693',1,'zen::lvl::zLevelLoader::NONE()'],['../_event_8hpp.html#a899caa602e4fff675b17cdbab33607ec',1,'NONE(): Event.hpp']]], ['normalize',['Normalize',['../structzen_1_1math_1_1z_vector.html#abe201e8065219b1747357e0ec0a472b9',1,'zen::math::zVector']]], ['num_5flock',['NUM_LOCK',['../_keyboard_8hpp.html#a58dfa3f430ad8c640fb37d32b56bd28f',1,'Keyboard.hpp']]] ]; diff --git a/docs/search/all_70.js b/docs/search/all_70.js index a5560d8b..9a06dfb3 100644 --- a/docs/search/all_70.js +++ b/docs/search/all_70.js @@ -11,12 +11,16 @@ var searchData= ['pause',['PAUSE',['../_keyboard_8hpp.html#ab18e6799e81de4f37123f91bda4f760b',1,'Keyboard.hpp']]], ['period',['PERIOD',['../_keyboard_8hpp.html#a260b2983ea6ece4b2a69b3849f3a3564',1,'Keyboard.hpp']]], ['pfnwglswapintervalfarproc',['PFNWGLSWAPINTERVALFARPROC',['../_window_8cpp.html#a81af93c1ee0952eb0254c259125970f5',1,'Window.cpp']]], + ['physical',['PHYSICAL',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842afbefe3f2370fe150be6f4d42f8cc4d4c',1,'zen::lvl::zLevelLoader::PHYSICAL()'],['../namespacezen_1_1lvl.html#ad7d3e124aedb66291a07f84ca038391d',1,'zen::lvl::level_t::physical()']]], ['physics_2ehpp',['Physics.hpp',['../_physics_8hpp.html',1,'']]], ['pi',['PI',['../namespacezen_1_1math.html#a9a46d34acc67aa893188fa4feacb9394',1,'zen::math']]], ['ping',['Ping',['../classzen_1_1net_1_1z_socket.html#a43512a4f649cf12ca0af55fbbc9337e7',1,'zen::net::zSocket::Ping()'],['../_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155ae07ff41a486c27c095a15898dcca34d1',1,'PING(): Pong.cpp']]], ['place',['Place',['../classzen_1_1gui_1_1z_button.html#a7241adecac3cf81a29df42e870850399',1,'zen::gui::zButton::Place(const math::vector_t &Pos)'],['../classzen_1_1gui_1_1z_button.html#a7cf249af545e480707c3717fe36b4e06',1,'zen::gui::zButton::Place(const real_t x, const real_t y)']]], ['play',['Play',['../classzen_1_1sfx_1_1z_audio2_d.html#a3ea7b7d916c700b9e6310a1fd2a512d7',1,'zen::sfx::zAudio2D::Play()'],['../classzen_1_1sfx_1_1z_music2_d.html#a17b63a4e572735c9cf100e2b64f5ad25',1,'zen::sfx::zMusic2D::Play()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#aa581f26e77c034a058ba3dfc4ebcbca7',1,'zen::sfx::CSound2D::Play()']]], ['playanimation',['PlayAnimation',['../classzen_1_1obj_1_1z_animation.html#a64d58d1759855bbf4d673b1b6ed4c1f6',1,'zen::obj::zAnimation']]], + ['player_5fspawn',['PLAYER_SPAWN',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8aaefeaff06f16214cf788e86a06c8d8c5b',1,'zen::lvl']]], + ['playing',['Playing',['../classzen_1_1obj_1_1z_animation.html#adfa021b895a6673393ac751286500f40',1,'zen::obj::zAnimation']]], + ['point',['point',['../structzen_1_1math_1_1cquery__t.html#a70b5263e947f4120540dcd6cd167f89d',1,'zen::math::cquery_t']]], ['pointlight_5ffs',['POINTLIGHT_FS',['../namespacezen_1_1gfxcore.html#a4b4908de8dd4b422ecc0f2fb77f80713',1,'zen::gfxcore']]], ['pollevents',['PollEvents',['../classzen_1_1evt_1_1z_event_handler.html#a40db94c470b9c7408345cf68c3f5103d',1,'zen::evt::zEventHandler']]], ['polygon_2ecpp',['Polygon.cpp',['../_polygon_8cpp.html',1,'']]], diff --git a/docs/search/all_72.js b/docs/search/all_72.js index 1ef90c9a..d795c24d 100644 --- a/docs/search/all_72.js +++ b/docs/search/all_72.js @@ -14,8 +14,9 @@ var searchData= ['recvfrom',['RecvFrom',['../classzen_1_1net_1_1z_socket.html#a24fbcc65908ca3ea2e8c9ca3e3c301dd',1,'zen::net::zSocket']]], ['reload',['Reload',['../classzen_1_1asset_1_1z_asset.html#a2b9bcd7e17eb9c1de704124106bd96ba',1,'zen::asset::zAsset']]], ['removeentity',['RemoveEntity',['../classzen_1_1gfx_1_1z_scene.html#a20048957053138cc366344e16c614561',1,'zen::gfx::zScene::RemoveEntity(const obj::zEntity &Obj)'],['../classzen_1_1gfx_1_1z_scene.html#ad3636d08d2f1492469b8af350d0b6062',1,'zen::gfx::zScene::RemoveEntity(const uint32_t index)']]], + ['removelight',['RemoveLight',['../classzen_1_1gfx_1_1z_scene.html#ace7ecda0222bcc628b4d1e548fbafb7f',1,'zen::gfx::zScene']]], ['removematerial',['RemoveMaterial',['../classzen_1_1gfx_1_1z_polygon.html#a1e58cf0134e0693790713f7791f2d736',1,'zen::gfx::zPolygon']]], - ['render',['Render',['../classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1',1,'zen::gfx::zScene::Render()'],['../classzen_1_1gui_1_1z_font.html#a7727aa647d1a37a921cc0b03c20079f9',1,'zen::gui::zFont::Render(obj::zEntity &Ent, const string_t &text="") const '],['../classzen_1_1gui_1_1z_font.html#a3a8c98b442728bb8476d37957e03faff',1,'zen::gui::zFont::Render(gfxcore::zTexture &Texture, const string_t &text="") const '],['../classzen_1_1gui_1_1_c_font_atlas.html#ac99e1f56b7dc051e8ad7573fb4eeeff5',1,'zen::gui::CFontAtlas::Render()']]], + ['render',['Render',['../classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1',1,'zen::gfx::zScene::Render()'],['../classzen_1_1gui_1_1z_font.html#a7727aa647d1a37a921cc0b03c20079f9',1,'zen::gui::zFont::Render(obj::zEntity &Ent, const string_t &text="") const '],['../classzen_1_1gui_1_1z_font.html#a3a8c98b442728bb8476d37957e03faff',1,'zen::gui::zFont::Render(gfxcore::zTexture &Texture, const string_t &text="") const '],['../classzen_1_1gui_1_1_c_font_atlas.html#ac99e1f56b7dc051e8ad7573fb4eeeff5',1,'zen::gui::CFontAtlas::Render()'],['../classg_world.html#aa9ee395a82e26050fe1c39c542d264e2',1,'gWorld::Render()']]], ['renderer_2ecpp',['Renderer.cpp',['../_renderer_8cpp.html',1,'']]], ['renderer_2ehpp',['Renderer.hpp',['../_renderer_8hpp.html',1,'']]], ['renderer_2einl',['Renderer.inl',['../_renderer_8inl.html',1,'']]], @@ -27,6 +28,7 @@ var searchData= ['resetstack',['ResetStack',['../classzen_1_1lua_1_1z_lua.html#a951435920c5a01e940c2d7f142a73355',1,'zen::lua::zLua']]], ['resize',['Resize',['../classzen_1_1gfx_1_1z_quad.html#aa18ef578cfc4552effe995fa42e7ce59',1,'zen::gfx::zQuad::Resize(const math::vectoru16_t &Size)'],['../classzen_1_1gfx_1_1z_quad.html#aecfed1edd9f86fdd22522ac869cae5a2',1,'zen::gfx::zQuad::Resize(const uint16_t w, const uint16_t h)']]], ['resulttobool',['ResultToBool',['../classzen_1_1util_1_1z_file_parser.html#a7c4a7903e417cd09b31fae28c95310b8',1,'zen::util::zFileParser']]], + ['rgb2f',['rgb2f',['../_level_test_8cpp.html#a70a9344ab32a2cccf328642eeab901ae',1,'LevelTest.cpp']]], ['right',['RIGHT',['../_keyboard_8hpp.html#a2d192e0d040aa72b0c0e855aaf9462e5',1,'RIGHT(): Keyboard.hpp'],['../_mouse_8hpp.html#a2d192e0d040aa72b0c0e855aaf9462e5',1,'RIGHT(): Mouse.hpp']]], ['right_5falt',['RIGHT_ALT',['../_keyboard_8hpp.html#ab8c38a731ec2736ffe944e4567f9bfca',1,'Keyboard.hpp']]], ['right_5fbracket',['RIGHT_BRACKET',['../_keyboard_8hpp.html#a22c5d46a0f7b1239f4ac9839841b3cef',1,'Keyboard.hpp']]], diff --git a/docs/search/all_73.js b/docs/search/all_73.js index b2f37dac..848b67a3 100644 --- a/docs/search/all_73.js +++ b/docs/search/all_73.js @@ -21,9 +21,9 @@ var searchData= ['setbrightness',['SetBrightness',['../classzen_1_1gfx_1_1z_light.html#a750b1a6baa892c3bd28c45492a58264d',1,'zen::gfx::zLight']]], ['setbuttonbackground',['SetButtonBackground',['../classzen_1_1gui_1_1z_menu.html#a65aaa3ba87a307ec7e6283a748781a9a',1,'zen::gui::zMenu']]], ['setclearbits',['SetClearBits',['../classzen_1_1gfx_1_1z_window.html#ad87b007c5fddb450c018f6a903d62798',1,'zen::gfx::zWindow']]], - ['setcolor',['SetColor',['../classzen_1_1gfx_1_1z_light.html#a88e3dfd6578acaf653f7f40a585ee892',1,'zen::gfx::zLight::SetColor(const real_t r, const real_t g, const real_t b)'],['../classzen_1_1gfx_1_1z_light.html#adb22c549ade469685f1d5be629467ec5',1,'zen::gfx::zLight::SetColor(const color3f_t &Color)'],['../classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3',1,'zen::gfx::zPolygon::SetColor()'],['../classzen_1_1gui_1_1z_font.html#a8cd1236470fb602bbe20237a8a44398b',1,'zen::gui::zFont::SetColor()'],['../classzen_1_1gui_1_1_c_font_atlas.html#a2002aee613a3edc0014ebbe7fdc5bc42',1,'zen::gui::CFontAtlas::SetColor()']]], + ['setcolor',['SetColor',['../classzen_1_1gfx_1_1z_light.html#a88e3dfd6578acaf653f7f40a585ee892',1,'zen::gfx::zLight::SetColor(const real_t r, const real_t g, const real_t b)'],['../classzen_1_1gfx_1_1z_light.html#adb22c549ade469685f1d5be629467ec5',1,'zen::gfx::zLight::SetColor(const color3f_t &Color)'],['../classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3',1,'zen::gfx::zPolygon::SetColor(const color4f_t &Color)'],['../classzen_1_1gfx_1_1z_polygon.html#a23ad8a42c4b82114209ee864c5be873e',1,'zen::gfx::zPolygon::SetColor(const real_t r, const real_t g, const real_t b, const real_t a=1.0)'],['../classzen_1_1gui_1_1z_font.html#a8cd1236470fb602bbe20237a8a44398b',1,'zen::gui::zFont::SetColor(const color4f_t &Color)'],['../classzen_1_1gui_1_1z_font.html#aabe8618c807f1830296c293387a07f95',1,'zen::gui::zFont::SetColor(const real_t r, const real_t g, const real_t b)'],['../classzen_1_1gui_1_1_c_font_atlas.html#a2002aee613a3edc0014ebbe7fdc5bc42',1,'zen::gui::CFontAtlas::SetColor()']]], ['setdefault',['SetDefault',['../classzen_1_1gui_1_1z_button.html#a5652cc6a2b8ff9ea9a365260a8eb0898',1,'zen::gui::zButton']]], - ['setdepth',['SetDepth',['../classzen_1_1obj_1_1z_entity.html#acaf234556b4960422bc2a6882667767e',1,'zen::obj::zEntity']]], + ['setdepth',['SetDepth',['../classzen_1_1obj_1_1z_entity.html#a0c553e6ddb51ebc2b3bf321e92e61aea',1,'zen::obj::zEntity']]], ['setfilename',['SetFilename',['../classzen_1_1asset_1_1z_asset.html#a272c6b1163fad9b7aa5df9192ab862dc',1,'zen::asset::zAsset::SetFilename()'],['../classzen_1_1util_1_1z_log.html#a5d6771fbef7425b8c39a58ceba171720',1,'zen::util::zLog::SetFilename()']]], ['setfont',['SetFont',['../classzen_1_1gui_1_1z_button.html#ab4be21f09c996b8c247c24c3c1611443',1,'zen::gui::zButton::SetFont()'],['../classzen_1_1gui_1_1z_menu.html#a453ad6ebe7f7c78f32e8d532f926998f',1,'zen::gui::zMenu::SetFont()']]], ['setframerate',['SetFrameRate',['../classzen_1_1util_1_1z_timer.html#a16ae82c520a4e872a25c64036df458d2',1,'zen::util::zTimer']]], @@ -32,7 +32,7 @@ var searchData= ['setinverted',['SetInverted',['../classzen_1_1gfx_1_1z_quad.html#a432e755f175068c7e354053a37ac2365',1,'zen::gfx::zQuad']]], ['setkeyframecount',['SetKeyframeCount',['../classzen_1_1obj_1_1z_animation.html#af9f2e332f17dbe5bddd6e507549c6dd7',1,'zen::obj::zAnimation']]], ['setkeyframerate',['SetKeyframeRate',['../classzen_1_1obj_1_1z_animation.html#a7622374cda2d6d88bc9e2bcfafb7275b',1,'zen::obj::zAnimation']]], - ['setkeyframesize',['SetKeyframeSize',['../classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07',1,'zen::obj::zAnimation::SetKeyframeSize(const math::vectoru16_t &Size)'],['../classzen_1_1obj_1_1z_animation.html#a45db59d983ba8e5ff681fe2757f901bc',1,'zen::obj::zAnimation::SetKeyframeSize(const uint16_t w, const uint16_t h)']]], + ['setkeyframesize',['SetKeyframeSize',['../classzen_1_1obj_1_1z_animation.html#a33cd5b24da0db101668b121f47de4538',1,'zen::obj::zAnimation::SetKeyframeSize(const uint16_t w, const uint16_t h)'],['../classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07',1,'zen::obj::zAnimation::SetKeyframeSize(const math::vectoru16_t &Size)']]], ['setlog',['SetLog',['../classzen_1_1z_subsystem.html#ad7382150f00b99910c5c9bb63a95e299',1,'zen::zSubsystem']]], ['setmaximumangle',['SetMaximumAngle',['../classzen_1_1gfx_1_1z_light.html#ad0c225879baccdb81db9206d0350d269',1,'zen::gfx::zLight']]], ['setminimumangle',['SetMinimumAngle',['../classzen_1_1gfx_1_1z_light.html#a2bb6a384afd9f987ae7cbefca7bd4206',1,'zen::gfx::zLight']]], @@ -43,6 +43,7 @@ var searchData= ['setowner',['SetOwner',['../classzen_1_1asset_1_1z_asset.html#ada0c2746ec40b6dfdfc3fe168593ab1c',1,'zen::asset::zAsset']]], ['setparameter',['SetParameter',['../classzen_1_1gfx_1_1z_effect.html#a721e306846c082f43701117d0a579946',1,'zen::gfx::zEffect::SetParameter(const string_t &name, const real_t *pValues, const size_t count=1)'],['../classzen_1_1gfx_1_1z_effect.html#a5b71503a8e29079d927478bfe976b454',1,'zen::gfx::zEffect::SetParameter(const string_t &name, const int *pValues, const size_t count=1)'],['../classzen_1_1gfx_1_1z_effect.html#a4875eb666b7964d7250dda3e998917da',1,'zen::gfx::zEffect::SetParameter(const string_t &name, const math::matrix4x4_t &Matrix) const ']]], ['setposition',['SetPosition',['../classzen_1_1gfx_1_1z_light.html#ad58b74bcf6cfb1f365560dde0a3ef92f',1,'zen::gfx::zLight::SetPosition(const real_t x, const real_t y)'],['../classzen_1_1gfx_1_1z_light.html#afee76cb867656b3dc4bd18d95aec8385',1,'zen::gfx::zLight::SetPosition(const math::vector_t &Pos)']]], + ['setrate',['SetRate',['../classg_bullet.html#ab1c1f6e32fc563c7fd13497387da1b6d',1,'gBullet']]], ['setrepeating',['SetRepeating',['../classzen_1_1gfx_1_1z_quad.html#a2461053b411db584b9c3dd40364cdff2',1,'zen::gfx::zQuad']]], ['setseethrough',['SetSeeThrough',['../classzen_1_1gfx_1_1z_scene.html#af6845c571c20107f4258ec66da0b2f65',1,'zen::gfx::zScene']]], ['setsize',['SetSize',['../classzen_1_1gui_1_1z_font.html#a3ab8b4e8391ba35b398935bb727ab5f2',1,'zen::gui::zFont']]], @@ -63,6 +64,7 @@ var searchData= ['shapes_2ecpp',['Shapes.cpp',['../_shapes_8cpp.html',1,'']]], ['shapes_2ehpp',['Shapes.hpp',['../_shapes_8hpp.html',1,'']]], ['shear',['Shear',['../classzen_1_1math_1_1matrix4x4__t.html#a4ea7a579fa5b9f8ef1481c11f8c1d115',1,'zen::math::matrix4x4_t::Shear()'],['../classzen_1_1obj_1_1z_entity.html#a1e482bcc7d010db11da731eb4ae913ea',1,'zen::obj::zEntity::Shear()']]], + ['shiftentity',['ShiftEntity',['../classzen_1_1gfx_1_1z_scene.html#a3d15fe6db75f5b1e8190f28b0fda1d5f',1,'zen::gfx::zScene']]], ['showxmlerror',['ShowXMLError',['../classzen_1_1util_1_1z_x_m_l_parser.html#a2f98c13f5ea15dce2d2ec23fa461cd6f',1,'zen::util::zXMLParser']]], ['six',['SIX',['../_keyboard_8hpp.html#ab2df19d47ce6f09ac1b502c209f4698f',1,'Keyboard.hpp']]], ['size',['size',['../namespacezen_1_1gui.html#a6f1ec31bf0a98959cf4e528857a158a9',1,'zen::gui::glyph_t::size()'],['../_pong_8cpp.html#a369ca9c65c8d96d97c55a4b151f87ba7',1,'PongPacket::size()']]], @@ -70,6 +72,7 @@ var searchData= ['sleep',['Sleep',['../classzen_1_1util_1_1z_timer.html#a391c975d03981bb7607e28db36720eec',1,'zen::util::zTimer']]], ['socket_2ecpp',['Socket.cpp',['../_socket_8cpp.html',1,'']]], ['socket_2ehpp',['Socket.hpp',['../_socket_8hpp.html',1,'']]], + ['socket_5ft',['socket_t',['../namespacezen_1_1net.html#a911b6c81a3eca360b97dac64e3ee7fb9',1,'zen::net']]], ['sockettype',['SocketType',['../namespacezen_1_1net.html#a15c79f474590b8e2bc0f5b34dbf99b6b',1,'zen::net']]], ['sortbyalpha',['SortByAlpha',['../classzen_1_1gfxcore_1_1z_sorter.html#a5cc3a9635c975bfa71032bf3f17a12ac',1,'zen::gfxcore::zSorter']]], ['sortbydepth',['SortByDepth',['../classzen_1_1gfxcore_1_1z_sorter.html#ad083d3c9ed99a8b3b396521fcec78ec4',1,'zen::gfxcore::zSorter']]], @@ -84,6 +87,7 @@ var searchData= ['space',['SPACE',['../_keyboard_8hpp.html#ae75d7b4459e07dec5aa9999730a43a38',1,'Keyboard.hpp']]], ['spawn_5ft',['spawn_t',['../namespacezen_1_1lvl.html#structzen_1_1lvl_1_1spawn__t',1,'zen::lvl']]], ['spawnpoints',['spawnpoints',['../namespacezen_1_1lvl.html#a20532f985031396ba3bb0fbdd8b6deac',1,'zen::lvl::level_t']]], + ['spawntype',['SpawnType',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8a',1,'zen::lvl']]], ['split',['split',['../namespacezen_1_1util.html#ae654fd97afaaac2c3dd25dd18111385a',1,'zen::util']]], ['spotlight_5ffs',['SPOTLIGHT_FS',['../namespacezen_1_1gfxcore.html#af8ce3e1316dac320f1343725fdf5ff3a',1,'zen::gfxcore']]], ['spritesheet',['SPRITESHEET',['../_effect_8hpp.html#a631dd1ea3fafc5d8921a10b3df5c619f',1,'Effect.hpp']]], diff --git a/docs/search/all_74.js b/docs/search/all_74.js index 71f25f9a..c6b1af91 100644 --- a/docs/search/all_74.js +++ b/docs/search/all_74.js @@ -7,6 +7,7 @@ var searchData= ['texture',['texture',['../namespacezen_1_1gui.html#aed29f07df41992d628a9b1d4ce24e240',1,'zen::gui::glyph_t']]], ['texture_2ecpp',['Texture.cpp',['../_texture_8cpp.html',1,'']]], ['texture_2ehpp',['Texture.hpp',['../_texture_8hpp.html',1,'']]], + ['texture_5fpath',['TEXTURE_PATH',['../_level_test_8cpp.html#a0777b1d05127a4abf7671f3d9b4b4622',1,'LevelTest.cpp']]], ['three',['THREE',['../_keyboard_8hpp.html#a3ad256299172be144b152fb1a36504b5',1,'Keyboard.hpp']]], ['time',['time',['../namespacezen_1_1net.html#a9b65aa8dff3f8ac633a4fe2f9f40c16f',1,'zen::net::ICMPHeader']]], ['time_5ft',['time_t',['../namespacezen_1_1util.html#a4c0c013616295ef7f08cce656f18fec0',1,'zen::util']]], @@ -26,11 +27,13 @@ var searchData= ['toupper',['toupper',['../namespacezen_1_1util.html#abcd46d2b51e6e06f9d9c64e3d252c9ff',1,'zen::util::toupper(const string_t &str)'],['../namespacezen_1_1util.html#a787ffd776fdb8470f900a21d71c85af4',1,'zen::util::toupper(string_t &str)']]], ['translate',['Translate',['../classzen_1_1math_1_1matrix4x4__t.html#a08a41a4a908e13a44872da95b3421fdf',1,'zen::math::matrix4x4_t::Translate()'],['../structzen_1_1math_1_1z_vector.html#a2430d98889cbd1cb518b25b18ec9717e',1,'zen::math::zVector::Translate()']]], ['translateadj',['TranslateAdj',['../classzen_1_1math_1_1matrix4x4__t.html#a8490c81757977f33c6e4482e8b6a70e2',1,'zen::math::matrix4x4_t']]], + ['tri1',['tri1',['../structzen_1_1math_1_1cquery__t.html#a19350f27be27962c6feedffa68341e05',1,'zen::math::cquery_t']]], + ['tri2',['tri2',['../structzen_1_1math_1_1cquery__t.html#a06be46d2205712500186115c682eccf9',1,'zen::math::cquery_t']]], ['tri_5ft',['tri_t',['../namespacezen_1_1math.html#ad5c361b3d7be88928e486f6b04b37ec7',1,'zen::math']]], ['triangle_5ftest',['triangle_test',['../namespacezen_1_1math.html#a1d4ffb053acae9b90121f0d9658680f0',1,'zen::math']]], ['triangulate',['triangulate',['../namespacezen_1_1math.html#a4f3d40ee0b2ca5a5ea75006260d1dede',1,'zen::math']]], ['ttl',['ttl',['../namespacezen_1_1net.html#a3bb908d4387b84b906766722cbaeb9cb',1,'zen::net::IPHeader']]], ['two',['TWO',['../_keyboard_8hpp.html#a0673b633b0851b14ed38bd96f5781290',1,'Keyboard.hpp']]], - ['type',['type',['../structzen_1_1evt_1_1event__t.html#a100566fc0993e22a4a8d694713d99a6e',1,'zen::evt::event_t::type()'],['../namespacezen_1_1net.html#a5e557444e534a575a7a6f73fea946bb5',1,'zen::net::ICMPHeader::type()'],['../_pong_8cpp.html#a32d98163424b51c5d9d7576b55266bdf',1,'PongPacket::type()']]], + ['type',['type',['../structzen_1_1evt_1_1event__t.html#a100566fc0993e22a4a8d694713d99a6e',1,'zen::evt::event_t::type()'],['../namespacezen_1_1lvl.html#ab23ca0d4cd1931da4928a4411d8c921b',1,'zen::lvl::spawn_t::type()'],['../namespacezen_1_1net.html#a5e557444e534a575a7a6f73fea946bb5',1,'zen::net::ICMPHeader::type()'],['../_pong_8cpp.html#a32d98163424b51c5d9d7576b55266bdf',1,'PongPacket::type()']]], ['types_2ehpp',['Types.hpp',['../_types_8hpp.html',1,'']]] ]; diff --git a/docs/search/all_75.js b/docs/search/all_75.js index 7d18f9ec..cdb7d2db 100644 --- a/docs/search/all_75.js +++ b/docs/search/all_75.js @@ -8,7 +8,7 @@ var searchData= ['unused_5fflag',['UNUSED_FLAG',['../classzen_1_1gfxcore_1_1z_sorter.html#aacba5bbaf50700e433fe24616e7819db',1,'zen::gfxcore::zSorter']]], ['unused_5foffset',['UNUSED_OFFSET',['../classzen_1_1gfxcore_1_1z_sorter.html#a764594cd9e150526e6cf01cfb0d46ac6',1,'zen::gfxcore::zSorter']]], ['up',['UP',['../_keyboard_8hpp.html#ab9396f8576c1edddba6173922f0812ad',1,'Keyboard.hpp']]], - ['update',['Update',['../classzen_1_1sfx_1_1z_audio2_d.html#a944f23ca58aa18393ddf978f40537e3f',1,'zen::sfx::zAudio2D::Update()'],['../classzen_1_1sfx_1_1z_music2_d.html#afcd5133c4f288f09aa7d2a8d58d67a5a',1,'zen::sfx::zMusic2D::Update()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#a7feffeaf5e36a465db17e5e68c35148b',1,'zen::sfx::CSound2D::Update()'],['../classzen_1_1gfx_1_1z_window.html#ab43e8c6d204819da11380772da928561',1,'zen::gfx::zWindow::Update()'],['../classzen_1_1gui_1_1z_menu.html#aa5b5b8c50bee2a1c707ff991bab7d302',1,'zen::gui::zMenu::Update()'],['../classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063',1,'zen::obj::zAnimation::Update()'],['../classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc',1,'zen::obj::zEntity::Update()']]], + ['update',['Update',['../classzen_1_1sfx_1_1z_audio2_d.html#a944f23ca58aa18393ddf978f40537e3f',1,'zen::sfx::zAudio2D::Update()'],['../classzen_1_1sfx_1_1z_music2_d.html#afcd5133c4f288f09aa7d2a8d58d67a5a',1,'zen::sfx::zMusic2D::Update()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#a7feffeaf5e36a465db17e5e68c35148b',1,'zen::sfx::CSound2D::Update()'],['../classzen_1_1gfx_1_1z_window.html#ab43e8c6d204819da11380772da928561',1,'zen::gfx::zWindow::Update()'],['../classzen_1_1gui_1_1z_menu.html#aa5b5b8c50bee2a1c707ff991bab7d302',1,'zen::gui::zMenu::Update()'],['../classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063',1,'zen::obj::zAnimation::Update()'],['../classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc',1,'zen::obj::zEntity::Update()'],['../classg_bullet.html#a99b2ce1395234c6d9b8b0c979d541084',1,'gBullet::Update()'],['../classg_world.html#a78e9f746cacd05afee871bea685b78c7',1,'gWorld::Update()']]], ['utilities',['Utilities',['../group___utilities.html',1,'']]], ['utilities_2ehpp',['Utilities.hpp',['../_utilities_8hpp.html',1,'']]] ]; diff --git a/docs/search/all_7a.js b/docs/search/all_7a.js index ac4fa9f9..970a69ec 100644 --- a/docs/search/all_7a.js +++ b/docs/search/all_7a.js @@ -52,9 +52,9 @@ var searchData= ['zeventhandler',['zEventHandler',['../classzen_1_1evt_1_1z_event_handler.html',1,'zen::evt']]], ['zfileparser',['zFileParser',['../classzen_1_1util_1_1z_file_parser.html#a4e5cc1ad7347d7d09c1c1bd728afd47b',1,'zen::util::zFileParser']]], ['zfileparser',['zFileParser',['../classzen_1_1util_1_1z_file_parser.html',1,'zen::util']]], - ['zfont',['zFont',['../group___g_u_i.html#classzen_1_1gfx_1_1z_font',1,'zen::gfx']]], ['zfont',['zFont',['../classzen_1_1gui_1_1z_font.html',1,'zen::gui']]], - ['zfont',['zFont',['../namespacezen_1_1gui.html#acad61845b417e09a1666960b1a1bd641',1,'zen::gui::zFont()'],['../_effect_8hpp.html#aa379cf6969ed838e641d6af457fba888',1,'ZFONT(): Effect.hpp']]], + ['zfont',['zFont',['../group___g_u_i.html#classzen_1_1gfx_1_1z_font',1,'zen::gfx']]], + ['zfont',['ZFONT',['../_effect_8hpp.html#aa379cf6969ed838e641d6af457fba888',1,'ZFONT(): Effect.hpp'],['../namespacezen_1_1gui.html#acad61845b417e09a1666960b1a1bd641',1,'zen::gui::zFont()']]], ['zfont_5ffs',['ZFONT_FS',['../namespacezen_1_1gfxcore.html#a56b1edbdd18e24621747f5d2363ec5d4',1,'zen::gfxcore']]], ['zfontlibrary',['zFontLibrary',['../classzen_1_1gui_1_1z_font_library.html',1,'zen::gui']]], ['zglsubsystem',['zGLSubsystem',['../classzen_1_1gfxcore_1_1z_g_l_subsystem.html',1,'zen::gfxcore']]], diff --git a/docs/search/all_7e.js b/docs/search/all_7e.js index b1be4f99..908ef92a 100644 --- a/docs/search/all_7e.js +++ b/docs/search/all_7e.js @@ -2,6 +2,8 @@ var searchData= [ ['_7ecfont',['~CFont',['../classzen_1_1gui_1_1_c_font_atlas.html#ac372965ce36455154d00fe05b6d25ffb',1,'zen::gui::CFontAtlas']]], ['_7ecsound2d',['~CSound2D',['../classzen_1_1sfx_1_1_c_sound2_d.html#af011d370d19170f5098097accc07b0b4',1,'zen::sfx::CSound2D']]], + ['_7egbullet',['~gBullet',['../classg_bullet.html#a42a81cc48419d52e17d3a7b68ebc3f6a',1,'gBullet']]], + ['_7egworld',['~gWorld',['../classg_world.html#a8e50f4061f1f06919147b589c7e1a679',1,'gWorld']]], ['_7ezallocator',['~zAllocator',['../classzen_1_1z_allocator.html#a52a872b36a2bb398b399af241e2e350f',1,'zen::zAllocator']]], ['_7ezanimation',['~zAnimation',['../classzen_1_1obj_1_1z_animation.html#a5e43a113a9b7e662c2fa1f9c3cae3e49',1,'zen::obj::zAnimation']]], ['_7ezasset',['~zAsset',['../classzen_1_1asset_1_1z_asset.html#a63e5f41f65f468b3653ae4f5d1b82549',1,'zen::asset::zAsset']]], diff --git a/docs/search/classes_63.js b/docs/search/classes_63.js index b81d0d04..d96713d7 100644 --- a/docs/search/classes_63.js +++ b/docs/search/classes_63.js @@ -5,5 +5,6 @@ var searchData= ['circle_5ft',['circle_t',['../group___objects.html#structzen_1_1obj_1_1circle__t',1,'zen::obj']]], ['color3f_5ft',['color3f_t',['../structzen_1_1color3f__t.html',1,'zen']]], ['color4f_5ft',['color4f_t',['../structzen_1_1color4f__t.html',1,'zen']]], + ['cquery_5ft',['cquery_t',['../structzen_1_1math_1_1cquery__t.html',1,'zen::math']]], ['csound2d',['CSound2D',['../classzen_1_1sfx_1_1_c_sound2_d.html',1,'zen::sfx']]] ]; diff --git a/docs/search/classes_67.js b/docs/search/classes_67.js index 817ceaea..8795e749 100644 --- a/docs/search/classes_67.js +++ b/docs/search/classes_67.js @@ -1,5 +1,7 @@ var searchData= [ + ['gbullet',['gBullet',['../classg_bullet.html',1,'']]], ['glyph_5ft',['glyph_t',['../namespacezen.html#structzen_1_1glyph__t',1,'zen']]], - ['glyph_5ft',['glyph_t',['../namespacezen_1_1gui.html#structzen_1_1gui_1_1glyph__t',1,'zen::gui']]] + ['glyph_5ft',['glyph_t',['../namespacezen_1_1gui.html#structzen_1_1gui_1_1glyph__t',1,'zen::gui']]], + ['gworld',['gWorld',['../classg_world.html',1,'']]] ]; diff --git a/docs/search/classes_7a.js b/docs/search/classes_7a.js index 5c216d8c..74306232 100644 --- a/docs/search/classes_7a.js +++ b/docs/search/classes_7a.js @@ -12,8 +12,8 @@ var searchData= ['zentity',['zEntity',['../classzen_1_1obj_1_1z_entity.html',1,'zen::obj']]], ['zeventhandler',['zEventHandler',['../classzen_1_1evt_1_1z_event_handler.html',1,'zen::evt']]], ['zfileparser',['zFileParser',['../classzen_1_1util_1_1z_file_parser.html',1,'zen::util']]], - ['zfont',['zFont',['../group___g_u_i.html#classzen_1_1gfx_1_1z_font',1,'zen::gfx']]], ['zfont',['zFont',['../classzen_1_1gui_1_1z_font.html',1,'zen::gui']]], + ['zfont',['zFont',['../group___g_u_i.html#classzen_1_1gfx_1_1z_font',1,'zen::gfx']]], ['zfontlibrary',['zFontLibrary',['../classzen_1_1gui_1_1z_font_library.html',1,'zen::gui']]], ['zglsubsystem',['zGLSubsystem',['../classzen_1_1gfxcore_1_1z_g_l_subsystem.html',1,'zen::gfxcore']]], ['zlevelloader',['zLevelLoader',['../classzen_1_1lvl_1_1z_level_loader.html',1,'zen::lvl']]], diff --git a/docs/search/related_63.html b/docs/search/defines_63.html similarity index 93% rename from docs/search/related_63.html rename to docs/search/defines_63.html index fa8953ca..dd91b75a 100644 --- a/docs/search/related_63.html +++ b/docs/search/defines_63.html @@ -3,7 +3,7 @@ - + diff --git a/docs/search/defines_63.js b/docs/search/defines_63.js new file mode 100644 index 00000000..502bdd25 --- /dev/null +++ b/docs/search/defines_63.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['check',['CHECK',['../_level_test_8cpp.html#aa59a70e2ff40af3af6c08aafdca8c713',1,'LevelTest.cpp']]] +]; diff --git a/docs/search/pages_62.html b/docs/search/defines_66.html similarity index 93% rename from docs/search/pages_62.html rename to docs/search/defines_66.html index 0879cfd1..3e366182 100644 --- a/docs/search/pages_62.html +++ b/docs/search/defines_66.html @@ -3,7 +3,7 @@ - + diff --git a/docs/search/defines_66.js b/docs/search/defines_66.js new file mode 100644 index 00000000..bfb26cc2 --- /dev/null +++ b/docs/search/defines_66.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['font_5fpath',['FONT_PATH',['../_level_test_8cpp.html#af326d9b4cced6fd44a9f9567dc666014',1,'LevelTest.cpp']]] +]; diff --git a/docs/search/typedefs_75.html b/docs/search/defines_6c.html similarity index 93% rename from docs/search/typedefs_75.html rename to docs/search/defines_6c.html index eb37a47f..7f21eba3 100644 --- a/docs/search/typedefs_75.html +++ b/docs/search/defines_6c.html @@ -3,7 +3,7 @@ - + diff --git a/docs/search/defines_6c.js b/docs/search/defines_6c.js new file mode 100644 index 00000000..ce30f6e5 --- /dev/null +++ b/docs/search/defines_6c.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['level_5fpath',['LEVEL_PATH',['../_level_test_8cpp.html#a833ae233ed0529bd108096453975af7b',1,'LevelTest.cpp']]] +]; diff --git a/docs/search/defines_74.js b/docs/search/defines_74.js index 0c250016..39cfb077 100644 --- a/docs/search/defines_74.js +++ b/docs/search/defines_74.js @@ -1,4 +1,4 @@ var searchData= [ - ['time_5fit',['TIME_IT',['../_string_8hpp.html#af1d7120321614d4f728ceb227fcdb1ec',1,'String.hpp']]] + ['texture_5fpath',['TEXTURE_PATH',['../_level_test_8cpp.html#a0777b1d05127a4abf7671f3d9b4b4622',1,'LevelTest.cpp']]] ]; diff --git a/docs/search/enums_73.js b/docs/search/enums_73.js index 45d0d74d..11ff1993 100644 --- a/docs/search/enums_73.js +++ b/docs/search/enums_73.js @@ -1,4 +1,5 @@ var searchData= [ - ['sockettype',['SocketType',['../namespacezen_1_1net.html#a15c79f474590b8e2bc0f5b34dbf99b6b',1,'zen::net']]] + ['sockettype',['SocketType',['../namespacezen_1_1net.html#a15c79f474590b8e2bc0f5b34dbf99b6b',1,'zen::net']]], + ['spawntype',['SpawnType',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8a',1,'zen::lvl']]] ]; diff --git a/docs/search/functions_76.html b/docs/search/enumvalues_61.html similarity index 93% rename from docs/search/functions_76.html rename to docs/search/enumvalues_61.html index 624bc1db..02a81e78 100644 --- a/docs/search/functions_76.html +++ b/docs/search/enumvalues_61.html @@ -3,7 +3,7 @@ - + diff --git a/docs/search/enumvalues_61.js b/docs/search/enumvalues_61.js new file mode 100644 index 00000000..4ac166ad --- /dev/null +++ b/docs/search/enumvalues_61.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['animation',['ANIMATION',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842a28ff0af6199e0baf97bb71b4b4422057',1,'zen::lvl::zLevelLoader']]] +]; diff --git a/docs/search/enumvalues_65.html b/docs/search/enumvalues_65.html new file mode 100644 index 00000000..2a3577f3 --- /dev/null +++ b/docs/search/enumvalues_65.html @@ -0,0 +1,26 @@ + + + + + + + + + +
    +
    Loading...
    +
    + +
    Searching...
    +
    No Matches
    + +
    + + diff --git a/docs/search/enumvalues_65.js b/docs/search/enumvalues_65.js new file mode 100644 index 00000000..4d0e468b --- /dev/null +++ b/docs/search/enumvalues_65.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['enemy_5fspawn',['ENEMY_SPAWN',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8aa085bbb81788460fa0339067cc87c5c75',1,'zen::lvl']]] +]; diff --git a/docs/search/enumvalues_69.js b/docs/search/enumvalues_69.js index 28512e07..47a2ba8b 100644 --- a/docs/search/enumvalues_69.js +++ b/docs/search/enumvalues_69.js @@ -2,5 +2,7 @@ var searchData= [ ['icmp_5fdest_5funreachable',['ICMP_DEST_UNREACHABLE',['../namespacezen_1_1net.html#a33ebebe7a4cced99e9948d626fc57e18af1a3fd0f7869e515dd2903e3d528a73e',1,'zen::net']]], ['icmp_5fecho_5freply',['ICMP_ECHO_REPLY',['../namespacezen_1_1net.html#a33ebebe7a4cced99e9948d626fc57e18a5e4e888312c06d9457e6f40e9692453a',1,'zen::net']]], - ['icmp_5fecho_5frequest',['ICMP_ECHO_REQUEST',['../namespacezen_1_1net.html#a33ebebe7a4cced99e9948d626fc57e18afcbc09abe01d689e657046c70710ca8e',1,'zen::net']]] + ['icmp_5fecho_5frequest',['ICMP_ECHO_REQUEST',['../namespacezen_1_1net.html#a33ebebe7a4cced99e9948d626fc57e18afcbc09abe01d689e657046c70710ca8e',1,'zen::net']]], + ['invisible',['INVISIBLE',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842a5fb351568336ebb294804f81e3c8663d',1,'zen::lvl::zLevelLoader']]], + ['item_5fspawn',['ITEM_SPAWN',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8aa88073cc0d7023b0889799817211b0859',1,'zen::lvl']]] ]; diff --git a/docs/search/enumvalues_6e.html b/docs/search/enumvalues_6e.html new file mode 100644 index 00000000..941d2e8c --- /dev/null +++ b/docs/search/enumvalues_6e.html @@ -0,0 +1,26 @@ + + + + + + + + + +
    +
    Loading...
    +
    + +
    Searching...
    +
    No Matches
    + +
    + + diff --git a/docs/search/enumvalues_6e.js b/docs/search/enumvalues_6e.js new file mode 100644 index 00000000..9804eebb --- /dev/null +++ b/docs/search/enumvalues_6e.js @@ -0,0 +1,4 @@ +var searchData= +[ + ['none',['NONE',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842ab50339a10e1de285ac99d4c3990b8693',1,'zen::lvl::zLevelLoader']]] +]; diff --git a/docs/search/enumvalues_70.js b/docs/search/enumvalues_70.js index 57a124a6..1dcd5431 100644 --- a/docs/search/enumvalues_70.js +++ b/docs/search/enumvalues_70.js @@ -1,7 +1,9 @@ var searchData= [ ['packet_5fsize',['PACKET_SIZE',['../namespacezen_1_1net.html#a4bdae0e6c878054092dd6763ed62c267a6715600bff264eb515f483e5a970d45d',1,'zen::net']]], + ['physical',['PHYSICAL',['../classzen_1_1lvl_1_1z_level_loader.html#a02414b53e633ebb8610d2216f3a09842afbefe3f2370fe150be6f4d42f8cc4d4c',1,'zen::lvl::zLevelLoader']]], ['ping',['PING',['../_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155ae07ff41a486c27c095a15898dcca34d1',1,'Pong.cpp']]], + ['player_5fspawn',['PLAYER_SPAWN',['../namespacezen_1_1lvl.html#aa2d0cacbcd853d22cc649f6a775aab8aaefeaff06f16214cf788e86a06c8d8c5b',1,'zen::lvl']]], ['pos_5fball',['POS_BALL',['../_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a09a08bfb646254a7eac2cc0cdd22efc1',1,'Pong.cpp']]], ['pos_5fplayer',['POS_PLAYER',['../_pong_8cpp.html#aa1f26ef805cf5ea1018bce70631ab155a5f4cef4eeeaf2b7e1ebba036b623b3c8',1,'Pong.cpp']]] ]; diff --git a/docs/search/files_6c.js b/docs/search/files_6c.js index db096ee6..152e4140 100644 --- a/docs/search/files_6c.js +++ b/docs/search/files_6c.js @@ -2,6 +2,7 @@ var searchData= [ ['level_2ehpp',['Level.hpp',['../_level_8hpp.html',1,'']]], ['levelloader_2ehpp',['LevelLoader.hpp',['../_level_loader_8hpp.html',1,'']]], + ['leveltest_2ecpp',['LevelTest.cpp',['../_level_test_8cpp.html',1,'']]], ['light_2ecpp',['Light.cpp',['../_light_8cpp.html',1,'']]], ['light_2ehpp',['Light.hpp',['../_light_8hpp.html',1,'']]], ['log_2ecpp',['Log.cpp',['../_log_8cpp.html',1,'']]], diff --git a/docs/search/functions_63.js b/docs/search/functions_63.js index 1dd13656..e746f266 100644 --- a/docs/search/functions_63.js +++ b/docs/search/functions_63.js @@ -2,6 +2,8 @@ var searchData= [ ['calch',['CalcH',['../classzen_1_1gfx_1_1z_polygon.html#a429c80360298608d83c56c74bae31e22',1,'zen::gfx::zPolygon']]], ['calcw',['CalcW',['../classzen_1_1gfx_1_1z_polygon.html#a55d204431680f82b0016e5b290c25ccf',1,'zen::gfx::zPolygon']]], + ['calcx',['CalcX',['../classzen_1_1gfx_1_1z_polygon.html#a44b2721ed65c2e2fb2b5391b4397ae9b',1,'zen::gfx::zPolygon']]], + ['calcy',['CalcY',['../classzen_1_1gfx_1_1z_polygon.html#adc5878f6c1cb869b6e5ed4ba8911bd62',1,'zen::gfx::zPolygon']]], ['cbegin',['cbegin',['../classzen_1_1asset_1_1z_asset_manager.html#a7dbf837809ef6fa8907ba34f3416c5be',1,'zen::asset::zAssetManager::cbegin()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#af6e1877802a20308c2cccd137f58928e',1,'zen::util::zXMLParser::cbegin()']]], ['cend',['cend',['../classzen_1_1asset_1_1z_asset_manager.html#a3c18de41b277ae600dd657474d0c7d78',1,'zen::asset::zAssetManager::cend()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#a739208d2e8591f83f325114f0ba008a9',1,'zen::util::zXMLParser::cend()']]], ['center',['Center',['../classzen_1_1obj_1_1z_entity.html#a656737f613535329c7580156623e957d',1,'zen::obj::zEntity']]], @@ -13,12 +15,13 @@ var searchData= ['clearstring',['ClearString',['../classzen_1_1gui_1_1z_font.html#a9805153394f3cd01041ccfa51eacc8b9',1,'zen::gui::zFont']]], ['cleartree',['ClearTree',['../classzen_1_1util_1_1z_x_m_l_parser.html#aa616e9e25b245f2e899572c2cd50d2f2',1,'zen::util::zXMLParser']]], ['close',['Close',['../classzen_1_1gfx_1_1z_window.html#a3d18497cbf3fc8f8a0231761fbf3bf9e',1,'zen::gfx::zWindow']]], - ['collides',['collides',['../structzen_1_1math_1_1circle__t.html#a308f209094b37020a14c1256cfff7edc',1,'zen::math::circle_t::collides()'],['../structzen_1_1math_1_1aabb__t.html#a18b68d868db5d40ba56d9fd0fe02f0e1',1,'zen::math::aabb_t::collides(const aabb_t &b) const '],['../structzen_1_1math_1_1aabb__t.html#a172aff17b1ace616b210e8d7f84bcbcc',1,'zen::math::aabb_t::collides(const tri_t &tri) const '],['../classzen_1_1gfx_1_1z_polygon.html#a7cd1ed28b12be147b3567325035588ab',1,'zen::gfx::zPolygon::Collides(const zPolygon &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1gfx_1_1z_polygon.html#a3574b7e895e99b3aba9352083b86e36b',1,'zen::gfx::zPolygon::Collides(const math::aabb_t &other)'],['../classzen_1_1gfx_1_1z_quad.html#a5eb84d8851c72de252ee06a302d45e07',1,'zen::gfx::zQuad::Collides(const zPolygon &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1gfx_1_1z_quad.html#ab47b202f4549acb2c691fad8199d45e7',1,'zen::gfx::zQuad::Collides(const zQuad &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04',1,'zen::gfx::zQuad::Collides(const math::aabb_t &other)'],['../classzen_1_1obj_1_1z_entity.html#aab105bb9a975be55bec1165839c75ca3',1,'zen::obj::zEntity::Collides(const zEntity &Other, math::vector_t *poi=nullptr)'],['../classzen_1_1obj_1_1z_entity.html#a0fabb7a8eb2c7e4b060fd121dfcbc6ad',1,'zen::obj::zEntity::Collides(const math::rect_t &other)'],['../classzen_1_1obj_1_1z_entity.html#a0c09afd745bbde3ee9dcf17e1bf0557b',1,'zen::obj::zEntity::Collides(const math::aabb_t &other)'],['../classzen_1_1obj_1_1z_entity.html#a97f63b13f8d18df82b07248ab498ffcd',1,'zen::obj::zEntity::Collides(const math::vector_t &Pos)'],['../namespacezen_1_1math.html#ae3df27df54d004f888b10187fe1c3077',1,'zen::math::collides(const tri_t &A, const tri_t &b, vector_t *pt=nullptr)'],['../namespacezen_1_1math.html#a7c7f261f6eceee12104089778b1e342b',1,'zen::math::collides(const line_t &a, const line_t &b, vector_t *pt=nullptr)'],['../group___objects.html#ga925e8bd382dc3a99ce61fd2b9635aaf0',1,'zen::obj::collides(const bbox_t &a, const bbox_t &b)'],['../group___objects.html#ga18bea3a1e52819aedaab745a949eabab',1,'zen::obj::collides(const circle_t &a, const circle_t &b)']]], + ['collides',['collides',['../structzen_1_1math_1_1circle__t.html#a308f209094b37020a14c1256cfff7edc',1,'zen::math::circle_t::collides()'],['../structzen_1_1math_1_1aabb__t.html#a18b68d868db5d40ba56d9fd0fe02f0e1',1,'zen::math::aabb_t::collides(const aabb_t &b) const '],['../structzen_1_1math_1_1aabb__t.html#a172aff17b1ace616b210e8d7f84bcbcc',1,'zen::math::aabb_t::collides(const tri_t &tri) const '],['../classzen_1_1gfx_1_1z_polygon.html#a445f57a850cd65629ba96595172d2ef4',1,'zen::gfx::zPolygon::Collides(const zPolygon &Other, math::cquery_t *q=nullptr) const '],['../classzen_1_1gfx_1_1z_polygon.html#a05f999895093561101c8016f43f2a464',1,'zen::gfx::zPolygon::Collides(const math::aabb_t &other) const '],['../classzen_1_1gfx_1_1z_quad.html#a5f5ed27f47eb430f1bc36eb6b046b04a',1,'zen::gfx::zQuad::Collides(const zPolygon &Other, math::cquery_t *q) const '],['../classzen_1_1gfx_1_1z_quad.html#a67eeed3aa34f859af6f017bd081c4f4d',1,'zen::gfx::zQuad::Collides(const zQuad &Other, math::cquery_t *q) const '],['../classzen_1_1gfx_1_1z_quad.html#a61f0d5bdb408ece67889b5c735e97c04',1,'zen::gfx::zQuad::Collides(const math::aabb_t &other)'],['../classzen_1_1obj_1_1z_entity.html#a2a8b391f1405b50097201fc3deff567f',1,'zen::obj::zEntity::Collides(const zEntity &Other, math::cquery_t *q=nullptr) const '],['../classzen_1_1obj_1_1z_entity.html#a2e4ba22ce1d4e73fd0f863028627e952',1,'zen::obj::zEntity::Collides(const math::rect_t &other) const '],['../classzen_1_1obj_1_1z_entity.html#a1be62235d46a4e5b5e1aeb7fb6df5068',1,'zen::obj::zEntity::Collides(const math::aabb_t &other) const '],['../classzen_1_1obj_1_1z_entity.html#a75dc7487405c30be0f668a0a4ac23207',1,'zen::obj::zEntity::Collides(const math::vector_t &Pos) const '],['../classg_bullet.html#a635a3488c596cf55141d416491fa44c4',1,'gBullet::Collides()'],['../namespacezen_1_1math.html#a96d8397d0fc2cc7a832a4b1e2f427e41',1,'zen::math::collides(const tri_t &A, const tri_t &b, cquery_t *q=nullptr)'],['../namespacezen_1_1math.html#a36b4f55da484ea4e79631cc4bdd24cd2',1,'zen::math::collides(const line_t &a, const line_t &b, cquery_t *q=nullptr)'],['../group___objects.html#ga925e8bd382dc3a99ce61fd2b9635aaf0',1,'zen::obj::collides(const bbox_t &a, const bbox_t &b)'],['../group___objects.html#ga18bea3a1e52819aedaab745a949eabab',1,'zen::obj::collides(const circle_t &a, const circle_t &b)']]], ['color3f_5ft',['color3f_t',['../structzen_1_1color3f__t.html#a096d6de7f738d20a0c9e6d6bde7e7768',1,'zen::color3f_t']]], ['color4f_5ft',['color4f_t',['../structzen_1_1color4f__t.html#a7bc228324527278bf8e2c54cb0c6626f',1,'zen::color4f_t']]], ['compf',['compf',['../namespacezen_1_1math.html#aabd370ffdf05dd995a20fc89408cad16',1,'zen::math']]], ['copyfromexisting',['CopyFromExisting',['../classzen_1_1gfxcore_1_1z_texture.html#af0fbeef6c917ec51b1ae5296c42201b6',1,'zen::gfxcore::zTexture']]], - ['create',['Create',['../classzen_1_1asset_1_1z_asset_manager.html#a913db0d2386a2a6d70ac7f14bc87d350',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a0ad8c78766fe785c045a85f13d86fee6',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a4b0f1b14550967c2862c84c6905be830',1,'zen::asset::zAssetManager::Create(const void *const owner=nullptr)'],['../classzen_1_1gfx_1_1z_concave_polygon.html#a10251b694ecba0fb2ec99fe53c05f79d',1,'zen::gfx::zConcavePolygon::Create()'],['../classzen_1_1gfx_1_1z_polygon.html#ac9df030c2f41e4454a7b6d260e0fd21a',1,'zen::gfx::zPolygon::Create()'],['../classzen_1_1gfx_1_1z_quad.html#a8eaf715d98a3a11a202ad73f0f7e356d',1,'zen::gfx::zQuad::Create()'],['../classzen_1_1asset_1_1z_asset_manager.html#a12d6426e1292260614774c17c37aa167',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#abe99604de5f4e7aa650f0e02902f7efc',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#adc7d5608484aa2dca5b3cfa27613bbae',1,'zen::asset::zAssetManager::Create(const void *const owner)']]], + ['cquery_5ft',['cquery_t',['../structzen_1_1math_1_1cquery__t.html#aab37db7191a1aeeaca9869e5d032dd73',1,'zen::math::cquery_t']]], + ['create',['Create',['../classzen_1_1asset_1_1z_asset_manager.html#a913db0d2386a2a6d70ac7f14bc87d350',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a0ad8c78766fe785c045a85f13d86fee6',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner=nullptr)'],['../classzen_1_1asset_1_1z_asset_manager.html#a4b0f1b14550967c2862c84c6905be830',1,'zen::asset::zAssetManager::Create(const void *const owner=nullptr)'],['../classzen_1_1gfx_1_1z_concave_polygon.html#ab9a368fae6346609c591204180b5ed04',1,'zen::gfx::zConcavePolygon::Create()'],['../classzen_1_1gfx_1_1z_polygon.html#a1955ad2231b3b46bbf4f4e2408be3c62',1,'zen::gfx::zPolygon::Create()'],['../classzen_1_1gfx_1_1z_quad.html#a6ba50baedb76b9e4b966b9a3fa0333f4',1,'zen::gfx::zQuad::Create()'],['../classzen_1_1asset_1_1z_asset_manager.html#a12d6426e1292260614774c17c37aa167',1,'zen::asset::zAssetManager::Create(const string_t &filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#abe99604de5f4e7aa650f0e02902f7efc',1,'zen::asset::zAssetManager::Create(const char *const filename, const void *const owner)'],['../classzen_1_1asset_1_1z_asset_manager.html#adc7d5608484aa2dca5b3cfa27613bbae',1,'zen::asset::zAssetManager::Create(const void *const owner)']]], ['createidentitymatrix',['CreateIdentityMatrix',['../classzen_1_1math_1_1matrix4x4__t.html#afd5ac2890e4956d80553a9539e20ea5a',1,'zen::math::matrix4x4_t']]], ['createshaderobject',['CreateShaderObject',['../classzen_1_1gfxcore_1_1z_shader_set.html#a3dfcee25bfda15b88549e798a9ac9009',1,'zen::gfxcore::zShaderSet']]], ['createsortflag',['CreateSortFlag',['../classzen_1_1gfxcore_1_1z_sorter.html#a55b42b6f90a534d9b06a519a38f91de8',1,'zen::gfxcore::zSorter']]], diff --git a/docs/search/functions_64.js b/docs/search/functions_64.js index c4a35c07..8fd210a4 100644 --- a/docs/search/functions_64.js +++ b/docs/search/functions_64.js @@ -11,6 +11,6 @@ var searchData= ['disablelighting',['DisableLighting',['../classzen_1_1gfx_1_1z_scene.html#a248965d615fe44c127b2a3f38d32b128',1,'zen::gfx::zScene']]], ['disablepostprocessing',['DisablePostProcessing',['../classzen_1_1gfx_1_1z_scene.html#a0a183be6fd9991d755849081c0511fb6',1,'zen::gfx::zScene']]], ['disabletexture',['DisableTexture',['../classzen_1_1gfxcore_1_1z_renderer.html#a6e2d08809b5a7d6960928fd13a157016',1,'zen::gfxcore::zRenderer::DisableTexture()'],['../classzen_1_1gfx_1_1z_material.html#a5dd5fdc7ea1311e3cf671b17594988a5',1,'zen::gfx::zMaterial::DisableTexture()']]], - ['distance',['distance',['../structzen_1_1math_1_1z_vector.html#a7e62fe4161570ef2b2dd9e49811bcdbe',1,'zen::math::zVector::distance()'],['../namespacezen_1_1math.html#ad0590aed15a517ae91eb37d5640f55f8',1,'zen::math::distance(const real_t x1, const real_t y1, const real_t x2, const real_t y2, const bool do_sqrt=false)'],['../namespacezen_1_1math.html#a5fa06496e5a992ad54ad59b5ee9174c1',1,'zen::math::distance(const zVector< T > &A, const zVector< U > &B, const bool do_sqrt)'],['../_vector_8inl.html#a31292d7a37056f7bd56fbd5e7f6531d7',1,'distance(): Vector.inl']]], + ['distance',['distance',['../structzen_1_1math_1_1z_vector.html#ab7eebffaaaac96cf48eb6f6139716e75',1,'zen::math::zVector::distance()'],['../namespacezen_1_1math.html#ad0590aed15a517ae91eb37d5640f55f8',1,'zen::math::distance(const real_t x1, const real_t y1, const real_t x2, const real_t y2, const bool do_sqrt=false)'],['../namespacezen_1_1math.html#a5fa06496e5a992ad54ad59b5ee9174c1',1,'zen::math::distance(const zVector< T > &A, const zVector< U > &B, const bool do_sqrt)'],['../_vector_8inl.html#a31292d7a37056f7bd56fbd5e7f6531d7',1,'distance(): Vector.inl']]], ['draw',['Draw',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a8b153d9cc48a11886f9b75a7ed9438ec',1,'zen::gfxcore::zVertexArray::Draw()'],['../classzen_1_1gfx_1_1z_polygon.html#ab7fb29249ab405cc610bb5e451397fea',1,'zen::gfx::zPolygon::Draw()'],['../classzen_1_1obj_1_1z_entity.html#a53381ea55dc552df56f462bcc03bb84a',1,'zen::obj::zEntity::Draw()']]] ]; diff --git a/docs/search/functions_67.js b/docs/search/functions_67.js index 3f2e039d..99818d3a 100644 --- a/docs/search/functions_67.js +++ b/docs/search/functions_67.js @@ -1,5 +1,6 @@ var searchData= [ + ['gbullet',['gBullet',['../classg_bullet.html#ace82350a968fa10022480fd362599f19',1,'gBullet']]], ['get',['get',['../classzen_1_1z_allocator.html#a829c780ca192db07a2e536744a648add',1,'zen::zAllocator::get(size_t count=1)'],['../classzen_1_1z_allocator.html#a472973ee0cdbc2965245327333cdc43c',1,'zen::zAllocator::Get()']]], ['getassetcount',['GetAssetCount',['../classzen_1_1asset_1_1z_asset_manager.html#a07a0677f1a05e0f76481e447b0292cbe',1,'zen::asset::zAssetManager']]], ['getassetid',['GetAssetID',['../classzen_1_1asset_1_1z_asset.html#a938213616b2e467c9957885af5ecae32',1,'zen::asset::zAsset']]], @@ -33,11 +34,11 @@ var searchData= ['getindexcount',['GetIndexCount',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a1f40c5fff5ca6574db24fa6f53146a24',1,'zen::gfxcore::zVertexArray']]], ['getindicesfromgpu',['GetIndicesFromGPU',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a64ea4e035b4e5c77a6d8f495cace39af',1,'zen::gfxcore::zVertexArray']]], ['getinstance',['GetInstance',['../classzen_1_1evt_1_1z_event_handler.html#a4cf62909dfc2748816282abde1e4486a',1,'zen::evt::zEventHandler']]], - ['getleftpoint',['GetLeftPoint',['../classzen_1_1gfx_1_1z_polygon.html#a1952d1ddbb16cae0816d03a4c284f5d6',1,'zen::gfx::zPolygon']]], + ['getleftpoint',['GetLeftPoint',['../classzen_1_1gfx_1_1z_polygon.html#a5d5880fa1e14f9b5622db4ef4322d1db',1,'zen::gfx::zPolygon']]], ['getlibrary',['GetLibrary',['../classzen_1_1gui_1_1z_font_library.html#aeafc692f64655ec31a3b0dac69d74924',1,'zen::gui::zFontLibrary']]], ['getlineheight',['GetLineHeight',['../classzen_1_1gui_1_1z_font.html#a5aa68ad2c5f6d57b8cfca1d6fcc5db5e',1,'zen::gui::zFont']]], ['getlinkerlog',['GetLinkerLog',['../classzen_1_1gfxcore_1_1z_shader_set.html#aaab9066add07f23fd160ceb05831eb86',1,'zen::gfxcore::zShaderSet']]], - ['getlowpoint',['GetLowPoint',['../classzen_1_1gfx_1_1z_polygon.html#a3fad6b6af1a44dac05b4cecb9bfdc31d',1,'zen::gfx::zPolygon']]], + ['getlowpoint',['GetLowPoint',['../classzen_1_1gfx_1_1z_polygon.html#ae9034f5809ff965852ae22fa4d869b19',1,'zen::gfx::zPolygon']]], ['getmaterial',['GetMaterial',['../classzen_1_1gfx_1_1z_polygon.html#a54a92a7768eafb28d57909f4313223bc',1,'zen::gfx::zPolygon']]], ['getmouseposition',['GetMousePosition',['../classzen_1_1gfx_1_1z_window.html#a842bda949d45c6cedb9c7eabc090e23f',1,'zen::gfx::zWindow::GetMousePosition()'],['../namespacezen_1_1evt.html#a936d1cbb9682e660e2b1da249e137af0',1,'zen::evt::GetMousePosition()']]], ['getmousestate',['GetMouseState',['../classzen_1_1gfx_1_1z_window.html#ad2a883491d08d85b6e101dbef3cebef5',1,'zen::gfx::zWindow::GetMouseState()'],['../namespacezen_1_1evt.html#a99695098183c4a3750d66515c95c6103',1,'zen::evt::GetMouseState()']]], @@ -49,6 +50,7 @@ var searchData= ['getpointer',['GetPointer',['../classzen_1_1math_1_1matrix4x4__t.html#a082d67aac74477832c4c9165c2a62b3d',1,'zen::math::matrix4x4_t']]], ['getposition',['GetPosition',['../classzen_1_1gfx_1_1z_light.html#aa9ada375f64ef1578b9be6962d0f650a',1,'zen::gfx::zLight::GetPosition()'],['../classzen_1_1gfx_1_1z_polygon.html#ade8d718f4392ea6f7d36563363d667db',1,'zen::gfx::zPolygon::GetPosition()'],['../classzen_1_1obj_1_1z_entity.html#af6802dca2ddf3532e4e6648ef416e77c',1,'zen::obj::zEntity::GetPosition()']]], ['getprojectionmatrix',['GetProjectionMatrix',['../classzen_1_1gfxcore_1_1z_renderer.html#a1e101eb52b27cb1f4d37a30f1bce6c14',1,'zen::gfxcore::zRenderer::GetProjectionMatrix()'],['../classzen_1_1gfx_1_1z_window.html#ac5d44160b572c687abf1d76be0c30ebc',1,'zen::gfx::zWindow::GetProjectionMatrix()']]], + ['getrate',['GetRate',['../classg_bullet.html#a910af94772488e88054a93143aaccdb8',1,'gBullet']]], ['getresultcount',['GetResultCount',['../classzen_1_1util_1_1z_file_parser.html#a9758037437c028ded13fd2462e5e22e5',1,'zen::util::zFileParser']]], ['getresults',['GetResults',['../classzen_1_1util_1_1z_file_parser.html#a9a30a5210c76a64ecd7e131b885c481b',1,'zen::util::zFileParser']]], ['getshaderlog',['GetShaderLog',['../classzen_1_1gfxcore_1_1z_shader.html#a4863dc27c0c73c12730178572b441cdd',1,'zen::gfxcore::zShader']]], @@ -73,7 +75,8 @@ var searchData= ['getverticesfromgpu',['GetVerticesFromGPU',['../classzen_1_1gfxcore_1_1z_vertex_array.html#a3d368e58af1958da194c5c85e7086285',1,'zen::gfxcore::zVertexArray']]], ['getw',['GetW',['../classzen_1_1gfx_1_1z_polygon.html#ad9810bdc85ac5ccb72b0e07880b075b7',1,'zen::gfx::zPolygon::GetW()'],['../classzen_1_1obj_1_1z_entity.html#a2ca996948f259af706995c06267a4bb8',1,'zen::obj::zEntity::GetW()']]], ['getwidth',['GetWidth',['../classzen_1_1gfxcore_1_1z_texture.html#a23cb398f680bd7dd2f4a7451207469e5',1,'zen::gfxcore::zTexture::GetWidth()'],['../classzen_1_1gfx_1_1z_render_target.html#a4a502b9d08550f6cf41f106b85880686',1,'zen::gfx::zRenderTarget::GetWidth()'],['../classzen_1_1gfx_1_1z_scene.html#a894be27d94edac743016a8db6af64e6b',1,'zen::gfx::zScene::GetWidth()'],['../classzen_1_1gfx_1_1z_window.html#ad90088168177bb1e68dd531405b76a2a',1,'zen::gfx::zWindow::GetWidth()']]], - ['getx',['GetX',['../classzen_1_1gfx_1_1z_polygon.html#a232d4b4224a1cc30f34c6a56f4d1e1a7',1,'zen::gfx::zPolygon::GetX()'],['../classzen_1_1obj_1_1z_entity.html#aec6363ad5d3af581c4759ad8d68c43c6',1,'zen::obj::zEntity::GetX()']]], - ['gety',['GetY',['../classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe',1,'zen::gfx::zPolygon::GetY()'],['../classzen_1_1obj_1_1z_entity.html#a903736be5f221a26c27505daa4c92854',1,'zen::obj::zEntity::GetY()']]], - ['glcheck',['glCheck',['../namespacezen_1_1gfxcore.html#ae4533b6d5c7873ea5ba0de62ad7af968',1,'zen::gfxcore']]] + ['getx',['GetX',['../classzen_1_1gfx_1_1z_polygon.html#a232d4b4224a1cc30f34c6a56f4d1e1a7',1,'zen::gfx::zPolygon::GetX()'],['../classzen_1_1obj_1_1z_entity.html#aec6363ad5d3af581c4759ad8d68c43c6',1,'zen::obj::zEntity::GetX()'],['../classg_bullet.html#a494c1047a643846d40f577bccb7bf773',1,'gBullet::GetX()']]], + ['gety',['GetY',['../classzen_1_1gfx_1_1z_polygon.html#a307c6b9132cae8da193b67e160de2cbe',1,'zen::gfx::zPolygon::GetY()'],['../classzen_1_1obj_1_1z_entity.html#a903736be5f221a26c27505daa4c92854',1,'zen::obj::zEntity::GetY()'],['../classg_bullet.html#a40c02599fddd70e6a7589275bd044e6a',1,'gBullet::GetY()']]], + ['glcheck',['glCheck',['../namespacezen_1_1gfxcore.html#ae4533b6d5c7873ea5ba0de62ad7af968',1,'zen::gfxcore']]], + ['gworld',['gWorld',['../classg_world.html#a91c2f296e6096c352eee81e10e2e6b4a',1,'gWorld']]] ]; diff --git a/docs/search/functions_68.js b/docs/search/functions_68.js index 4aa77be6..3b6e3918 100644 --- a/docs/search/functions_68.js +++ b/docs/search/functions_68.js @@ -1,5 +1,5 @@ var searchData= [ - ['handleevent',['HandleEvent',['../classzen_1_1gui_1_1z_menu.html#a32705a29a503823e30e0de126de32080',1,'zen::gui::zMenu']]], + ['handleevent',['HandleEvent',['../classzen_1_1gui_1_1z_menu.html#a32705a29a503823e30e0de126de32080',1,'zen::gui::zMenu::HandleEvent()'],['../classg_world.html#aa7665b4e000c72b337b6db1abd03097f',1,'gWorld::HandleEvent()']]], ['hash',['hash',['../namespacezen_1_1util.html#a3b73b2608dcb520f9cfc549406b602f1',1,'zen::util']]] ]; diff --git a/docs/search/functions_6c.js b/docs/search/functions_6c.js index a05c264e..b9f4e386 100644 --- a/docs/search/functions_6c.js +++ b/docs/search/functions_6c.js @@ -9,11 +9,12 @@ var searchData= ['loadfromfile',['LoadFromFile',['../classzen_1_1asset_1_1z_asset.html#a6648910c3da736572071300ddac7dae2',1,'zen::asset::zAsset::LoadFromFile()'],['../classzen_1_1sfx_1_1z_audio2_d.html#a22e3a275687da414246c9cdcb419932f',1,'zen::sfx::zAudio2D::LoadFromFile()'],['../classzen_1_1sfx_1_1z_music2_d.html#afe2b58376246241018bfc95d57234c8a',1,'zen::sfx::zMusic2D::LoadFromFile()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#a1ddd9fd90ee82b85d46a6d21bd09a503',1,'zen::sfx::CSound2D::LoadFromFile()'],['../classzen_1_1gfxcore_1_1z_shader.html#a2a86ee7e7602b7d29c0556f9b7212fde',1,'zen::gfxcore::zShader::LoadFromFile()'],['../classzen_1_1gfxcore_1_1z_shader_set.html#a5d423c6aa3ea56a99d8b6957ac2a888e',1,'zen::gfxcore::zShaderSet::LoadFromFile()'],['../classzen_1_1gfxcore_1_1z_texture.html#ab13cf970986b01c8ec336ee6482de664',1,'zen::gfxcore::zTexture::LoadFromFile()'],['../classzen_1_1gfx_1_1z_material.html#a4bc7f7cf0e7d5b50a2b6c3bb16a50d5a',1,'zen::gfx::zMaterial::LoadFromFile()'],['../classzen_1_1gui_1_1z_font.html#a2ff0c9cff415a035b0e38855d7c25cc5',1,'zen::gui::zFont::LoadFromFile()'],['../classzen_1_1gui_1_1_c_font_atlas.html#ad8f2bab0ba9424845c7a6dabade8d4a8',1,'zen::gui::CFontAtlas::LoadFromFile()'],['../classzen_1_1lvl_1_1z_level_loader.html#abbdb81078346ea39b698975ff9b77c59',1,'zen::lvl::zLevelLoader::LoadFromFile()'],['../classzen_1_1obj_1_1z_animation.html#adcba40fcbe415c8fc02eeebdc63f63ff',1,'zen::obj::zAnimation::LoadFromFile()'],['../classzen_1_1obj_1_1z_entity.html#a12daa37cf2b47890da2540c5d0997f9b',1,'zen::obj::zEntity::LoadFromFile()'],['../classzen_1_1util_1_1z_file_parser.html#a4125da033c5afa59c8987fa74e0b0d60',1,'zen::util::zFileParser::LoadFromFile()'],['../classzen_1_1util_1_1z_parser.html#a047531e22d4a7c024082696156a15333',1,'zen::util::zParser::LoadFromFile()'],['../classzen_1_1util_1_1z_x_m_l_parser.html#a2321daa3ee66d147209c094a87bb3f30',1,'zen::util::zXMLParser::LoadFromFile()']]], ['loadfromraw',['LoadFromRaw',['../classzen_1_1gfxcore_1_1z_shader.html#afc778e41ce5536481c3c727037b2f7ec',1,'zen::gfxcore::zShader::LoadFromRaw()'],['../classzen_1_1gfxcore_1_1z_texture.html#a34ce25f6efa6199e516aa7114f0f7c6c',1,'zen::gfxcore::zTexture::LoadFromRaw()']]], ['loadfromstr',['LoadFromStr',['../classzen_1_1gfxcore_1_1z_shader_set.html#ab57defd932dfa4192221fcea6bbf25ed',1,'zen::gfxcore::zShaderSet']]], - ['loadfromstream',['LoadFromStream',['../classzen_1_1gfx_1_1z_material.html#a767c6590268bef4eec587e49abe91116',1,'zen::gfx::zMaterial::LoadFromStream()'],['../classzen_1_1util_1_1z_file_parser.html#adeb9b19a83a1a6c2827a036318d9c209',1,'zen::util::zFileParser::LoadFromStream()'],['../classzen_1_1util_1_1z_parser.html#a3b51640e20788ab80f4933daa552f5ef',1,'zen::util::zParser::LoadFromStream(std::ifstream &file, const std::streampos &start=0, const std::streampos &finish=-1, const char *fn="file")'],['../classzen_1_1util_1_1z_parser.html#a9aa89d42ab16b1c8710d288b40a09cb8',1,'zen::util::zParser::LoadFromStream(const char **str, const uint32_t start, const uint32_t finish)']]], - ['loadfromstreamuntil',['LoadFromStreamUntil',['../classzen_1_1util_1_1z_file_parser.html#a6ca2fe02ff85919a2c76dfb4445fc62d',1,'zen::util::zFileParser']]], + ['loadfromstream',['LoadFromStream',['../classzen_1_1gfx_1_1z_material.html#a767c6590268bef4eec587e49abe91116',1,'zen::gfx::zMaterial::LoadFromStream()'],['../classzen_1_1util_1_1z_file_parser.html#a264a42f7c8879c34710f15a31a639bae',1,'zen::util::zFileParser::LoadFromStream()'],['../classzen_1_1util_1_1z_parser.html#a3b51640e20788ab80f4933daa552f5ef',1,'zen::util::zParser::LoadFromStream(std::ifstream &file, const std::streampos &start=0, const std::streampos &finish=-1, const char *fn="file")'],['../classzen_1_1util_1_1z_parser.html#a9aa89d42ab16b1c8710d288b40a09cb8',1,'zen::util::zParser::LoadFromStream(const char **str, const uint32_t start, const uint32_t finish)']]], + ['loadfromstreamuntil',['LoadFromStreamUntil',['../classzen_1_1util_1_1z_file_parser.html#a8a8e702d15b655d041d949830ca43527',1,'zen::util::zFileParser']]], ['loadfromstring',['LoadFromString',['../classzen_1_1util_1_1z_x_m_l_parser.html#a0b8ed96d2152a22feefd68cb98b7ba7d',1,'zen::util::zXMLParser']]], ['loadfromtexture',['LoadFromTexture',['../classzen_1_1obj_1_1z_animation.html#a8d9a58895fbc85d08a940d82eb0c156a',1,'zen::obj::zAnimation::LoadFromTexture()'],['../classzen_1_1obj_1_1z_entity.html#aad6f5bd0a5e765f0082b3fbd253b1f68',1,'zen::obj::zEntity::LoadFromTexture()']]], ['loadintovao',['LoadIntoVAO',['../classzen_1_1gfx_1_1z_polygon.html#a8477362b059957c20edb7dfe4ff04fd9',1,'zen::gfx::zPolygon']]], + ['loadlevel',['LoadLevel',['../classg_world.html#a49e59b401c95d16de2f2db26450d0ebf',1,'gWorld']]], ['loadtexture',['LoadTexture',['../classzen_1_1gfx_1_1z_material.html#ad2efdd2bd417020f5044d40a81cd7db2',1,'zen::gfx::zMaterial']]], ['loadtexturefromfile',['LoadTextureFromFile',['../classzen_1_1gfx_1_1z_material.html#aceadc7675f220a26dc57ac615ee8a856',1,'zen::gfx::zMaterial']]], ['loadtexturefromhandle',['LoadTextureFromHandle',['../classzen_1_1gfx_1_1z_material.html#ac77e0edd9c6d88159dea61fe382e912b',1,'zen::gfx::zMaterial']]], diff --git a/docs/search/functions_6d.js b/docs/search/functions_6d.js index 28733a1e..a551c247 100644 --- a/docs/search/functions_6d.js +++ b/docs/search/functions_6d.js @@ -1,9 +1,9 @@ var searchData= [ ['magnitude',['Magnitude',['../structzen_1_1math_1_1z_vector.html#ac9ca9cc5adb430ec34306df49e0ff17c',1,'zen::math::zVector']]], - ['main',['main',['../_pong_8cpp.html#ae66f6b31b5ad750f1fe042a706a4e3d4',1,'Pong.cpp']]], - ['main1',['main1',['../_collision_test_8cpp.html#a8006ac13983b83591702d97d584fc0eb',1,'CollisionTest.cpp']]], - ['main2',['main2',['../_engine_test_8cpp.html#a75c2e94360fa8e46050b4f66fe444d6b',1,'EngineTest.cpp']]], + ['main',['main',['../_level_test_8cpp.html#a0ddf1224851353fc92bfbff6f499fa97',1,'LevelTest.cpp']]], + ['main1',['main1',['../_pong_8cpp.html#a8006ac13983b83591702d97d584fc0eb',1,'Pong.cpp']]], + ['main2',['main2',['../_collision_test_8cpp.html#a0e663f52efbc8593793d628b4259ce9b',1,'main2(): CollisionTest.cpp'],['../_engine_test_8cpp.html#a75c2e94360fa8e46050b4f66fe444d6b',1,'main2(int argc, char *argv[]): EngineTest.cpp']]], ['make_5fball',['make_ball',['../_pong_8cpp.html#a98a1b5ac138d1987c46cd622078b22a1',1,'Pong.cpp']]], ['maptexcoords',['MapTexCoords',['../classzen_1_1gfx_1_1z_polygon.html#aa2df331795d72f7554bba150831c332a',1,'zen::gfx::zPolygon']]], ['matrix4x4_5ft',['matrix4x4_t',['../classzen_1_1math_1_1matrix4x4__t.html#a890e3e9d00dc7fdeac1584b1a927034a',1,'zen::math::matrix4x4_t::matrix4x4_t()'],['../classzen_1_1math_1_1matrix4x4__t.html#a49dffe1c86a43ba7543352eaf050bb87',1,'zen::math::matrix4x4_t::matrix4x4_t(const real_t values[4][4])'],['../classzen_1_1math_1_1matrix4x4__t.html#a04011aa970ede9e04b3f95825fe02ff0',1,'zen::math::matrix4x4_t::matrix4x4_t(const real_t **ppvalues)'],['../classzen_1_1math_1_1matrix4x4__t.html#a4027c831e496ddff65875a47b0ebc71f',1,'zen::math::matrix4x4_t::matrix4x4_t(const matrix4x4_t &Copy)']]], diff --git a/docs/search/functions_70.js b/docs/search/functions_70.js index f09d7572..54daff10 100644 --- a/docs/search/functions_70.js +++ b/docs/search/functions_70.js @@ -5,6 +5,7 @@ var searchData= ['place',['Place',['../classzen_1_1gui_1_1z_button.html#a7241adecac3cf81a29df42e870850399',1,'zen::gui::zButton::Place(const math::vector_t &Pos)'],['../classzen_1_1gui_1_1z_button.html#a7cf249af545e480707c3717fe36b4e06',1,'zen::gui::zButton::Place(const real_t x, const real_t y)']]], ['play',['Play',['../classzen_1_1sfx_1_1z_audio2_d.html#a3ea7b7d916c700b9e6310a1fd2a512d7',1,'zen::sfx::zAudio2D::Play()'],['../classzen_1_1sfx_1_1z_music2_d.html#a17b63a4e572735c9cf100e2b64f5ad25',1,'zen::sfx::zMusic2D::Play()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#aa581f26e77c034a058ba3dfc4ebcbca7',1,'zen::sfx::CSound2D::Play()']]], ['playanimation',['PlayAnimation',['../classzen_1_1obj_1_1z_animation.html#a64d58d1759855bbf4d673b1b6ed4c1f6',1,'zen::obj::zAnimation']]], + ['playing',['Playing',['../classzen_1_1obj_1_1z_animation.html#adfa021b895a6673393ac751286500f40',1,'zen::obj::zAnimation']]], ['pollevents',['PollEvents',['../classzen_1_1evt_1_1z_event_handler.html#a40db94c470b9c7408345cf68c3f5103d',1,'zen::evt::zEventHandler']]], ['pong_5fhost_5fport',['PONG_HOST_PORT',['../_pong_8cpp.html#a232e48cb66000f2afe8774ea9c30b480',1,'Pong.cpp']]], ['pong_5fjoin_5fport',['PONG_JOIN_PORT',['../_pong_8cpp.html#a6f341495c32e1c9c4cca59d84b85a94c',1,'Pong.cpp']]], diff --git a/docs/search/functions_72.js b/docs/search/functions_72.js index d1af3c15..36cdf42e 100644 --- a/docs/search/functions_72.js +++ b/docs/search/functions_72.js @@ -9,14 +9,16 @@ var searchData= ['recvfrom',['RecvFrom',['../classzen_1_1net_1_1z_socket.html#a24fbcc65908ca3ea2e8c9ca3e3c301dd',1,'zen::net::zSocket']]], ['reload',['Reload',['../classzen_1_1asset_1_1z_asset.html#a2b9bcd7e17eb9c1de704124106bd96ba',1,'zen::asset::zAsset']]], ['removeentity',['RemoveEntity',['../classzen_1_1gfx_1_1z_scene.html#a20048957053138cc366344e16c614561',1,'zen::gfx::zScene::RemoveEntity(const obj::zEntity &Obj)'],['../classzen_1_1gfx_1_1z_scene.html#ad3636d08d2f1492469b8af350d0b6062',1,'zen::gfx::zScene::RemoveEntity(const uint32_t index)']]], + ['removelight',['RemoveLight',['../classzen_1_1gfx_1_1z_scene.html#ace7ecda0222bcc628b4d1e548fbafb7f',1,'zen::gfx::zScene']]], ['removematerial',['RemoveMaterial',['../classzen_1_1gfx_1_1z_polygon.html#a1e58cf0134e0693790713f7791f2d736',1,'zen::gfx::zPolygon']]], - ['render',['Render',['../classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1',1,'zen::gfx::zScene::Render()'],['../classzen_1_1gui_1_1z_font.html#a7727aa647d1a37a921cc0b03c20079f9',1,'zen::gui::zFont::Render(obj::zEntity &Ent, const string_t &text="") const '],['../classzen_1_1gui_1_1z_font.html#a3a8c98b442728bb8476d37957e03faff',1,'zen::gui::zFont::Render(gfxcore::zTexture &Texture, const string_t &text="") const '],['../classzen_1_1gui_1_1_c_font_atlas.html#ac99e1f56b7dc051e8ad7573fb4eeeff5',1,'zen::gui::CFontAtlas::Render()']]], + ['render',['Render',['../classzen_1_1gfx_1_1z_scene.html#ab58eed1825bbe82791af92ccf45e72a1',1,'zen::gfx::zScene::Render()'],['../classzen_1_1gui_1_1z_font.html#a7727aa647d1a37a921cc0b03c20079f9',1,'zen::gui::zFont::Render(obj::zEntity &Ent, const string_t &text="") const '],['../classzen_1_1gui_1_1z_font.html#a3a8c98b442728bb8476d37957e03faff',1,'zen::gui::zFont::Render(gfxcore::zTexture &Texture, const string_t &text="") const '],['../classzen_1_1gui_1_1_c_font_atlas.html#ac99e1f56b7dc051e8ad7573fb4eeeff5',1,'zen::gui::CFontAtlas::Render()'],['../classg_world.html#aa9ee395a82e26050fe1c39c542d264e2',1,'gWorld::Render()']]], ['renderwithfont',['RenderWithFont',['../classzen_1_1gui_1_1z_menu.html#a91f65e62cff6b72a1c49a821cac4e91b',1,'zen::gui::zMenu']]], ['reset',['Reset',['../structzen_1_1evt_1_1event__t.html#a90a985780dfda311b0d7ce5c05439c8b',1,'zen::evt::event_t::Reset()'],['../classzen_1_1util_1_1z_parser.html#a5f14f8154d1d8897c8321cd95efb4712',1,'zen::util::zParser::Reset()']]], ['resetmaterialstate',['ResetMaterialState',['../classzen_1_1gfxcore_1_1z_renderer.html#a9d01f746eaac52b27b6a66255ba48c5a',1,'zen::gfxcore::zRenderer']]], ['resetstack',['ResetStack',['../classzen_1_1lua_1_1z_lua.html#a951435920c5a01e940c2d7f142a73355',1,'zen::lua::zLua']]], ['resize',['Resize',['../classzen_1_1gfx_1_1z_quad.html#aa18ef578cfc4552effe995fa42e7ce59',1,'zen::gfx::zQuad::Resize(const math::vectoru16_t &Size)'],['../classzen_1_1gfx_1_1z_quad.html#aecfed1edd9f86fdd22522ac869cae5a2',1,'zen::gfx::zQuad::Resize(const uint16_t w, const uint16_t h)']]], ['resulttobool',['ResultToBool',['../classzen_1_1util_1_1z_file_parser.html#a7c4a7903e417cd09b31fae28c95310b8',1,'zen::util::zFileParser']]], + ['rgb2f',['rgb2f',['../_level_test_8cpp.html#a70a9344ab32a2cccf328642eeab901ae',1,'LevelTest.cpp']]], ['rotate',['Rotate',['../structzen_1_1math_1_1z_vector.html#affdb455acc7582c5b526b4729a6367dd',1,'zen::math::zVector::Rotate()'],['../classzen_1_1obj_1_1z_entity.html#a1b00bde3276274b582490b9c50430708',1,'zen::obj::zEntity::Rotate()']]], ['rotationx',['RotationX',['../classzen_1_1math_1_1matrix4x4__t.html#ad1dd9cf831ffbce5ed2047172b88fca8',1,'zen::math::matrix4x4_t']]], ['rotationy',['RotationY',['../classzen_1_1math_1_1matrix4x4__t.html#ab3e3e5742506498e6fccd736341f9296',1,'zen::math::matrix4x4_t']]], diff --git a/docs/search/functions_73.js b/docs/search/functions_73.js index c99deecc..781d7413 100644 --- a/docs/search/functions_73.js +++ b/docs/search/functions_73.js @@ -11,9 +11,9 @@ var searchData= ['setbrightness',['SetBrightness',['../classzen_1_1gfx_1_1z_light.html#a750b1a6baa892c3bd28c45492a58264d',1,'zen::gfx::zLight']]], ['setbuttonbackground',['SetButtonBackground',['../classzen_1_1gui_1_1z_menu.html#a65aaa3ba87a307ec7e6283a748781a9a',1,'zen::gui::zMenu']]], ['setclearbits',['SetClearBits',['../classzen_1_1gfx_1_1z_window.html#ad87b007c5fddb450c018f6a903d62798',1,'zen::gfx::zWindow']]], - ['setcolor',['SetColor',['../classzen_1_1gfx_1_1z_light.html#a88e3dfd6578acaf653f7f40a585ee892',1,'zen::gfx::zLight::SetColor(const real_t r, const real_t g, const real_t b)'],['../classzen_1_1gfx_1_1z_light.html#adb22c549ade469685f1d5be629467ec5',1,'zen::gfx::zLight::SetColor(const color3f_t &Color)'],['../classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3',1,'zen::gfx::zPolygon::SetColor()'],['../classzen_1_1gui_1_1z_font.html#a8cd1236470fb602bbe20237a8a44398b',1,'zen::gui::zFont::SetColor()'],['../classzen_1_1gui_1_1_c_font_atlas.html#a2002aee613a3edc0014ebbe7fdc5bc42',1,'zen::gui::CFontAtlas::SetColor()']]], + ['setcolor',['SetColor',['../classzen_1_1gfx_1_1z_light.html#a88e3dfd6578acaf653f7f40a585ee892',1,'zen::gfx::zLight::SetColor(const real_t r, const real_t g, const real_t b)'],['../classzen_1_1gfx_1_1z_light.html#adb22c549ade469685f1d5be629467ec5',1,'zen::gfx::zLight::SetColor(const color3f_t &Color)'],['../classzen_1_1gfx_1_1z_polygon.html#a07c24dbdd21b9c510b38256f67e42bc3',1,'zen::gfx::zPolygon::SetColor(const color4f_t &Color)'],['../classzen_1_1gfx_1_1z_polygon.html#a23ad8a42c4b82114209ee864c5be873e',1,'zen::gfx::zPolygon::SetColor(const real_t r, const real_t g, const real_t b, const real_t a=1.0)'],['../classzen_1_1gui_1_1z_font.html#a8cd1236470fb602bbe20237a8a44398b',1,'zen::gui::zFont::SetColor(const color4f_t &Color)'],['../classzen_1_1gui_1_1z_font.html#aabe8618c807f1830296c293387a07f95',1,'zen::gui::zFont::SetColor(const real_t r, const real_t g, const real_t b)'],['../classzen_1_1gui_1_1_c_font_atlas.html#a2002aee613a3edc0014ebbe7fdc5bc42',1,'zen::gui::CFontAtlas::SetColor()']]], ['setdefault',['SetDefault',['../classzen_1_1gui_1_1z_button.html#a5652cc6a2b8ff9ea9a365260a8eb0898',1,'zen::gui::zButton']]], - ['setdepth',['SetDepth',['../classzen_1_1obj_1_1z_entity.html#acaf234556b4960422bc2a6882667767e',1,'zen::obj::zEntity']]], + ['setdepth',['SetDepth',['../classzen_1_1obj_1_1z_entity.html#a0c553e6ddb51ebc2b3bf321e92e61aea',1,'zen::obj::zEntity']]], ['setfilename',['SetFilename',['../classzen_1_1asset_1_1z_asset.html#a272c6b1163fad9b7aa5df9192ab862dc',1,'zen::asset::zAsset::SetFilename()'],['../classzen_1_1util_1_1z_log.html#a5d6771fbef7425b8c39a58ceba171720',1,'zen::util::zLog::SetFilename()']]], ['setfont',['SetFont',['../classzen_1_1gui_1_1z_button.html#ab4be21f09c996b8c247c24c3c1611443',1,'zen::gui::zButton::SetFont()'],['../classzen_1_1gui_1_1z_menu.html#a453ad6ebe7f7c78f32e8d532f926998f',1,'zen::gui::zMenu::SetFont()']]], ['setframerate',['SetFrameRate',['../classzen_1_1util_1_1z_timer.html#a16ae82c520a4e872a25c64036df458d2',1,'zen::util::zTimer']]], @@ -22,7 +22,7 @@ var searchData= ['setinverted',['SetInverted',['../classzen_1_1gfx_1_1z_quad.html#a432e755f175068c7e354053a37ac2365',1,'zen::gfx::zQuad']]], ['setkeyframecount',['SetKeyframeCount',['../classzen_1_1obj_1_1z_animation.html#af9f2e332f17dbe5bddd6e507549c6dd7',1,'zen::obj::zAnimation']]], ['setkeyframerate',['SetKeyframeRate',['../classzen_1_1obj_1_1z_animation.html#a7622374cda2d6d88bc9e2bcfafb7275b',1,'zen::obj::zAnimation']]], - ['setkeyframesize',['SetKeyframeSize',['../classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07',1,'zen::obj::zAnimation::SetKeyframeSize(const math::vectoru16_t &Size)'],['../classzen_1_1obj_1_1z_animation.html#a45db59d983ba8e5ff681fe2757f901bc',1,'zen::obj::zAnimation::SetKeyframeSize(const uint16_t w, const uint16_t h)']]], + ['setkeyframesize',['SetKeyframeSize',['../classzen_1_1obj_1_1z_animation.html#a33cd5b24da0db101668b121f47de4538',1,'zen::obj::zAnimation::SetKeyframeSize(const uint16_t w, const uint16_t h)'],['../classzen_1_1obj_1_1z_animation.html#a3322423803a9e2ffbb4b31e78e650f07',1,'zen::obj::zAnimation::SetKeyframeSize(const math::vectoru16_t &Size)']]], ['setlog',['SetLog',['../classzen_1_1z_subsystem.html#ad7382150f00b99910c5c9bb63a95e299',1,'zen::zSubsystem']]], ['setmaximumangle',['SetMaximumAngle',['../classzen_1_1gfx_1_1z_light.html#ad0c225879baccdb81db9206d0350d269',1,'zen::gfx::zLight']]], ['setminimumangle',['SetMinimumAngle',['../classzen_1_1gfx_1_1z_light.html#a2bb6a384afd9f987ae7cbefca7bd4206',1,'zen::gfx::zLight']]], @@ -33,6 +33,7 @@ var searchData= ['setowner',['SetOwner',['../classzen_1_1asset_1_1z_asset.html#ada0c2746ec40b6dfdfc3fe168593ab1c',1,'zen::asset::zAsset']]], ['setparameter',['SetParameter',['../classzen_1_1gfx_1_1z_effect.html#a721e306846c082f43701117d0a579946',1,'zen::gfx::zEffect::SetParameter(const string_t &name, const real_t *pValues, const size_t count=1)'],['../classzen_1_1gfx_1_1z_effect.html#a5b71503a8e29079d927478bfe976b454',1,'zen::gfx::zEffect::SetParameter(const string_t &name, const int *pValues, const size_t count=1)'],['../classzen_1_1gfx_1_1z_effect.html#a4875eb666b7964d7250dda3e998917da',1,'zen::gfx::zEffect::SetParameter(const string_t &name, const math::matrix4x4_t &Matrix) const ']]], ['setposition',['SetPosition',['../classzen_1_1gfx_1_1z_light.html#ad58b74bcf6cfb1f365560dde0a3ef92f',1,'zen::gfx::zLight::SetPosition(const real_t x, const real_t y)'],['../classzen_1_1gfx_1_1z_light.html#afee76cb867656b3dc4bd18d95aec8385',1,'zen::gfx::zLight::SetPosition(const math::vector_t &Pos)']]], + ['setrate',['SetRate',['../classg_bullet.html#ab1c1f6e32fc563c7fd13497387da1b6d',1,'gBullet']]], ['setrepeating',['SetRepeating',['../classzen_1_1gfx_1_1z_quad.html#a2461053b411db584b9c3dd40364cdff2',1,'zen::gfx::zQuad']]], ['setseethrough',['SetSeeThrough',['../classzen_1_1gfx_1_1z_scene.html#af6845c571c20107f4258ec66da0b2f65',1,'zen::gfx::zScene']]], ['setsize',['SetSize',['../classzen_1_1gui_1_1z_font.html#a3ab8b4e8391ba35b398935bb727ab5f2',1,'zen::gui::zFont']]], @@ -43,6 +44,7 @@ var searchData= ['settitle',['SetTitle',['../classzen_1_1gui_1_1z_menu.html#a22b8915957cea48a95c31f6e300319c4',1,'zen::gui::zMenu']]], ['settype',['SetType',['../classzen_1_1gfxcore_1_1z_shader.html#a29e6b2e65239a7ad8e36524ebd81c6d2',1,'zen::gfxcore::zShader::SetType()'],['../classzen_1_1gfx_1_1z_effect.html#a5b23e013a9af07ffc5c4d6d28d442b86',1,'zen::gfx::zEffect::SetType()'],['../classzen_1_1gfx_1_1z_light.html#ac6dfc7af8d9c157fce58d2fbbc460f11',1,'zen::gfx::zLight::SetType()']]], ['shear',['Shear',['../classzen_1_1math_1_1matrix4x4__t.html#a4ea7a579fa5b9f8ef1481c11f8c1d115',1,'zen::math::matrix4x4_t::Shear()'],['../classzen_1_1obj_1_1z_entity.html#a1e482bcc7d010db11da731eb4ae913ea',1,'zen::obj::zEntity::Shear()']]], + ['shiftentity',['ShiftEntity',['../classzen_1_1gfx_1_1z_scene.html#a3d15fe6db75f5b1e8190f28b0fda1d5f',1,'zen::gfx::zScene']]], ['showxmlerror',['ShowXMLError',['../classzen_1_1util_1_1z_x_m_l_parser.html#a2f98c13f5ea15dce2d2ec23fa461cd6f',1,'zen::util::zXMLParser']]], ['sleep',['Sleep',['../classzen_1_1util_1_1z_timer.html#a391c975d03981bb7607e28db36720eec',1,'zen::util::zTimer']]], ['sortbyalpha',['SortByAlpha',['../classzen_1_1gfxcore_1_1z_sorter.html#a5cc3a9635c975bfa71032bf3f17a12ac',1,'zen::gfxcore::zSorter']]], diff --git a/docs/search/functions_75.js b/docs/search/functions_75.js index f6735638..1aaff452 100644 --- a/docs/search/functions_75.js +++ b/docs/search/functions_75.js @@ -2,5 +2,5 @@ var searchData= [ ['unbind',['Unbind',['../classzen_1_1gfxcore_1_1z_g_l_subsystem.html#a96c2d7c22ad97fb4a2a10a7f296d1586',1,'zen::gfxcore::zGLSubsystem::Unbind()'],['../classzen_1_1gfxcore_1_1z_shader_set.html#aa3fd70014f9bbfd301e09200c51767cd',1,'zen::gfxcore::zShaderSet::Unbind()'],['../classzen_1_1gfxcore_1_1z_texture.html#ad37c5ef5e6006ce9947555c5c62c9a8b',1,'zen::gfxcore::zTexture::Unbind()'],['../classzen_1_1gfxcore_1_1z_vertex_array.html#ad4a61a0430954edf60dc076f06c36397',1,'zen::gfxcore::zVertexArray::Unbind()'],['../classzen_1_1gfx_1_1z_render_target.html#ae0cda2660f0cefefd78df4b7ed8da01a',1,'zen::gfx::zRenderTarget::Unbind()']]], ['unloadsource',['UnloadSource',['../classzen_1_1sfx_1_1z_audio2_d.html#ad5dc85a324f74758b645b88b7b16e6de',1,'zen::sfx::zAudio2D']]], - ['update',['Update',['../classzen_1_1sfx_1_1z_audio2_d.html#a944f23ca58aa18393ddf978f40537e3f',1,'zen::sfx::zAudio2D::Update()'],['../classzen_1_1sfx_1_1z_music2_d.html#afcd5133c4f288f09aa7d2a8d58d67a5a',1,'zen::sfx::zMusic2D::Update()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#a7feffeaf5e36a465db17e5e68c35148b',1,'zen::sfx::CSound2D::Update()'],['../classzen_1_1gfx_1_1z_window.html#ab43e8c6d204819da11380772da928561',1,'zen::gfx::zWindow::Update()'],['../classzen_1_1gui_1_1z_menu.html#aa5b5b8c50bee2a1c707ff991bab7d302',1,'zen::gui::zMenu::Update()'],['../classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063',1,'zen::obj::zAnimation::Update()'],['../classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc',1,'zen::obj::zEntity::Update()']]] + ['update',['Update',['../classzen_1_1sfx_1_1z_audio2_d.html#a944f23ca58aa18393ddf978f40537e3f',1,'zen::sfx::zAudio2D::Update()'],['../classzen_1_1sfx_1_1z_music2_d.html#afcd5133c4f288f09aa7d2a8d58d67a5a',1,'zen::sfx::zMusic2D::Update()'],['../classzen_1_1sfx_1_1_c_sound2_d.html#a7feffeaf5e36a465db17e5e68c35148b',1,'zen::sfx::CSound2D::Update()'],['../classzen_1_1gfx_1_1z_window.html#ab43e8c6d204819da11380772da928561',1,'zen::gfx::zWindow::Update()'],['../classzen_1_1gui_1_1z_menu.html#aa5b5b8c50bee2a1c707ff991bab7d302',1,'zen::gui::zMenu::Update()'],['../classzen_1_1obj_1_1z_animation.html#ab5b6f7696350c1e3a285b49b0c2fe063',1,'zen::obj::zAnimation::Update()'],['../classzen_1_1obj_1_1z_entity.html#a3f82751104a56d0fa28c31f2a9a7f5fc',1,'zen::obj::zEntity::Update()'],['../classg_bullet.html#a99b2ce1395234c6d9b8b0c979d541084',1,'gBullet::Update()'],['../classg_world.html#a78e9f746cacd05afee871bea685b78c7',1,'gWorld::Update()']]] ]; diff --git a/docs/search/functions_76.js b/docs/search/functions_76.js deleted file mode 100644 index 3ffa6e84..00000000 --- a/docs/search/functions_76.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['vector',['Vector',['../structzen_1_1math_1_1_vector.html#a04d95dd464e4e297d6552741cdefe4fb',1,'zen::math::Vector::Vector()'],['../structzen_1_1math_1_1_vector.html#abb29720ec72d1344e0218c2a9512f4ac',1,'zen::math::Vector::Vector(T x, T y, T z=1)'],['../structzen_1_1math_1_1_vector.html#a6b3f65bd14727cefb030a6a126dd4fc4',1,'zen::math::Vector::Vector(const Vector< U > &C)']]] -]; diff --git a/docs/search/functions_7e.js b/docs/search/functions_7e.js index b1be4f99..908ef92a 100644 --- a/docs/search/functions_7e.js +++ b/docs/search/functions_7e.js @@ -2,6 +2,8 @@ var searchData= [ ['_7ecfont',['~CFont',['../classzen_1_1gui_1_1_c_font_atlas.html#ac372965ce36455154d00fe05b6d25ffb',1,'zen::gui::CFontAtlas']]], ['_7ecsound2d',['~CSound2D',['../classzen_1_1sfx_1_1_c_sound2_d.html#af011d370d19170f5098097accc07b0b4',1,'zen::sfx::CSound2D']]], + ['_7egbullet',['~gBullet',['../classg_bullet.html#a42a81cc48419d52e17d3a7b68ebc3f6a',1,'gBullet']]], + ['_7egworld',['~gWorld',['../classg_world.html#a8e50f4061f1f06919147b589c7e1a679',1,'gWorld']]], ['_7ezallocator',['~zAllocator',['../classzen_1_1z_allocator.html#a52a872b36a2bb398b399af241e2e350f',1,'zen::zAllocator']]], ['_7ezanimation',['~zAnimation',['../classzen_1_1obj_1_1z_animation.html#a5e43a113a9b7e662c2fa1f9c3cae3e49',1,'zen::obj::zAnimation']]], ['_7ezasset',['~zAsset',['../classzen_1_1asset_1_1z_asset.html#a63e5f41f65f468b3653ae4f5d1b82549',1,'zen::asset::zAsset']]], diff --git a/docs/search/pages_62.js b/docs/search/pages_62.js deleted file mode 100644 index 8d42650d..00000000 --- a/docs/search/pages_62.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['bug_20list',['Bug List',['../bug.html',1,'']]] -]; diff --git a/docs/search/related_63.js b/docs/search/related_63.js deleted file mode 100644 index 849d782c..00000000 --- a/docs/search/related_63.js +++ /dev/null @@ -1,5 +0,0 @@ -var searchData= -[ - ['cassetmanager',['CAssetManager',['../classzen_1_1asset_1_1_c_asset.html#aa20cb7dae82bb824a64cb5b5bd8899f9',1,'zen::asset::CAsset']]], - ['cmaterial',['CMaterial',['../classzen_1_1gfx_1_1_c_effect.html#a0b4556cbcbc88cbe9ec08c9f5b372880',1,'zen::gfx::CEffect']]] -]; diff --git a/docs/search/search.js b/docs/search/search.js index b3815875..ba16418f 100644 --- a/docs/search/search.js +++ b/docs/search/search.js @@ -15,10 +15,11 @@ var indexSectionsWithContent = 5: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111111111111111111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 6: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101000001001000101110101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 7: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000100100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 8: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100011100100101111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 8: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100110011100110101111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 9: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000001010000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 10: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010100001111000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 11: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + 10: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001001000001000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 11: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010100001111000101000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 12: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" }; var indexSectionNames = @@ -33,8 +34,9 @@ var indexSectionNames = 7: "enums", 8: "enumvalues", 9: "related", - 10: "groups", - 11: "pages" + 10: "defines", + 11: "groups", + 12: "pages" }; function convertToId(search) diff --git a/docs/search/typedefs_73.js b/docs/search/typedefs_73.js index edaa020d..d4790894 100644 --- a/docs/search/typedefs_73.js +++ b/docs/search/typedefs_73.js @@ -1,4 +1,5 @@ var searchData= [ + ['socket_5ft',['socket_t',['../namespacezen_1_1net.html#a911b6c81a3eca360b97dac64e3ee7fb9',1,'zen::net']]], ['string_5ft',['string_t',['../namespacezen.html#a898a006a4d73069f64dfc5306fdc2cee',1,'zen']]] ]; diff --git a/docs/search/typedefs_75.js b/docs/search/typedefs_75.js deleted file mode 100644 index 9831d219..00000000 --- a/docs/search/typedefs_75.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['uint64_5ft',['uint64_t',['../_string_8hpp.html#aaa5d1cd013383c889537491c3cfd9aad',1,'String.hpp']]] -]; diff --git a/docs/search/variables_62.js b/docs/search/variables_62.js index 387e1fc9..10424297 100644 --- a/docs/search/variables_62.js +++ b/docs/search/variables_62.js @@ -7,6 +7,8 @@ var searchData= ['bad_5fpair',['BAD_PAIR',['../_entity_8hpp.html#adf8cb8a7fd0b346ab3cf3dc57dfbfa1f',1,'Entity.hpp']]], ['bad_5fposition',['BAD_POSITION',['../_entity_8hpp.html#a447a12db570f2f6f3cfc9328daf1d8c6',1,'Entity.hpp']]], ['blacklist',['blacklist',['../namespacezen_1_1lvl.html#a4465479c53f0a8cd38ce315f20f5c024',1,'zen::lvl::spawn_t']]], + ['box1',['box1',['../structzen_1_1math_1_1cquery__t.html#acdee2a05c3f7d45509b28fc3be0c25b5',1,'zen::math::cquery_t']]], + ['box2',['box2',['../structzen_1_1math_1_1cquery__t.html#a68fd57e277ef67047a8b20b386914f85',1,'zen::math::cquery_t']]], ['br',['br',['../structzen_1_1math_1_1aabb__t.html#a7126b98c6462a78d6cb2169390bfdb6f',1,'zen::math::aabb_t']]], ['buffer_5fcount',['buffer_count',['../classzen_1_1sfx_1_1z_audio2_d.html#a1129676aaf7cb9160f8dce0a5d5f0e89',1,'zen::sfx::zAudio2D::ALData']]], ['buffers',['buffers',['../classzen_1_1sfx_1_1z_audio2_d.html#a7c4845e05581f91360c48d3ace297ab9',1,'zen::sfx::zAudio2D::ALData']]], diff --git a/docs/search/variables_63.js b/docs/search/variables_63.js index 3bbeb80f..25a69e59 100644 --- a/docs/search/variables_63.js +++ b/docs/search/variables_63.js @@ -5,6 +5,7 @@ var searchData= ['children',['children',['../namespacezen_1_1util.html#a31fa35bfe9b153c6b190080134d166a1',1,'zen::util::XMLNode']]], ['chk',['chk',['../namespacezen_1_1net.html#a3d6beb76f6288820b20b946271f747aa',1,'zen::net::IPHeader::chk()'],['../namespacezen_1_1net.html#af4685ac237640265688a189aa1cf1ccb',1,'zen::net::ICMPHeader::chk()']]], ['code',['code',['../namespacezen_1_1net.html#a726424d15d813920d1f5f43dd0c61606',1,'zen::net::ICMPHeader']]], + ['collision',['collision',['../structzen_1_1math_1_1cquery__t.html#afc8ce3b4de8e85705e4e8e7c8ba1296c',1,'zen::math::cquery_t']]], ['color',['color',['../namespacezen_1_1gfxcore.html#a6924733c1ccf66bbc26e0e941f723162',1,'zen::gfxcore::vertex_t']]], ['comma',['COMMA',['../_keyboard_8hpp.html#a28073488d2463f84f89bd8482d9f95a9',1,'Keyboard.hpp']]], ['content',['content',['../namespacezen_1_1util.html#a0e12a71a7e2fa6a9183d046c462ab61d',1,'zen::util::XMLNode']]], diff --git a/docs/search/variables_6c.js b/docs/search/variables_6c.js index b0d4ee98..5def1251 100644 --- a/docs/search/variables_6c.js +++ b/docs/search/variables_6c.js @@ -7,5 +7,7 @@ var searchData= ['left_5fcontrol',['LEFT_CONTROL',['../_keyboard_8hpp.html#ad65ff8b937d27c52405e6fd160531f43',1,'Keyboard.hpp']]], ['left_5fshift',['LEFT_SHIFT',['../_keyboard_8hpp.html#a17f544e0be80f6f423d4365e10c0e305',1,'Keyboard.hpp']]], ['left_5fsuper',['LEFT_SUPER',['../_keyboard_8hpp.html#a3b015542a847d2fc3b9ee501073538df',1,'Keyboard.hpp']]], - ['lights',['lights',['../namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39',1,'zen::lvl::level_t']]] + ['lights',['lights',['../namespacezen_1_1lvl.html#a777909f1dafd68efe38e99e32c20cc39',1,'zen::lvl::level_t']]], + ['line1',['line1',['../structzen_1_1math_1_1cquery__t.html#a520a1e7d3d94d630d9f8e7ef69fda72a',1,'zen::math::cquery_t']]], + ['line2',['line2',['../structzen_1_1math_1_1cquery__t.html#adb33e9eab6670832dadc0303fef776fa',1,'zen::math::cquery_t']]] ]; diff --git a/docs/search/variables_70.js b/docs/search/variables_70.js index db4a843e..70f3a7d5 100644 --- a/docs/search/variables_70.js +++ b/docs/search/variables_70.js @@ -6,7 +6,9 @@ var searchData= ['parent',['parent',['../namespacezen_1_1util.html#a26448969e6306e4a91ffc71867590f55',1,'zen::util::XMLNode']]], ['pause',['PAUSE',['../_keyboard_8hpp.html#ab18e6799e81de4f37123f91bda4f760b',1,'Keyboard.hpp']]], ['period',['PERIOD',['../_keyboard_8hpp.html#a260b2983ea6ece4b2a69b3849f3a3564',1,'Keyboard.hpp']]], + ['physical',['physical',['../namespacezen_1_1lvl.html#ad7d3e124aedb66291a07f84ca038391d',1,'zen::lvl::level_t']]], ['pi',['PI',['../namespacezen_1_1math.html#a9a46d34acc67aa893188fa4feacb9394',1,'zen::math']]], + ['point',['point',['../structzen_1_1math_1_1cquery__t.html#a70b5263e947f4120540dcd6cd167f89d',1,'zen::math::cquery_t']]], ['pointlight_5ffs',['POINTLIGHT_FS',['../namespacezen_1_1gfxcore.html#a4b4908de8dd4b422ecc0f2fb77f80713',1,'zen::gfxcore']]], ['position',['position',['../namespacezen_1_1gfxcore.html#a039ea684a5c58297a199d4190f926f7a',1,'zen::gfxcore::vertex_t::position()'],['../structzen_1_1evt_1_1mouse__t.html#a9781ef6800b370ef8e984ba276ce38a3',1,'zen::evt::mouse_t::position()'],['../namespacezen.html#a9342e3f2e598c3222a5e80ba698a76b9',1,'zen::glyph_t::position()'],['../namespacezen_1_1gui.html#a4f44e466c9172fc8044c042409a48a30',1,'zen::gui::glyph_t::position()'],['../namespacezen_1_1lvl.html#a485dcd48c31a1cbedf472dd04d2148ab',1,'zen::lvl::spawn_t::position()']]], ['print_5fscr',['PRINT_SCR',['../_keyboard_8hpp.html#a63a83e8e10255de4cfeabdf57b48610b',1,'Keyboard.hpp']]], diff --git a/docs/search/variables_74.js b/docs/search/variables_74.js index ad1e28d3..36eeeab5 100644 --- a/docs/search/variables_74.js +++ b/docs/search/variables_74.js @@ -9,7 +9,9 @@ var searchData= ['tl',['tl',['../structzen_1_1math_1_1aabb__t.html#a7af36642567cc7215209a7e55f3b1d73',1,'zen::math::aabb_t']]], ['tos',['tos',['../namespacezen_1_1net.html#ac6220c9fe319f3465912d652c723a44e',1,'zen::net::IPHeader']]], ['total_5flen',['total_len',['../namespacezen_1_1net.html#a78e62c86fd5630ee3becb44a88a2b30c',1,'zen::net::IPHeader']]], + ['tri1',['tri1',['../structzen_1_1math_1_1cquery__t.html#a19350f27be27962c6feedffa68341e05',1,'zen::math::cquery_t']]], + ['tri2',['tri2',['../structzen_1_1math_1_1cquery__t.html#a06be46d2205712500186115c682eccf9',1,'zen::math::cquery_t']]], ['ttl',['ttl',['../namespacezen_1_1net.html#a3bb908d4387b84b906766722cbaeb9cb',1,'zen::net::IPHeader']]], ['two',['TWO',['../_keyboard_8hpp.html#a0673b633b0851b14ed38bd96f5781290',1,'Keyboard.hpp']]], - ['type',['type',['../structzen_1_1evt_1_1event__t.html#a100566fc0993e22a4a8d694713d99a6e',1,'zen::evt::event_t::type()'],['../namespacezen_1_1net.html#a5e557444e534a575a7a6f73fea946bb5',1,'zen::net::ICMPHeader::type()'],['../_pong_8cpp.html#a32d98163424b51c5d9d7576b55266bdf',1,'PongPacket::type()']]] + ['type',['type',['../structzen_1_1evt_1_1event__t.html#a100566fc0993e22a4a8d694713d99a6e',1,'zen::evt::event_t::type()'],['../namespacezen_1_1lvl.html#ab23ca0d4cd1931da4928a4411d8c921b',1,'zen::lvl::spawn_t::type()'],['../namespacezen_1_1net.html#a5e557444e534a575a7a6f73fea946bb5',1,'zen::net::ICMPHeader::type()'],['../_pong_8cpp.html#a32d98163424b51c5d9d7576b55266bdf',1,'PongPacket::type()']]] ]; diff --git a/docs/search/variables_7a.js b/docs/search/variables_7a.js index b34ac6fe..6f668695 100644 --- a/docs/search/variables_7a.js +++ b/docs/search/variables_7a.js @@ -10,7 +10,7 @@ var searchData= ['zenderer_5fgl_5fversion',['ZENDERER_GL_VERSION',['../namespacezen_1_1gfx.html#ae7063428bb7b670de6aa13b3ebc39b2b',1,'zen::gfx']]], ['zentity',['zEntity',['../namespacezen_1_1obj.html#a3112ae30d7f3f81f60f61c3fa56a69f2',1,'zen::obj']]], ['zero',['ZERO',['../_keyboard_8hpp.html#ab284bdf3b32e4fc5d5db7feb9fcfb8f0',1,'Keyboard.hpp']]], - ['zfont',['zFont',['../namespacezen_1_1gui.html#acad61845b417e09a1666960b1a1bd641',1,'zen::gui::zFont()'],['../_effect_8hpp.html#aa379cf6969ed838e641d6af457fba888',1,'ZFONT(): Effect.hpp']]], + ['zfont',['ZFONT',['../_effect_8hpp.html#aa379cf6969ed838e641d6af457fba888',1,'ZFONT(): Effect.hpp'],['../namespacezen_1_1gui.html#acad61845b417e09a1666960b1a1bd641',1,'zen::gui::zFont()']]], ['zfont_5ffs',['ZFONT_FS',['../namespacezen_1_1gfxcore.html#a56b1edbdd18e24621747f5d2363ec5d4',1,'zen::gfxcore']]], ['zrendertarget',['zRenderTarget',['../namespacezen_1_1gfx.html#af57946b222f47ca89c92b313f45e382b',1,'zen::gfx']]], ['zscene',['zScene',['../namespacezen_1_1gfx.html#a99def9de3c0b97969e3ba544c86cc7f6',1,'zen::gfx']]], diff --git a/docs/specs.html b/docs/specs.html index 4a38c30d..ce0545bc 100644 --- a/docs/specs.html +++ b/docs/specs.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/structzen_1_1color3f__t.html b/docs/structzen_1_1color3f__t.html index 6e53cddc..056f2432 100644 --- a/docs/structzen_1_1color3f__t.html +++ b/docs/structzen_1_1color3f__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -140,7 +140,7 @@

    Detailed Description

    Typically, this is expected to be in the range [0, 1].

    -

    Definition at line 121 of file Types.hpp.

    +

    Definition at line 152 of file Types.hpp.

    Constructor & Destructor Documentation

    @@ -180,7 +180,7 @@
    -

    Definition at line 127 of file Types.hpp.

    +

    Definition at line 158 of file Types.hpp.

    @@ -195,7 +195,7 @@

    Field Documentation

    -

    Definition at line 123 of file Types.hpp.

    +

    Definition at line 154 of file Types.hpp.

    @@ -209,7 +209,7 @@

    Field Documentation

    -

    Definition at line 123 of file Types.hpp.

    +

    Definition at line 154 of file Types.hpp.

    @@ -223,7 +223,7 @@

    Field Documentation

    -

    Definition at line 123 of file Types.hpp.

    +

    Definition at line 154 of file Types.hpp.

    diff --git a/docs/structzen_1_1color4f__t.html b/docs/structzen_1_1color4f__t.html index d37cdd5f..4f7d0e78 100644 --- a/docs/structzen_1_1color4f__t.html +++ b/docs/structzen_1_1color4f__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -144,7 +144,7 @@

    Typically, this is expected to be in the range [0, 1].

    Examples:
    VertexArray.
    -

    Definition at line 104 of file Types.hpp.

    +

    Definition at line 135 of file Types.hpp.

    Constructor & Destructor Documentation

    @@ -190,7 +190,7 @@
    -

    Definition at line 111 of file Types.hpp.

    +

    Definition at line 142 of file Types.hpp.

    @@ -205,7 +205,7 @@

    Field Documentation

    -

    Definition at line 106 of file Types.hpp.

    +

    Definition at line 137 of file Types.hpp.

    @@ -219,7 +219,7 @@

    Field Documentation

    -

    Definition at line 106 of file Types.hpp.

    +

    Definition at line 137 of file Types.hpp.

    @@ -233,7 +233,7 @@

    Field Documentation

    -

    Definition at line 106 of file Types.hpp.

    +

    Definition at line 137 of file Types.hpp.

    @@ -247,7 +247,7 @@

    Field Documentation

    -

    Definition at line 106 of file Types.hpp.

    +

    Definition at line 137 of file Types.hpp.

    diff --git a/docs/structzen_1_1evt_1_1event__t.html b/docs/structzen_1_1evt_1_1event__t.html index a3e5dcd2..aabc90e6 100644 --- a/docs/structzen_1_1evt_1_1event__t.html +++ b/docs/structzen_1_1evt_1_1event__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -252,7 +252,7 @@

    Member Function Documentation

    - +

    diff --git a/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.map b/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.map index b72db187..d39887ff 100644 --- a/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.map +++ b/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.map @@ -6,5 +6,5 @@ - + diff --git a/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.png b/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.png index bd79347f..41d080aa 100644 Binary files a/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.png and b/docs/structzen_1_1evt_1_1event__t_a90a985780dfda311b0d7ce5c05439c8b_icgraph.png differ diff --git a/docs/structzen_1_1evt_1_1key__t.html b/docs/structzen_1_1evt_1_1key__t.html index ce89960f..a662423c 100644 --- a/docs/structzen_1_1evt_1_1key__t.html +++ b/docs/structzen_1_1evt_1_1key__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/structzen_1_1evt_1_1mouse__t.html b/docs/structzen_1_1evt_1_1mouse__t.html index ea4aa70d..dbb5e5ea 100644 --- a/docs/structzen_1_1evt_1_1mouse__t.html +++ b/docs/structzen_1_1evt_1_1mouse__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/structzen_1_1math_1_1_vector.html b/docs/structzen_1_1math_1_1_vector.html deleted file mode 100644 index 1e744bd6..00000000 --- a/docs/structzen_1_1math_1_1_vector.html +++ /dev/null @@ -1,1271 +0,0 @@ - - - - - - -Zenderer Engine: zen::math::Vector< T > Struct Template Reference - - - - - - - - - - - - - -
    -
    - - - - - - -
    -
    Zenderer Engine -  2.10.8-alpha -
    -
    A OpenGL-based 2D engine. Currently at 8785 lines of code.
    -
    -
    - - - - - -
    -
    - -
    -
    -
    - -
    - - - - -
    - -
    - -
    -
    -Public Member Functions | -Static Public Member Functions | -Data Fields | -Friends
    -
    -
    zen::math::Vector< T > Struct Template Reference
    -
    -
    - -

    Represents a point in 3D rectangular-coordinate space. -

    - -

    #include "Vector.hpp"

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    -Public Member Functions

     Vector ()
     Default constructor that moves the vector to the origin. More...
     
     Vector (T x, T y, T z=1)
     Constructor for any coordinate space (defaults to 2D). More...
     
    template<typename U >
     Vector (const Vector< U > &C)
     Copies vector components from one to another. More...
     
    template<typename U >
    Vector< T > & operator= (const Vector< U > &Copy)
     Assigns one vector to another. More...
     
    template<typename U >
    bool operator== (const Vector< U > &Other) const
     Compares two vectors for equivalence. More...
     
    template<typename U >
    bool operator!= (const Vector< U > &Other) const
     Opposite of Vector::operator==() More...
     
    template<typename U >
    Vector< T > operator^ (const Vector< U > &Other) const
     Calculates the cross product of two vectors. More...
     
    template<typename U >
    real_t operator* (const Vector< U > &Other) const
     Calculates the dot product of two vectors. More...
     
    Vector< T > operator* (const real_t scalar) const
     Multiplies each component by a scalar factor. More...
     
    Vector< T > operator/ (const real_t scalar) const
     Divides each component by a scalar factor. More...
     
    template<typename U >
    Vector< T > operator+ (const Vector< U > &Other) const
     Adds a given vector to the current vector, returning the result. More...
     
    Vector< T > operator+ (const real_t value) const
     Adds a value to both components of the current vector. More...
     
    template<typename U >
    Vector< T > operator- (const Vector< U > &Other) const
     Subtracts a given vector from the current vector, returning the result. More...
     
    void Normalize ()
     Normalizes the current vector. More...
     
    real_t Magnitude () const
     Returns the current vectors magnitude, or 'norm'. More...
     
    void Rotate (const real_t radians)
     Rotates the current vector using the rotation matrix. More...
     
    void Translate (const matrix4x4_t &TransMat)
     Translates the current vector by a matrix. More...
     
    template<typename U >
    real_t Cross2D (const Vector< U > &Other) const
     Returns a scalar cross product value between two 2D vectors. More...
     
    Vector< T > GetNormalized () const
     Returns a normalized version of the current vector. More...
     
    template<typename U >
    Vector< T > & operator= (const Vector< U > &Copy)
     
    template<typename U >
    bool operator== (const Vector< U > &Other) const
     
    template<typename U >
    bool operator!= (const Vector< U > &Other) const
     
    template<typename U >
    Vector< T > operator^ (const Vector< U > &Other) const
     
    template<typename U >
    real_t operator* (const Vector< U > &Other) const
     
    template<typename T >
    Vector< T > operator* (const real_t scalar) const
     
    template<typename U >
    Vector< T > operator+ (const Vector< U > &Other) const
     
    template<typename T >
    Vector< T > operator+ (const real_t value) const
     
    template<typename U >
    Vector< T > operator- (const Vector< U > &Other) const
     
    template<typename U >
    real_t Cross2D (const Vector< U > &Other) const
     
    - - - - - -

    -Static Public Member Functions

    template<typename T , typename U >
    static real_t distance (const Vector< T > &A, const Vector< U > &B, const bool do_sqrt=false)
     Finds the distance between two points (optional sqrt). More...
     
    - - - - - - - - -

    -Data Fields

    T x
     The publicly-accessible vector components. More...
     
    T y
     
    T z
     
    - - - - - -

    -Friends

    template<typename U >
    std::ostream & operator<< (std::ostream &out, const Vector< U > &Other)
     Outputs the vector in the form <x, y, z> More...
     
    -

    Detailed Description

    -

    template<typename T>
    -struct zen::math::Vector< T >

    - - -

    Definition at line 42 of file Vector.hpp.

    -

    Constructor & Destructor Documentation

    - -
    -
    -
    -template<typename T>
    - - - - - -
    - - - - - - - -
    zen::math::Vector< T >::Vector ()
    -     		-inline
    -
    - -

    Definition at line 48 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T>
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    zen::math::Vector< T >::Vector (T x,
    T y,
    T z = 1 
    )
    -     		-inline
    -
    - -

    Definition at line 51 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    zen::math::Vector< T >::Vector (const Vector< U > & C)
    -     		-inline
    -
    - -

    Definition at line 55 of file Vector.hpp.

    - -
    -
    -

    Member Function Documentation

    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    Vector< T > & zen::math::Vector< T >::operator= (const Vector< U > & Copy)
    -     		-inline
    -
    - -

    Definition at line 4 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    bool zen::math::Vector< T >::operator== (const Vector< U > & Other) const
    -     		-inline
    -
    - -

    Definition at line 15 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    bool zen::math::Vector< T >::operator!= (const Vector< U > & Other) const
    -     		-inline
    -
    - -

    Definition at line 22 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    Vector< T > zen::math::Vector< T >::operator^ (const Vector< U > & Other) const
    -     		-inline
    -
    -

    The cross product of two vectors is a vector that is perpendicular to both operators. e.g. i = j ^ k.

    -
    Parameters
    - - -
    OtherThe vector to cross with
    -
    -
    -
    Returns
    A 3D vector normal to both vectors.
    - -

    Definition at line 29 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    real_t zen::math::Vector< T >::operator* (const Vector< U > & Other) const
    -     		-inline
    -
    -

    The dot product is useful in finding the angle between two vectors. The formula for that is as follows:

    -

    cos(Θ) = (A ⋅ B) / (||A|| * ||B||)

    -

    Where A and B are vectors and ||A|| is the magnitude of A. The actual operation is defined as such:

    -

    A = (x1, y1, z1) B = (x2, y2, z2) A ⋅ B = x1 * x2 + y1 * y2 + z1 * z2

    -
    Parameters
    - - -
    OtherThe vector to dot with.
    -
    -
    -
    Returns
    The dot product as a scalar.
    - -

    Definition at line 38 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - - -
    Vector< T > zen::math::Vector< T >::operator* (const real_t scalar) const
    -     		-inline
    -
    -
    Parameters
    - - -
    scalarThe component scaling factor
    -
    -
    -
    Returns
    A 2D resultant vector.
    - -

    Definition at line 44 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - - -
    Vector< T > Vector::operator/ (const real_t scalar) const
    -     		-inline
    -
    -
    Parameters
    - - -
    scalarThe component scaling factor
    -
    -
    -
    Returns
    A 2D resultant vector.
    - -

    Definition at line 50 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    Vector< T > zen::math::Vector< T >::operator+ (const Vector< U > & Other) const
    -     		-inline
    -
    -
    Parameters
    - - -
    OtherThe vector to add (component-wise)
    -
    -
    -
    Returns
    A 2D resultant vector.
    - -

    Definition at line 57 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - - -
    Vector< T > zen::math::Vector< T >::operator+ (const real_t value) const
    -     		-inline
    -
    -
    Parameters
    - - -
    valueThe value to add
    -
    -
    -
    Returns
    A 2D resultant vector.
    - -

    Definition at line 63 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    Vector< T > zen::math::Vector< T >::operator- (const Vector< U > & Other) const
    -     		-inline
    -
    -
    Parameters
    - - -
    OtherThe vector to subtract from the current vector
    -
    -
    -
    Returns
    A 2D resultant vector.
    - -

    Definition at line 70 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - -
    void Vector::Normalize ()
    -     		-inline
    -
    -

    This DOES modify the current vector, and makes it into a unit vector version of itself.

    - -

    Definition at line 76 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - -
    real_t Vector::Magnitude () const
    -     		-inline
    -
    -

    magnitude = √(x2 + y2 + z2)

    - -

    Definition at line 114 of file Vector.hpp.

    - -

    -Here is the caller graph for this function:
    -
    -
    - - -
    -

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - - -
    void Vector::Rotate (const real_t radians)
    -     		-inline
    -
    -

    The rotation matrix (in right-hand Cartesian plane) is defined as being | x | | cos(Θ), -sin(Θ) | | y | | sin(Θ), cos(Θ) |

    -

    But in the OpenGL coordinate system, the origin is in the top-left, as opposed to bottom-left, as shown above. So rotations are actually inverted and the matrix is | x | | cos(Θ), sin(Θ) | | y | | -sin(Θ), cos(Θ) |

    -

    So the final rotation in OpenGL would be: x = x * cos(Θ) + y * sin(Θ) y = -x * sin(Θ) + y * cos(Θ)

    -
    Parameters
    - - -
    radiansThe rotation angle in radians.
    -
    -
    -
    Note
    The coordinate system adjustment was removed.
    - -

    Definition at line 89 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T>
    - - - - - - - - -
    void zen::math::Vector< T >::Translate (const matrix4x4_t & TransMat)
    -
    -
    Parameters
    - - -
    TransMatTranslation matrix
    -
    -
    - -
    -
    - -
    -
    -
    -template<typename T >
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - -
    real_t zen::math::Vector< T >::Cross2D (const Vector< U > & Other) const
    -     		-inline
    -
    -

    Given a vector v = <x1, y1> and a vector w = <x2, y2>, their cross-product is determined as <0, 0, x1*y2 - y1*x2>. So, this method returns the third component.

    -

    This value can be used to determine which side of a vector another vector is on. If the return value is negative, the "Other" vector is on the left (going ccw). If positive, it's on the right (going c/w). This can also be done by examining the dot product.

    -
    Parameters
    - - -
    OtherVector to test cross product on
    -
    -
    -
    Returns
    2D cross product (z-component of 3D cross).
    -
    See Also
    operator*(const Vector&)
    - -

    Definition at line 101 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T >
    - - - - - -
    - - - - - - - -
    Vector< T > Vector::GetNormalized () const
    -     		-inline
    -
    -
    See Also
    Vector::Normalize()
    - -

    Definition at line 107 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename T , typename U >
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    static real_t zen::math::Vector< T >::distance (const Vector< T > & A,
    const Vector< U > & B,
    const bool do_sqrt = false 
    )
    -     		-static
    -
    -
    Todo:
    Investigate potential problems between a signed and unsigned Vector<T> or Vector<U>.
    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    Vector<T>& zen::math::Vector< T >::operator= (const Vector< U > & Copy)
    -
    - -

    Definition at line 3 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    bool zen::math::Vector< T >::operator== (const Vector< U > & Other) const
    -
    - -

    Definition at line 14 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    bool zen::math::Vector< T >::operator!= (const Vector< U > & Other) const
    -
    - -

    Definition at line 21 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    Vector<T> zen::math::Vector< T >::operator^ (const Vector< U > & Other) const
    -
    - -

    Definition at line 28 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    real_t zen::math::Vector< T >::operator* (const Vector< U > & Other) const
    -
    - -

    Definition at line 37 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename T >
    - - - - - - - - -
    Vector<T> zen::math::Vector< T >::operator* (const real_t scalar) const
    -
    - -

    Definition at line 43 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    Vector<T> zen::math::Vector< T >::operator+ (const Vector< U > & Other) const
    -
    - -

    Definition at line 56 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename T >
    - - - - - - - - -
    Vector<T> zen::math::Vector< T >::operator+ (const real_t value) const
    -
    - -

    Definition at line 62 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    Vector<T> zen::math::Vector< T >::operator- (const Vector< U > & Other) const
    -
    - -

    Definition at line 69 of file Vector.inl.

    - -
    -
    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - - - - -
    real_t zen::math::Vector< T >::Cross2D (const Vector< U > & Other) const
    -
    - -

    Definition at line 100 of file Vector.inl.

    - -
    -
    -

    Friends And Related Function Documentation

    - -
    -
    -
    -template<typename T>
    -
    -template<typename U >
    - - - - - -
    - - - - - - - - - - - - - - - - - - -
    std::ostream& operator<< (std::ostream & out,
    const Vector< U > & Other 
    )
    -     		-friend
    -
    - -

    Definition at line 120 of file Vector.hpp.

    - -
    -
    -

    Field Documentation

    - -
    -
    -
    -template<typename T>
    - - - - -
    T zen::math::Vector< T >::x
    -
    - -

    Definition at line 45 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T>
    - - - - -
    T zen::math::Vector< T >::y
    -
    - -

    Definition at line 45 of file Vector.hpp.

    - -
    -
    - -
    -
    -
    -template<typename T>
    - - - - -
    T zen::math::Vector< T >::z
    -
    - -

    Definition at line 45 of file Vector.hpp.

    - -
    -
    -
    The documentation for this struct was generated from the following files: -
    -
    - - - - diff --git a/docs/structzen_1_1math_1_1_vector.js b/docs/structzen_1_1math_1_1_vector.js deleted file mode 100644 index 2fc5b9cf..00000000 --- a/docs/structzen_1_1math_1_1_vector.js +++ /dev/null @@ -1,37 +0,0 @@ -var structzen_1_1math_1_1_vector = -[ - [ "Vector", "structzen_1_1math_1_1_vector.html#a04d95dd464e4e297d6552741cdefe4fb", null ], - [ "Vector", "structzen_1_1math_1_1_vector.html#abb29720ec72d1344e0218c2a9512f4ac", null ], - [ "Vector", "structzen_1_1math_1_1_vector.html#a6b3f65bd14727cefb030a6a126dd4fc4", null ], - [ "operator=", "structzen_1_1math_1_1_vector.html#a937575ede3c52dda0c39c503f406f40c", null ], - [ "operator==", "structzen_1_1math_1_1_vector.html#af606b191be1e741359753b5b251b7943", null ], - [ "operator!=", "structzen_1_1math_1_1_vector.html#a73e7f437ccffd89073d35a17c790ac6d", null ], - [ "operator^", "structzen_1_1math_1_1_vector.html#a8fcf0ac9428fda78ecca25cbd1aa77bd", null ], - [ "operator*", "structzen_1_1math_1_1_vector.html#a48d57e917c397f47372530182269ce7d", null ], - [ "operator*", "structzen_1_1math_1_1_vector.html#a73f18312e63a7b35f9680074e9a0cbc9", null ], - [ "operator/", "structzen_1_1math_1_1_vector.html#aad3c1a67b7a6f2c46cf9b80358a572c7", null ], - [ "operator+", "structzen_1_1math_1_1_vector.html#a8ddbde98753dd410b3a34307d3282eb5", null ], - [ "operator+", "structzen_1_1math_1_1_vector.html#ad690c98a2c8a75df6b9b3ed07086a806", null ], - [ "operator-", "structzen_1_1math_1_1_vector.html#a37d45acb1c59bf7031cf804df103cce8", null ], - [ "Normalize", "structzen_1_1math_1_1_vector.html#a37fafbf4bf8aa73238f45b785658132b", null ], - [ "Magnitude", "structzen_1_1math_1_1_vector.html#af4c58eb0409ab7a67af84e3ac56c04b7", null ], - [ "Rotate", "structzen_1_1math_1_1_vector.html#a5f06dcabc6a62c04a8b82f11f0690ae8", null ], - [ "Translate", "structzen_1_1math_1_1_vector.html#ae864b62de03611caece3153162dc58b1", null ], - [ "Cross2D", "structzen_1_1math_1_1_vector.html#a59053b162fef58855aee66a1e70dcb2e", null ], - [ "GetNormalized", "structzen_1_1math_1_1_vector.html#adafedf5c311dd3cf17d8138d0c335d2e", null ], - [ "distance", "structzen_1_1math_1_1_vector.html#a4c3f5ddb7f6cb13b8a46fa563baee493", null ], - [ "operator=", "structzen_1_1math_1_1_vector.html#ae99a56950b4de8cfa7059f78de97fd4d", null ], - [ "operator==", "structzen_1_1math_1_1_vector.html#af606b191be1e741359753b5b251b7943", null ], - [ "operator!=", "structzen_1_1math_1_1_vector.html#a73e7f437ccffd89073d35a17c790ac6d", null ], - [ "operator^", "structzen_1_1math_1_1_vector.html#abce3f167575b8348199265d921e6e392", null ], - [ "operator*", "structzen_1_1math_1_1_vector.html#a48d57e917c397f47372530182269ce7d", null ], - [ "operator*", "structzen_1_1math_1_1_vector.html#a6c2fbb994cae0859a89fb2d71ac0db71", null ], - [ "operator+", "structzen_1_1math_1_1_vector.html#a2b6700a5f3396374f046a375594b56a9", null ], - [ "operator+", "structzen_1_1math_1_1_vector.html#aef149e1bc3c3009b5d85e6c4506e9ebb", null ], - [ "operator-", "structzen_1_1math_1_1_vector.html#adb3b75bddddd809551fc5b7ca3bbe750", null ], - [ "Cross2D", "structzen_1_1math_1_1_vector.html#a59053b162fef58855aee66a1e70dcb2e", null ], - [ "operator<<", "structzen_1_1math_1_1_vector.html#a976088dd402b0d2c9720b095def99157", null ], - [ "x", "structzen_1_1math_1_1_vector.html#a7bd1e1ee44eed6c0232c497cd30264d7", null ], - [ "y", "structzen_1_1math_1_1_vector.html#a401d315a154ddb601a983e61c5be592e", null ], - [ "z", "structzen_1_1math_1_1_vector.html#a978506f2f783c9757556648d25b81788", null ] -]; \ No newline at end of file diff --git a/docs/structzen_1_1math_1_1_vector_af4c58eb0409ab7a67af84e3ac56c04b7_icgraph.map b/docs/structzen_1_1math_1_1_vector_af4c58eb0409ab7a67af84e3ac56c04b7_icgraph.map deleted file mode 100644 index a3e5d5d0..00000000 --- a/docs/structzen_1_1math_1_1_vector_af4c58eb0409ab7a67af84e3ac56c04b7_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/structzen_1_1math_1_1_vector_af4c58eb0409ab7a67af84e3ac56c04b7_icgraph.png b/docs/structzen_1_1math_1_1_vector_af4c58eb0409ab7a67af84e3ac56c04b7_icgraph.png deleted file mode 100644 index 111de368..00000000 Binary files a/docs/structzen_1_1math_1_1_vector_af4c58eb0409ab7a67af84e3ac56c04b7_icgraph.png and /dev/null differ diff --git a/docs/structzen_1_1math_1_1aabb__t.html b/docs/structzen_1_1math_1_1aabb__t.html index 70e8451d..5ec82b27 100644 --- a/docs/structzen_1_1math_1_1aabb__t.html +++ b/docs/structzen_1_1math_1_1aabb__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -250,14 +250,14 @@

    Member Function Documentation

    -

    Definition at line 6 of file Shapes.cpp.

    +

    Definition at line 7 of file Shapes.cpp.

    Here is the caller graph for this function:
    - +

    @@ -281,7 +281,7 @@

    Member Function Documentation

    Best case, the algorithm will perform: 7 multiplications 27 addition / subtractions 4 comparisons

    See Also
    http://fileadmin.cs.lth.se/cs/Personal/Tomas_Akenine-Moller/code/
    -

    Definition at line 12 of file Shapes.cpp.

    +

    Definition at line 13 of file Shapes.cpp.

    diff --git a/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.map b/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.map index 4eafe1d4..a68f93c5 100644 --- a/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.map +++ b/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.map @@ -1,6 +1,4 @@ - - - - + + diff --git a/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.png b/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.png index 0c6abe0e..3f856415 100644 Binary files a/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.png and b/docs/structzen_1_1math_1_1aabb__t_a18b68d868db5d40ba56d9fd0fe02f0e1_icgraph.png differ diff --git a/docs/structzen_1_1math_1_1aabb__t_a494c486eb858567af8500b124fb2766a_icgraph.map b/docs/structzen_1_1math_1_1aabb__t_a494c486eb858567af8500b124fb2766a_icgraph.map deleted file mode 100644 index a50b903f..00000000 --- a/docs/structzen_1_1math_1_1aabb__t_a494c486eb858567af8500b124fb2766a_icgraph.map +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/docs/structzen_1_1math_1_1aabb__t_a494c486eb858567af8500b124fb2766a_icgraph.png b/docs/structzen_1_1math_1_1aabb__t_a494c486eb858567af8500b124fb2766a_icgraph.png deleted file mode 100644 index 640b8512..00000000 Binary files a/docs/structzen_1_1math_1_1aabb__t_a494c486eb858567af8500b124fb2766a_icgraph.png and /dev/null differ diff --git a/docs/structzen_1_1math_1_1circle__t.html b/docs/structzen_1_1math_1_1circle__t.html index 92724280..760c1f05 100644 --- a/docs/structzen_1_1math_1_1circle__t.html +++ b/docs/structzen_1_1math_1_1circle__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/structzen_1_1math_1_1cquery__t.html b/docs/structzen_1_1math_1_1cquery__t.html new file mode 100644 index 00000000..d6a880c0 --- /dev/null +++ b/docs/structzen_1_1math_1_1cquery__t.html @@ -0,0 +1,317 @@ + + + + + + +Zenderer Engine: zen::math::cquery_t Struct Reference + + + + + + + + + + + + + +
    +
    + + + + + + +
    +
    Zenderer Engine +  5.0.0-alpha +
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Public Member Functions | +Data Fields
    +
    +
    zen::math::cquery_t Struct Reference
    +
    +
    + +

    A collision-quering structure. + More...

    + +

    #include "Shapes.hpp"

    + + + + +

    +Public Member Functions

     cquery_t ()
     
    + + + + + + + + + + + + + + + + + +

    +Data Fields

    aabb_t box1
     
    aabb_t box2
     
    line_t line1
     
    line_t line2
     
    tri_t tri1
     
    tri_t tri2
     
    vector_t point
     
    bool collision
     
    +

    Detailed Description

    +

    This is used by high-level interfaces for interacting directly with raw collision data, in order to handle it appropriately. It should be implemented with a top-down approach, with each subsequent level adding the info that it can.

    +

    Zenderer currently implements it as follows... Preface: Object queries collision with another object.

    +
      +
    • Object fills in AABB info.
      • +
    • Object queries polygon vs. polygon collision.
      • +
    • Polygon fills in triangle info.
      • +
    • Polygon queries triangle vs. triangle collision.
      • +
    • TvT handler fills in line info.
      • +
    • TvT handler queries line vs. line collision.
      • +
    • LvL handler fills in point info.
      • +
    • Process is moved back up to the object.
      • +
    • Object fills in collision state.
      • +
    + +

    Definition at line 127 of file Shapes.hpp.

    +

    Constructor & Destructor Documentation

    + +
    +
    + + + + + +
    + + + + + + + +
    zen::math::cquery_t::cquery_t ()
    +     		+inline
    +
    + +

    Definition at line 135 of file Shapes.hpp.

    + +
    +
    +

    Field Documentation

    + +
    +
    + + + + +
    aabb_t zen::math::cquery_t::box1
    +
    + +

    Definition at line 129 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    aabb_t zen::math::cquery_t::box2
    +
    + +

    Definition at line 129 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    line_t zen::math::cquery_t::line1
    +
    + +

    Definition at line 130 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    line_t zen::math::cquery_t::line2
    +
    + +

    Definition at line 130 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    tri_t zen::math::cquery_t::tri1
    +
    + +

    Definition at line 131 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    tri_t zen::math::cquery_t::tri2
    +
    + +

    Definition at line 131 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    vector_t zen::math::cquery_t::point
    +
    + +

    Definition at line 132 of file Shapes.hpp.

    + +
    +
    + +
    +
    + + + + +
    bool zen::math::cquery_t::collision
    +
    + +

    Definition at line 133 of file Shapes.hpp.

    + +
    +
    +
    The documentation for this struct was generated from the following file: +
    +
    + + + + diff --git a/docs/structzen_1_1math_1_1cquery__t.js b/docs/structzen_1_1math_1_1cquery__t.js new file mode 100644 index 00000000..48206186 --- /dev/null +++ b/docs/structzen_1_1math_1_1cquery__t.js @@ -0,0 +1,12 @@ +var structzen_1_1math_1_1cquery__t = +[ + [ "cquery_t", "structzen_1_1math_1_1cquery__t.html#aab37db7191a1aeeaca9869e5d032dd73", null ], + [ "box1", "structzen_1_1math_1_1cquery__t.html#acdee2a05c3f7d45509b28fc3be0c25b5", null ], + [ "box2", "structzen_1_1math_1_1cquery__t.html#a68fd57e277ef67047a8b20b386914f85", null ], + [ "line1", "structzen_1_1math_1_1cquery__t.html#a520a1e7d3d94d630d9f8e7ef69fda72a", null ], + [ "line2", "structzen_1_1math_1_1cquery__t.html#adb33e9eab6670832dadc0303fef776fa", null ], + [ "tri1", "structzen_1_1math_1_1cquery__t.html#a19350f27be27962c6feedffa68341e05", null ], + [ "tri2", "structzen_1_1math_1_1cquery__t.html#a06be46d2205712500186115c682eccf9", null ], + [ "point", "structzen_1_1math_1_1cquery__t.html#a70b5263e947f4120540dcd6cd167f89d", null ], + [ "collision", "structzen_1_1math_1_1cquery__t.html#afc8ce3b4de8e85705e4e8e7c8ba1296c", null ] +]; \ No newline at end of file diff --git a/docs/structzen_1_1math_1_1rect__t.html b/docs/structzen_1_1math_1_1rect__t.html index ffdaee66..358b3ed0 100644 --- a/docs/structzen_1_1math_1_1rect__t.html +++ b/docs/structzen_1_1math_1_1rect__t.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    diff --git a/docs/structzen_1_1math_1_1z_vector.html b/docs/structzen_1_1math_1_1z_vector.html index 8ccd3276..9de5e8a1 100644 --- a/docs/structzen_1_1math_1_1z_vector.html +++ b/docs/structzen_1_1math_1_1z_vector.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -97,7 +97,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages
    + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -178,7 +178,7 @@  Returns the current vectors magnitude, or 'norm'. More...
      void Rotate (const real_t radians) - Rotates the current vector using the rotation matrix. More...
    + Rotates the current vector CCW using the rotation matrix. More...
      void Translate (const matrix4x4_t &TransMat)  Translates the current vector by a matrix. More...
    @@ -223,10 +223,10 @@ - - - - + + + +

    Static Public Member Functions

    template<typename T , typename U >
    static real_t distance (const zVector< T > &A, const zVector< U > &B, const bool do_sqrt=false)
     Finds the distance between two points (optional sqrt). More...
     
    template<typename R , typename S >
    static real_t distance (const zVector< R > &A, const zVector< S > &B, const bool do_sqrt=false)
     Finds the distance between two points (optional sqrt). More...
     
    @@ -888,13 +888,13 @@

    Member Function Documentation

    - +
    template<typename T>
    -template<typename T , typename U >
    +template<typename R , typename S >

    Data Fields

    - + - + @@ -929,7 +929,7 @@

    Member Function Documentation

    @@ -902,13 +902,13 @@

    Member Function Documentation

    static real_t zen::math::zVector< T >::distance (const zVector< T > & const zVector< R > &  A,
    const zVector< U > & const zVector< S > &  B,
    -
    Todo:
    Investigate potential problems between a signed and unsigned zVector<T> or zVector<U>.
    +
    Todo:
    Investigate potential problems between a signed and unsigned zVector<R> or zVector<S>.
    diff --git a/docs/structzen_1_1math_1_1z_vector.js b/docs/structzen_1_1math_1_1z_vector.js index c1e2653c..5c52202b 100644 --- a/docs/structzen_1_1math_1_1z_vector.js +++ b/docs/structzen_1_1math_1_1z_vector.js @@ -19,7 +19,7 @@ var structzen_1_1math_1_1z_vector = [ "Translate", "structzen_1_1math_1_1z_vector.html#a2430d98889cbd1cb518b25b18ec9717e", null ], [ "Cross2D", "structzen_1_1math_1_1z_vector.html#a3e6691cee13a4a6667b5ddb300e5fbe3", null ], [ "GetNormalized", "structzen_1_1math_1_1z_vector.html#af99254faa132c28fdbfd75e471018891", null ], - [ "distance", "structzen_1_1math_1_1z_vector.html#a7e62fe4161570ef2b2dd9e49811bcdbe", null ], + [ "distance", "structzen_1_1math_1_1z_vector.html#ab7eebffaaaac96cf48eb6f6139716e75", null ], [ "operator=", "structzen_1_1math_1_1z_vector.html#a87cc173f3a71e96a89bc892e2c3ff62f", null ], [ "operator==", "structzen_1_1math_1_1z_vector.html#a896d9b7ff98e840e2e7bba3ff0b734fe", null ], [ "operator!=", "structzen_1_1math_1_1z_vector.html#a4eede96c16b22cc94a13418fbb471998", null ], diff --git a/docs/structzen_1_1math_1_1z_vector_ac9ca9cc5adb430ec34306df49e0ff17c_icgraph.map b/docs/structzen_1_1math_1_1z_vector_ac9ca9cc5adb430ec34306df49e0ff17c_icgraph.map deleted file mode 100644 index 000df1d4..00000000 --- a/docs/structzen_1_1math_1_1z_vector_ac9ca9cc5adb430ec34306df49e0ff17c_icgraph.map +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/docs/structzen_1_1math_1_1z_vector_ac9ca9cc5adb430ec34306df49e0ff17c_icgraph.png b/docs/structzen_1_1math_1_1z_vector_ac9ca9cc5adb430ec34306df49e0ff17c_icgraph.png deleted file mode 100644 index 23a0670a..00000000 Binary files a/docs/structzen_1_1math_1_1z_vector_ac9ca9cc5adb430ec34306df49e0ff17c_icgraph.png and /dev/null differ diff --git a/docs/todo.html b/docs/todo.html index 5e56b35d..e76dc02b 100644 --- a/docs/todo.html +++ b/docs/todo.html @@ -30,9 +30,9 @@
    Zenderer Engine -  3.0.0-alpha +  5.0.0-alpha
    -
    A OpenGL-based 2D engine. Currently at 9447 lines of code.
    +
    A OpenGL-based 2D engine. Currently at 10804 lines of code.
    @@ -89,7 +89,7 @@ onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" onkeydown="return searchBox.OnSearchSelectKey(event)"> - All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Groups Pages + All Data Structures Namespaces Files Functions Variables Typedefs Enumerations Enumerator Friends Macros Groups Pages
    @@ -104,7 +104,7 @@
    -
    page Main Page
    +
    page Main Page
    Test cross-platform compatibility.
    Global zen::asset::zAssetManager::Create (const void *const owner=nullptr)
    Make this return a reference.
    @@ -120,7 +120,7 @@
    Class zen::gfx::zLight
    Investigate why the scr_height shader parameter is necessary.
    -
    Global zen::gfx::zLight::SetPosition (const real_t x, const real_t y)
    +
    Global zen::gfx::zLight::SetPosition (const real_t x, const real_t y)
    Figure out why the 200px offset is necessary.
    Global zen::gfx::zQuad::Resize (const math::vectoru16_t &Size)
    Make it work properly when zQuad is inverted.
    @@ -145,24 +145,26 @@
    Global zen::lvl::zLevelLoader::LoadFromFile (const string_t &filename)

    Error checking.

    +

    Polygons vs. Entities differentiation.

    -

    Differentiate between player and enemy spawns.

    +

    +

    -
    Global zen::math::matrix4x4_t::Shear (const math::vector_t &Angles)
    +
    Global zen::math::matrix4x4_t::Shear (const math::vector_t &Angles)
    Add 3D shearing.
    -
    Class zen::math::vector_t
    +
    Class zen::math::vector_t
    Add support for translation via matrices.
    -
    Global zen::math::zVector< T >::distance (const zVector< T > &A, const zVector< U > &B, const bool do_sqrt=false)
    -
    Investigate potential problems between a signed and unsigned zVector<T> or zVector<U>.
    -
    Class zen::net::zSocket
    +
    Global zen::math::zVector< T >::distance (const zVector< R > &A, const zVector< S > &B, const bool do_sqrt=false)
    +
    Investigate potential problems between a signed and unsigned zVector<R> or zVector<S>.
    +
    Class zen::net::zSocket
    Support for TCP, connect(), etc.
    -
    Class zen::obj::zEntity
    +
    Class zen::obj::zEntity
    Allow for additional primitives not to stack up.
    -
    Global zen::obj::zEntity::Move (const math::vector_t &Pos)
    +
    Global zen::obj::zEntity::Move (const math::vector_t &Pos)
    Support a variety of primitive depths.
    -
    Global zen::sfx::CSound2D::LoadFromFile (const string_t &filename)
    +
    Global zen::sfx::CSound2D::LoadFromFile (const string_t &filename)
    Use some standardized WAV loading library.
    -
    Class zen::util::zXMLParser
    +
    Class zen::util::zXMLParser
    Fix XMLNode parent setting
    diff --git a/include/Zenderer/CoreGraphics/ShaderFiles.hpp b/include/Zenderer/CoreGraphics/ShaderFiles.hpp index 36f2cd2a..10b13b70 100644 --- a/include/Zenderer/CoreGraphics/ShaderFiles.hpp +++ b/include/Zenderer/CoreGraphics/ShaderFiles.hpp @@ -49,7 +49,7 @@ namespace gfxcore "void main()\n" "{\n" " out_color = light_brt * vec4(light_col, 1.0);\n" - " out_color *= fs_color;// * texture2D(geometry, fs_texc);\n" + " out_color *= fs_color * texture2D(geometry, fs_texc);\n" "}\n" );