summaryrefslogtreecommitdiff
path: root/game/network
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2024-07-20 17:57:35 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2024-08-10 18:06:01 +0100
commit790599b583e1b819b5023a35b13b707ec9de3439 (patch)
tree71fd0359798a2792586695cdd8042829c4b820f6 /game/network
parentAdd missing truthy/falsy operators to AnyPtr (diff)
downloadilt-790599b583e1b819b5023a35b13b707ec9de3439.tar.bz2
ilt-790599b583e1b819b5023a35b13b707ec9de3439.tar.xz
ilt-790599b583e1b819b5023a35b13b707ec9de3439.zip
Apply StdTypeDefs for Texture
Diffstat (limited to 'game/network')
-rw-r--r--game/network/network.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/game/network/network.h b/game/network/network.h
index 5725360..ca17581 100644
--- a/game/network/network.h
+++ b/game/network/network.h
@@ -1,19 +1,18 @@
#pragma once
+#include "collection.h"
#include "gfx/gl/instanceVertices.h"
+#include "gfx/models/texture.h"
+#include "gfx/renderable.h"
#include "link.h"
-#include <collection.h>
-#include <gfx/renderable.h>
+#include "sorting.h"
+#include "special_members.h"
#include <glm/glm.hpp>
#include <memory>
#include <set>
-#include <sorting.h>
-#include <special_members.h>
#include <string>
#include <utility>
-#include <variant>
-class Texture;
class SceneShader;
template<typename> class Ray;
@@ -56,7 +55,7 @@ protected:
using Nodes = std::set<Node::Ptr, PtrMemberSorter<Node::Ptr, &Node::pos>>;
Nodes nodes;
- std::shared_ptr<Texture> texture;
+ Texture::Ptr texture;
};
template<typename LinkType> class NetworkLinkHolder {