projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ExhibitSlots and exhibit placement (initial)
[laserbrain_demo]
/
src
/
exhibit.cc
diff --git
a/src/exhibit.cc
b/src/exhibit.cc
index
d76b291
..
8403550
100644
(file)
--- a/
src/exhibit.cc
+++ b/
src/exhibit.cc
@@
-1,16
+1,13
@@
#include "exhibit.h"
#include "snode.h"
#include "scene.h"
#include "exhibit.h"
#include "snode.h"
#include "scene.h"
+#include "geomdraw.h"
+#include "app.h"
-class ExhibitPriv {
-public:
- Vec3 orig_pos;
- Quat orig_rot;
- SceneNode *orig_node;
+ExSelection ExSelection::null;
- ExhibitPriv();
-};
+// selection
ExSelection::ExSelection(Exhibit *ex)
{
this->ex = ex;
ExSelection::ExSelection(Exhibit *ex)
{
this->ex = ex;
@@
-23,36
+20,50
@@
ExSelection::operator bool() const
return ex != 0;
}
return ex != 0;
}
-ExhibitPriv::ExhibitPriv()
+// Exhibit data
+ExData::ExData()
{
{
- orig_node = 0;
+ voice = 0;
}
}
+ExData::~ExData()
+{
+ delete voice;
+}
+
+// exhibit class
Exhibit::Exhibit()
{
Exhibit::Exhibit()
{
- priv = new ExhibitPriv;
+ orig_parent = 0;
+ prev_slot = 0;
}
Exhibit::~Exhibit()
{
}
Exhibit::~Exhibit()
{
- delete priv;
}
void Exhibit::set_node(SceneNode *node)
{
}
void Exhibit::set_node(SceneNode *node)
{
- this->node = priv->orig_node = node;
- priv->orig_pos = node->get_position();
- priv->orig_rot = node->get_rotation();
+ this->node = node;
+ orig_parent = node->get_parent();
}
ExSelection Exhibit::select(const Ray &ray) const
{
}
ExSelection Exhibit::select(const Ray &ray) const
{
- return ExSelection(0);
+ ExSelection sel;
+ HitPoint hit;
+ if(get_aabox().intersect(ray, &hit)) {
+ sel.ex = (Exhibit*)this;
+ sel.selray = ray;
+ sel.dist = hit.dist;
+ sel.validmask = EXSEL_RAY;
+ }
+ return sel;
}
ExSelection Exhibit::select(const Sphere &sph) const
{
}
ExSelection Exhibit::select(const Sphere &sph) const
{
- return ExSelection(0);
+ return ExSelection(0); // TODO
}
void Exhibit::update(float dt)
}
void Exhibit::update(float dt)
@@
-77,5
+88,17
@@
void Exhibit::post_draw() const
if(node) {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
if(node) {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
+
+ if(exsel_hover.ex == this) {
+ const AABox &bvol = get_aabox();
+ draw_geom_object(&bvol);
+ }
}
}
}
}
+
+
+const AABox &Exhibit::get_aabox() const
+{
+ aabb = node->get_bounds();
+ return aabb;
+}