Removed the lattice object

interface/src/Lattice.cpp

@@ -1,106 +0,0 @@
-//
-//  Lattice.cpp
-//  interface
-//
-//  Created by Philip on 1/19/13.
-//  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
-//
-
-#include "Lattice.h"
-
-Lattice::Lattice(int w, int h) {
-    width = w;
-    height = h;
-    tilegap = 2;
-    lastindex = -1;
-    tiles = new Tile[width*height];
-    for (int i = 0; i < (width*height); i++) {
-        tiles[i].color[0] = tiles[i].color[1] = tiles[i].color[2] = 0.2f + randFloat()*0.3f;
-        tiles[i].x = static_cast<float>(i % width);
-        tiles[i].y = static_cast<float>(i/width);
-        tiles[i].brightness = 1.0;
-        tiles[i].type = 0;
-        tiles[i].excited = tiles[i].inhibited = 0.0;
-    }
-}
-
-void Lattice::render(int screenWidth, int screenHeight) {
-    float tilewidth = static_cast<float>(screenWidth/width);
-    float tileheight = static_cast<float>(screenHeight/height);
-    float tilecolor[3];
-    glBegin(GL_QUADS);
-    for (int i = 0; i < (width*height); i++) {
-        if (tiles[i].type == 0) {
-            tilecolor[0] = 0.25; tilecolor[1] = 0.25; tilecolor[2] = 0.25;
-        } else if (tiles[i].type == 1) {
-            if (tiles[i].inhibited >= 0.1) {
-                tilecolor[0] = 0.5f; tilecolor[1] = 0.0; tilecolor[2] = 0.0;
-            } else {
-                tilecolor[0] = 0.2f; tilecolor[1] = 0.0; tilecolor[2] = 0.5f;
-            }
-        }
-        glColor3f(tilecolor[0]*(1.f+tiles[i].excited), tilecolor[1]*(1.f+tiles[i].excited), tilecolor[2]*(1.f+tiles[i].excited));
-        glVertex2f(tiles[i].x*tilewidth, tiles[i].y*tileheight);
-        glVertex2f((tiles[i].x + 1)*tilewidth - tilegap, tiles[i].y*tileheight);
-        glVertex2f((tiles[i].x + 1)*tilewidth - tilegap, (tiles[i].y + 1)*tileheight - tilegap);
-        glVertex2f(tiles[i].x*tilewidth, (tiles[i].y + 1)*tileheight - tilegap);        
-    }
-    glEnd();
-}
-
-void Lattice::mouseClick(float x, float y) {
-    //  Update lattice based on mouse location, where x and y are floats between 0 and 1 corresponding to screen location clicked
-    //  Change the clicked cell to a different type 
-    //printf("X = %3.1f Y = %3.1f\n", x, y);
-    int index = int(x*(float)width) + int(y*(float)height)*width;
-    if (index != lastindex) {
-        tiles[index].type++;
-        if (tiles[index].type == 2) tiles[index].type = 0;
-        lastindex = index; 
-    }
-}
-
-void Lattice::mouseOver(float x, float y) {
-    //  Update lattice based on mouse location, where x and y are floats between 0 and 1 corresponding to screen location clicked
-    //  Excite the hovered cell a bit toward firing 
-    //printf("X = %3.1f Y = %3.1f\n", x, y);
-    if (0) {
-        int index = int(x*(float)width) + int(y*(float)height)*width;
-        if (tiles[index].type > 0) tiles[index].excited += 0.05f;
-    //printf("excited = %3.1f, inhibited = %3.1f\n", tiles[index].excited, tiles[index].inhibited);
-    }
-}
-
-void Lattice::simulate(float deltaTime) {
-    int index;
-    for (int i = 0; i < (width*height); i++) {
-        if (tiles[i].type > 0) {
-            if ((tiles[i].excited > 0.5) && (tiles[i].inhibited < 0.1)) {
-                tiles[i].excited = 1.0;
-                tiles[i].inhibited = 1.0;
-                //  Add Energy to neighbors
-                for (int j = 0; j < 8; j++) {
-                    if (j == 0) index = i - width - 1;
-                    else if (j == 1) index = i - width;
-                    else if (j == 2) index = i - width + 1;
-                    else if (j == 3) index = i - 1;
-                    else if (j == 4) index = i + 1;
-                    else if (j == 5) index = i + width - 1;
-                    else if (j == 6) index = i + width;
-                    else index = i + width + 1;
-                    if ((index > 0) && (index < width*height)) {
-                        if (tiles[index].inhibited < 0.1) tiles[index].excited += 0.5;
-                    }
-                    
-                }
-            }
-            tiles[i].excited *= 0.98f;
-            tiles[i].inhibited *= 0.98f;
-        }
-    }
-}
-
-
-
-
-

interface/src/Lattice.h

@@ -1,39 +0,0 @@
-//
-//  Lattice.h
-//  interface
-//
-//  Created by Philip on 1/19/13.
-//  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
-//
-
-#ifndef __interface__Lattice__
-#define __interface__Lattice__
-
-#include <glm/glm.hpp>
-#include "Util.h"
-#include "world.h"
-#include "InterfaceConfig.h"
-#include <iostream>
-
-class Lattice {
-public:
-    Lattice(int width, int height);
-    void simulate(float deltaTime);
-    void render(int screenWidth, int screenHeight);
-    void mouseClick(float x, float y);
-    void mouseOver(float x, float y);
-private:
-    int lastindex;
-    int width, height;
-    int tilegap;
-    struct Tile {
-        float x,y;
-        float color[3];
-        float brightness;
-        float excited;
-        float inhibited;
-        int type;
-    } *tiles;
-};
-
-#endif /* defined(__interface__lattice__) */

interface/src/main.cpp

@@ -69,7 +69,6 @@
 #include <AgentList.h>
 #include <AgentTypes.h>
 #include "VoxelSystem.h"
-#include "Lattice.h"
 #include "Finger.h"
 #include "Oscilloscope.h"
 #include "UDPSocket.h"
@@ -130,7 +129,6 @@ Cloud cloud(0,                             //  Particles
 
 VoxelSystem voxels;
 
-Lattice lattice(160,100);
 Finger myFinger(WIDTH, HEIGHT);
 Field field;
 
@@ -337,6 +335,8 @@ void init(void)
     }
     myAvatar.setPos(start_location );
 	myCamera.setPosition( start_location );
+    
+    myFinger.setTarget(WIDTH/2, HEIGHT/2);
 	
 #ifdef MARKER_CAPTURE
     if(marker_capture_enabled){
@@ -793,8 +793,8 @@ void display(void)
         glDisable(GL_DEPTH_TEST);
         glDisable(GL_LIGHTING);
 
-        //lattice.render(WIDTH, HEIGHT);
+        myFinger.render();
-        //myFinger.render();
+    
         #ifndef _WIN32
         audio.render(WIDTH, HEIGHT);
         if (audioScope.getState()) audioScope.render();
@@ -1198,7 +1198,6 @@ void idle(void)
         myAvatar.simulate(1.f/FPS);
         balls.simulate(1.f/FPS);
         cloud.simulate(1.f/FPS);
-        lattice.simulate(1.f/FPS);
         myFinger.simulate(1.f/FPS);
 
         glutPostRedisplay();
@@ -1242,7 +1241,6 @@ void mouseFunc( int button, int state, int x, int y )
             mouseX = x;
             mouseY = y;
             mousePressed = 1;
-            lattice.mouseClick((float)x/(float)WIDTH, (float)y/(float)HEIGHT);
             mouseStartX = x;
             mouseStartY = y;
         }
@@ -1259,8 +1257,6 @@ void motionFunc( int x, int y)
 {
 	mouseX = x;
 	mouseY = y;
-    
-    lattice.mouseClick((float)x/(float)WIDTH,(float)y/(float)HEIGHT);
 }
 
 void mouseoverFunc( int x, int y)
@@ -1270,8 +1266,7 @@ void mouseoverFunc( int x, int y)
 	mouseY = y;
     if (mousePressed == 0)
     {
-//        lattice.mouseOver((float)x/(float)WIDTH,(float)y/(float)HEIGHT);
+        myFinger.setTarget(mouseX, mouseY);
-//        myFinger.setTarget(mouseX, mouseY);
     }
 }