summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@firma-desktop.(none)>2010-02-11 21:49:26 +0100
committerroot <root@firma-desktop.(none)>2010-02-11 21:49:26 +0100
commit3fedb25ca1e56b2975a598a7193b965813ca1434 (patch)
tree16b89acf4e75470e01ebfe79a490d7f5c7895560
parent22b2912bbdd637c1a206b30f7d02c8e560ff9850 (diff)
downloadc3d-3fedb25ca1e56b2975a598a7193b965813ca1434.tar
c3d-3fedb25ca1e56b2975a598a7193b965813ca1434.zip
blablaslba
-rw-r--r--Keys.h28
-rw-r--r--Temparray.cpp2
2 files changed, 30 insertions, 0 deletions
diff --git a/Keys.h b/Keys.h
new file mode 100644
index 0000000..b801142
--- /dev/null
+++ b/Keys.h
@@ -0,0 +1,28 @@
+/*
+ * Keys.h
+ *
+ * Created on: 10.02.2010
+ * Author: constantin
+ */
+
+#ifndef KEYS_H_
+#define KEYS_H_
+
+#include <bitset>
+
+enum Keys {
+ KEY_UP = 0,
+ KEY_DOWN,
+ KEY_LEFT,
+ KEY_RIGHT,
+ KEY_ZOOM_IN,
+ KEY_ZOOM_OUT,
+ KEY_TOP,
+ KEY_BOTTOM,
+
+ KEY_LAST
+};
+
+typedef std::bitset<KEY_LAST> Keyset;
+
+#endif /* KEYS_H_ */
diff --git a/Temparray.cpp b/Temparray.cpp
index 115d199..39edd1b 100644
--- a/Temparray.cpp
+++ b/Temparray.cpp
@@ -47,6 +47,8 @@ void Temparray::calcTemp(){
float width2, height2, depth2, innerwidth2, innerdepth2;
float loadableenergy, unloadableenergy;
+ calcweight();
+
for(int i = 0; i < sx; ++i) {
for(int j = 0; j < sy; ++j) {
for(int k = 0; k < sz; ++k) {