Skip to content

more std::hash and operator== overloads #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Duskhorn wants to merge 6 commits into
base: master
Choose a base branch
from
Open

more std::hash and operator== overloads #20

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b662f7
added relevant std::hash<cube::cfkey> and operator==()
Duskhorn Mar 6, 2023
f210c96
removed hthash call in favor of std::hash
Duskhorn Mar 6, 2023
26cbc57
removed htcmp and hthash for ivec; not needed anymore :)
Duskhorn Mar 6, 2023
3ec1831
removed undefined references
Duskhorn Mar 6, 2023
a5d2c9a
removed irrelevant comments
Duskhorn Mar 6, 2023
5172464
reverted some deletions because it'd have broken the main libprimis(e…
Duskhorn Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions octa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,25 @@ class cube
ushort material, tex;
ivec n;
int offset;

bool operator==(const cfkey &o) {
return orient == o.orient && tex == o.tex && n == o.n && offset == o.offset && material == o.material;
}
};

//need htcmp to be free functions to work with tools.h
//but nothing else needs it
friend bool htcmp(const cube::cfkey &x, const cube::cfkey &y);
friend uint hthash(const cube::cfkey &k);
friend std::hash<plink>; //for unordered_map
friend std::hash<cfkey>; //for unordered_map
};

template<>
struct std::hash<cube::cfkey> {
size_t operator()(const cube::cfkey &k) const {
return std::hash<ivec>{}(k.n)^k.offset^k.tex^k.orient^k.material;
}
};

/**
Expand Down