Added back infinite zoom scale up code
This commit is contained in:
parent
108da82fd4
commit
85cc0c2457
26 changed files with 191 additions and 62 deletions
|
|
@ -13,6 +13,7 @@ class ClientData {
|
|||
|
||||
Vector3f cursorColor = {1.0f, 1.0f, 1.0f};
|
||||
std::string displayName;
|
||||
uint32_t gridSize = 0;
|
||||
};
|
||||
|
||||
ClientData();
|
||||
|
|
@ -22,19 +23,21 @@ class ClientData {
|
|||
static void set_window_size(const NetworkingObjects::NetObjTemporaryPtr<ClientData>& o, Vector2f newWindowSize);
|
||||
static void set_camera_coords(const NetworkingObjects::NetObjTemporaryPtr<ClientData>& o, const CoordSpaceHelper& newCoords);
|
||||
static void send_chat_message(const NetworkingObjects::NetObjTemporaryPtr<ClientData>& o, World& world, const std::string& chatMessage);
|
||||
static void scale_up_step(const NetworkingObjects::NetObjTemporaryPtr<ClientData>& o, World& world);
|
||||
void set_display_name(const std::string& newDisplayName);
|
||||
void set_cursor_color(const Vector3f& newCursorColor);
|
||||
|
||||
const CoordSpaceHelper& get_cam_coords() const;
|
||||
const Vector2f& get_window_size() const;
|
||||
const Vector2f& get_cursor_pos() const;
|
||||
uint32_t get_grid_size() const;
|
||||
const std::string& get_display_name() const;
|
||||
const Vector3f& get_cursor_color() const;
|
||||
|
||||
void draw_cursor(SkCanvas* canvas, const DrawData& drawData) const;
|
||||
|
||||
template <typename Archive> void serialize(Archive& a) {
|
||||
a(camCoords, windowSize, cursorPos, cursorColor, displayName);
|
||||
a(camCoords, windowSize, cursorPos, cursorColor, displayName, gridSize);
|
||||
}
|
||||
private:
|
||||
void set_from_init_struct(const InitStruct& initStruct);
|
||||
|
|
@ -44,5 +47,6 @@ class ClientData {
|
|||
|
||||
Vector3f cursorColor;
|
||||
std::string displayName;
|
||||
uint32_t gridSize;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue