[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/con...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/con... |
|
Date: |
Tue, 27 May 2008 16:13:16 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/27 16:13:16
Modified files:
. : ChangeLog
libbase : Makefile.am
Removed files:
libbase : container.h grid_index.h
Log message:
* libbase/container.h, libbase/grid_index.h: drop more dead
files.
I think Gnash works by magic.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6726&r2=1.6727
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.64&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/grid_index.h?cvsroot=gnash&r1=1.8&r2=0
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6726
retrieving revision 1.6727
diff -u -b -r1.6726 -r1.6727
--- ChangeLog 27 May 2008 16:00:47 -0000 1.6726
+++ ChangeLog 27 May 2008 16:13:14 -0000 1.6727
@@ -1,5 +1,10 @@
2008-05-27 Benjamin Wolsey <address@hidden>
+ * libbase/container.h, libbase/grid_index.h: drop more dead files.
+ I think Gnash works by magic.
+
+2008-05-27 Benjamin Wolsey <address@hidden>
+
* server/button_character_instance.cpp: compare std::strings for
portability (no strcasecmp).
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- libbase/Makefile.am 15 May 2008 07:58:01 -0000 1.114
+++ libbase/Makefile.am 27 May 2008 16:13:15 -0000 1.115
@@ -133,12 +133,10 @@
noinst_HEADERS = \
$(LIBLTDLHEAD) \
- container.h \
dlmalloc.h \
extension.h \
GnashException.h \
gettext.h \
- grid_index.h \
image.h \
jemtree.h \
jpeg.h \
Index: libbase/container.h
===================================================================
RCS file: libbase/container.h
diff -N libbase/container.h
--- libbase/container.h 19 May 2008 13:03:55 -0000 1.64
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-#ifndef __CONTAINER_H__
-#define __CONTAINER_H__
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-#ifdef HAVE_STRINGCASECMP
-# define STRCASECMP strcasecmp
-#else
-# define STRCASECMP _stricmp
-#endif
-
-// FIXME: This ugly hack is for NetBSD, which seems to have a
-// preprocessor problem, and won't define anything sensible like
-// NETBSD we can use. Basically the problem is NetBSD has two thread
-// implementations. One if the older pth library in /usr/pkg, and the
-// other (the one we want to use) is /usr/pkg/phtread. Even with the
-// corrent paths supplied, this one file barfs with GCC 3.3.3 on
-// NetBSD, so screw it, and just hack it for now. We hope this entire
-// file will be gone soon anyway.
-#if !defined(HAVE_WINSOCK_H) || defined(__OS2__)
-#define _LIB_PTHREAD_ 1
-#ifndef _LIB_PTHREAD_TYPES_H
-# define _LIB_PTHREAD_TYPES_H 1
-#endif
-
-#include <sys/types.h>
-
-// This screws up MingW
-#if 0
-#include <ctime>
-// And what's the point?
-clock_t clock __P((void));
-size_t strftime __P((char *, size_t, const char *, const struct tm *));
-#endif // 0
-
-#endif // ! HAVE_WINSOCK_H
-
-#include <cstddef>
-#include <cstring> // for strcmp and friends
-//#include <new> // for placement new
-#include <vector>
-
-namespace gnash {}
-
-#if defined(_WIN32) || defined(WIN32)
-#pragma warning(disable : 4345) // in MSVC 7.1, warning about placement
new POD default initializer
-#endif // _WIN32
-
-
-#endif // __CONTAINER_H__
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: t
-// End:
Index: libbase/grid_index.h
===================================================================
RCS file: libbase/grid_index.h
diff -N libbase/grid_index.h
--- libbase/grid_index.h 27 Mar 2008 16:12:34 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,781 +0,0 @@
-// grid_index.h -- Thatcher Ulrich <address@hidden> 2004
-
-// This source code has been donated to the Public Domain. Do
-// whatever you want with it.
-
-// Simple grid-based spatial index container.
-
-#ifndef GRID_INDEX_H
-#define GRID_INDEX_H
-
-#include "container.h"
-
-//
-// grid_index_point
-//
-
-
-template<class coord_t>
-class index_point
-// Simple point class for spatial index.
-{
-public:
- index_point() {}
- index_point(coord_t x_in, coord_t y_in)
- :
- x(x_in),
- y(y_in)
- {
- }
-
- bool operator==(const index_point<coord_t>& pt) const
- {
- return x == pt.x && y == pt.y;
- }
-
-//data:
- coord_t x, y;
-};
-
-
-template<class coord_t>
-class index_box
-// Simple bounding box class.
-{
-public:
- index_box() {}
- index_box(const index_point<coord_t>& min_max_in)
- :
- min(min_max_in),
- max(min_max_in)
- {
- }
- index_box(const index_point<coord_t>& min_in, const
index_point<coord_t>& max_in)
- :
- min(min_in),
- max(max_in)
- {
- }
-
- coord_t get_width() const { return max.x - min.x; }
- coord_t get_height() const { return max.y - min.y; }
-
- void expand_to_enclose(const index_point<coord_t>& loc)
- {
- if (loc.x < min.x) min.x = loc.x;
- if (loc.y < min.y) min.y = loc.y;
- if (loc.x > max.x) max.x = loc.x;
- if (loc.y > max.y) max.y = loc.y;
- }
-
- bool contains_point(const index_point<coord_t>& loc) const
- {
- if (loc.x >= min.x && loc.x <= max.x && loc.y >= min.y && loc.y
<= max.y)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
-
-//data:
- index_point<coord_t> min;
- index_point<coord_t> max;
-};
-
-
-template<class coord_t, class payload_t>
-struct grid_entry_point
-// Holds one entry for a grid point cell.
-{
- index_point<coord_t> location;
- payload_t value;
-
- grid_entry_point<coord_t, payload_t>* m_next;
-};
-
-
-template<class coord_t, class payload>
-class grid_index_point
-// Grid-based container for points.
-{
-public:
- typedef index_point<coord_t> point_t;
- typedef index_box<coord_t> box_t;
- typedef grid_entry_point<coord_t, payload> grid_entry_t;
-
- grid_index_point(const box_t& bound, int x_cells, int y_cells)
- :
- m_bound(bound),
- m_x_cells(x_cells),
- m_y_cells(y_cells)
- {
- assert(x_cells > 0 && y_cells > 0);
- assert(bound.min.x <= bound.max.x);
- assert(bound.min.y <= bound.max.y);
-
- // Allocate the grid.
- m_grid = new grid_entry_t*[x_cells * y_cells];
- memset(&m_grid[0], 0, sizeof(grid_entry_t*) * x_cells *
y_cells);
- }
-
- ~grid_index_point()
- {
- for (int y = 0; y < m_y_cells; y++)
- {
- for (int x = 0; x < m_x_cells; x++)
- {
- grid_entry_t* e = get_cell(x, y);
- while (e)
- {
- grid_entry_t* next = e->m_next;
- delete e;
- e = next;
- }
- }
- }
-
- delete [] m_grid;
- }
-
- const box_t& get_bound() const { return m_bound; }
-
- class iterator
- {
- public:
- grid_index_point* m_index;
- box_t m_query;
- index_box<int> m_query_cells;
- int m_current_cell_x, m_current_cell_y;
- grid_entry_t* m_current_entry;
-
- iterator()
- :
- m_index(NULL),
- m_query(point_t(0, 0), point_t(0, 0)),
- m_query_cells(index_point<int>(0, 0),
index_point<int>(0, 0)),
- m_current_cell_x(0),
- m_current_cell_y(0),
- m_current_entry(NULL)
- {
- }
-
- bool at_end() const { return m_current_entry == NULL; }
-
- void operator++()
- {
- if (at_end() == false)
- {
- advance();
- }
- }
-
- void advance()
- // Point at next element in the iteration.
- {
- if (m_current_entry)
- {
- // Continue through current cell.
- m_current_entry = m_current_entry->m_next;
-
- if (at_end() == false)
- {
- return;
- }
- }
- assert(m_current_entry == NULL);
-
- // Done with current cell; go to next cell.
- m_current_cell_x++;
- while (m_current_cell_y <= m_query_cells.max.y)
- {
- for (;;)
- {
- if (m_current_cell_x >
m_query_cells.max.x)
- {
- break;
- }
-
- m_current_entry =
m_index->get_cell(m_current_cell_x, m_current_cell_y);
- if (m_current_entry)
- {
- // Found a valid cell.
- return;
- }
-
- m_current_cell_x++;
- }
- m_current_cell_x = m_query_cells.min.x;
- m_current_cell_y++;
- }
-
- assert(m_current_cell_x == m_query_cells.min.x);
- assert(m_current_cell_y == m_query_cells.max.y + 1);
-
- // No more valid cells.
- assert(at_end());
- }
-
- grid_entry_t& operator*()
- {
- assert(at_end() == false && m_current_entry != NULL);
- return *m_current_entry;
- }
- grid_entry_t* operator->() { return &(operator*()); }
-
- // @@ TODO Finish
- //
- //bool operator==(const const_iterator& it) const
- //{
- // if (at_end() && it.at_end())
- // {
- // return true;
- // }
- // else
- // {
- // return
- // m_hash == it.m_hash
- // && m_index == it.m_index;
- // }
- //}
- //
- //bool operator!=(const const_iterator& it) const { return !
(*this == it); }
- };
-
- iterator begin(const box_t& q)
- {
- iterator it;
- it.m_index = this;
- it.m_query = q;
- it.m_query_cells.min = get_containing_cell_clamped(q.min);
- it.m_query_cells.max = get_containing_cell_clamped(q.max);
-
- assert(it.m_query_cells.min.x <= it.m_query_cells.max.x);
- assert(it.m_query_cells.min.y <= it.m_query_cells.max.y);
-
- it.m_current_cell_x = it.m_query_cells.min.x;
- it.m_current_cell_y = it.m_query_cells.min.y;
- it.m_current_entry = get_cell(it.m_current_cell_x,
it.m_current_cell_y);
-
- // Make sure iterator starts valid.
- if (it.m_current_entry == NULL)
- {
- it.advance();
- }
-
- return it;
- }
-
- iterator end() const
- {
- iterator it;
- it.m_index = this;
- it.m_current_entry = NULL;
-
- return it;
- }
-
- void add(const point_t& location, payload p)
- // Insert a point, with the given location and payload, into
- // our index.
- {
- index_point<int> ip =
get_containing_cell_clamped(location);
-
- grid_entry_t* new_entry = new grid_entry_t;
- new_entry->location = location;
- new_entry->value = p;
-
- // Link it into the containing cell.
- int index = get_cell_index(ip);
- new_entry->m_next = m_grid[index];
- m_grid[index] = new_entry;
- }
-
- void remove(grid_entry_t* entry)
- // Removes the entry from the index, and deletes it.
- {
- assert(entry);
-
- index_point<int> ip =
get_containing_cell_clamped(entry->location);
- int index = get_cell_index(ip);
-
- // Unlink matching entry.
- grid_entry_t** prev_ptr = &m_grid[index];
- grid_entry_t* ptr = *prev_ptr;
- while (ptr)
- {
- if (ptr == entry)
- {
- // This is the one; unlink it.
- *prev_ptr = ptr->m_next;
-
- delete entry;
-
- return;
- }
-
- // Go to the next entry.
- prev_ptr = &ptr->m_next;
- ptr = *prev_ptr;
- }
-
- // Didn't find entry! Something is wrong.
- abort();
- }
-
- iterator find(const point_t& location, payload p)
- // Helper. Search for matching entry.
- {
- iterator it;
- for (it = begin(box_t(location, location)); ! it.at_end(); ++it)
- {
- if (it->location == location && it->value == p)
- {
- // Found it.
- return it;
- }
- }
-
- // Didn't find it.
- assert(it.at_end());
- return it;
- }
-
-private:
-
- grid_entry_t* get_cell(int x, int y)
- {
- assert(x >= 0 && x < m_x_cells);
- assert(y >= 0 && y < m_y_cells);
-
- return m_grid[x + y * m_x_cells];
- }
-
- int get_cell_index(const index_point<int>& ip)
- {
- assert(ip.x >= 0 && ip.x < m_x_cells);
- assert(ip.y >= 0 && ip.y < m_y_cells);
-
- int index = ip.x + ip.y * m_x_cells;
-
- return index;
- }
-
- index_point<int> get_containing_cell_clamped(const point_t& p)
- // Get the indices of the cell that contains the given point.
- {
- index_point<int> ip;
- ip.x = int(((p.x - m_bound.min.x) * coord_t(m_x_cells)) /
(m_bound.max.x - m_bound.min.x));
- ip.y = int(((p.y - m_bound.min.y) * coord_t(m_y_cells)) /
(m_bound.max.y - m_bound.min.y));
-
- // Clamp.
- if (ip.x < 0) ip.x = 0;
- if (ip.x >= m_x_cells) ip.x = m_x_cells - 1;
- if (ip.y < 0) ip.y = 0;
- if (ip.y >= m_y_cells) ip.y = m_y_cells - 1;
-
- return ip;
- }
-
-//data:
- box_t m_bound;
- int m_x_cells;
- int m_y_cells;
- grid_entry_t** m_grid;
-};
-
-
-//
-// grid_index_box
-//
-
-
-template<class coord_t, class payload>
-struct grid_entry_box
-// Holds one entry for a grid cell.
-{
- index_box<coord_t> bound;
- payload value;
-
- int m_last_query_id; // avoid returning the same item
multiple times
-
- grid_entry_box() : m_last_query_id(0) {}
-};
-
-
-template<class coord_t, class payload>
-class grid_index_box
-// Grid-based container for boxes.
-{
-public:
- typedef index_point<coord_t> point_t;
- typedef index_box<coord_t> box_t;
- typedef grid_entry_box<coord_t, payload> grid_entry_t;
-
- grid_index_box(const box_t& bound, int x_cells, int y_cells)
- :
- m_bound(bound),
- m_x_cells(x_cells),
- m_y_cells(y_cells),
- m_query_id(0)
- {
- assert(x_cells > 0 && y_cells > 0);
- assert(bound.min.x <= bound.max.x);
- assert(bound.min.y <= bound.max.y);
-
- // Allocate the grid.
- m_grid = new std::vector<grid_entry_t*>[x_cells * y_cells];
- }
-
- ~grid_index_box()
- {
- // Need to delete all entries (be careful to only
- // delete each entry once, even though entries may be
- // repeated many times).
- for (iterator it = begin_all(); ! it.at_end(); ++it)
- {
- index_point<int> ip =
get_containing_cell_clamped(it->bound.max);
- if (ip.x == it.m_current_cell_x && ip.y ==
it.m_current_cell_y)
- {
- // This is the last time this entry
- // appears in the index. Delete it.
- delete it.m_current_entry;
- }
- }
-
- delete [] m_grid;
- }
-
- const box_t& get_bound() const { return m_bound; }
- int get_query_id() const { return m_query_id; }
-
- class iterator
- {
- public:
- grid_index_box* m_index;
- box_t m_query;
- index_box<int> m_query_cells;
- int m_current_cell_x, m_current_cell_y;
- int m_current_cell_array_index;
- grid_entry_t* m_current_entry;
-
- iterator()
- :
- m_index(NULL),
- m_query(point_t(0, 0), point_t(0, 0)),
- m_query_cells(index_point<int>(0, 0),
index_point<int>(0, 0)),
- m_current_cell_x(0),
- m_current_cell_y(0),
- m_current_cell_array_index(-1),
- m_current_entry(NULL)
- {
- }
-
- bool at_end() const { return m_current_entry == NULL; }
-
- void operator++()
- {
- if (at_end() == false)
- {
- advance();
- }
- }
-
- void advance()
- // Point at next element in the iteration.
- {
- if (advance_in_cell())
- {
- return;
- }
-
- // Done with current cell; go to next cell.
- m_current_cell_x++;
- while (m_current_cell_y <= m_query_cells.max.y)
- {
- for (;;)
- {
- if (m_current_cell_x >
m_query_cells.max.x)
- {
- break;
- }
-
- if (advance_in_cell())
- {
- // We're good.
- return;
- }
-
- m_current_cell_x++;
- }
- m_current_cell_x = m_query_cells.min.x;
- m_current_cell_y++;
- }
-
- assert(m_current_cell_x == m_query_cells.min.x);
- assert(m_current_cell_y == m_query_cells.max.y + 1);
-
- // No more valid cells.
- assert(at_end());
- }
-
- bool advance_in_cell()
- // Go to the next valid element in the current cell.
- // If we reach the end of the cell, set
- // m_current_cell_array_index to -1 and return false.
- // Otherwise point m_current_entry at the valid
- // element, and return true.
- {
- int query_id = m_index->get_query_id();
- std::vector<grid_entry_t*>* cell_array =
m_index->get_cell(m_current_cell_x, m_current_cell_y);
-
- while (++m_current_cell_array_index < (int)
cell_array->size())
- {
- // Continue through the current cell.
- m_current_entry =
(*cell_array)[m_current_cell_array_index];
- if (m_current_entry->m_last_query_id ==
query_id)
- {
- // Skip this one; we already iterated
over it.
- }
- else
- {
- // Valid entry.
-
- // Update query id.
- m_current_entry->m_last_query_id =
query_id;
-
- return true;
- }
- }
-
- // No more valid entries in this cell.
- m_current_entry = NULL;
- m_current_cell_array_index = -1;
-
- return false;
- }
-
- grid_entry_t& operator*()
- {
- assert(at_end() == false && m_current_entry != NULL);
- return *m_current_entry;
- }
- grid_entry_t* operator->() { return &(operator*()); }
-
- // @@ TODO Finish
- //
- //bool operator==(const const_iterator& it) const
- //{
- // if (at_end() && it.at_end())
- // {
- // return true;
- // }
- // else
- // {
- // return
- // m_hash == it.m_hash
- // && m_index == it.m_index;
- // }
- //}
- //
- //bool operator!=(const const_iterator& it) const { return !
(*this == it); }
- };
-
- iterator begin(const box_t& q)
- {
- m_query_id++;
- if (m_query_id == 0)
- {
- // Query id wrapped around! Clear m_last_query_id in
all entries in our
- // array, to avoid aliasing from old queries.
- int cell_count = m_x_cells * m_y_cells;
- for (int i = 0; i < cell_count; i++)
- {
- std::vector<grid_entry_t*>* cell_array =
&m_grid[i];
- for (int j = 0, n = cell_array->size(); j < n;
j++)
- {
- (*cell_array)[j]->m_last_query_id = 0;
- }
- }
- m_query_id = 1;
- }
-
- iterator it;
- it.m_index = this;
- it.m_query = q;
- it.m_query_cells.min = get_containing_cell_clamped(q.min);
- it.m_query_cells.max = get_containing_cell_clamped(q.max);
-
- assert(it.m_query_cells.min.x <= it.m_query_cells.max.x);
- assert(it.m_query_cells.min.y <= it.m_query_cells.max.y);
-
- it.m_current_cell_x = it.m_query_cells.min.x;
- it.m_current_cell_y = it.m_query_cells.min.y;
-
- it.advance(); // find first valid entry.
-
- return it;
- }
-
- iterator begin_all()
- // For convenience.
- {
- return begin(get_bound());
- }
-
- iterator end() const
- {
- iterator it;
- it.m_index = this;
- it.m_current_entry = NULL;
-
- return it;
- }
-
- void add(const box_t& bound, payload p)
- // Insert a box, with the given payload, into our index.
- {
- index_box<int> ib = get_containing_cells_clamped(bound);
-
- grid_entry_t* new_entry = new grid_entry_t;
- new_entry->bound = bound;
- new_entry->value = p;
-
- // Add it to all cells it overlaps with.
- for (int iy = ib.min.y; iy <= ib.max.y; iy++)
- {
- for (int ix = ib.min.x; ix <= ib.max.x; ix++)
- {
- std::vector<grid_entry_t*>* cell_array =
get_cell(ix, iy);
- cell_array->push_back(new_entry);
- }
- }
- }
-
-
- void remove(grid_entry_t* entry)
- // Removes the entry from the index, and deletes it.
- {
- assert(entry);
-
- // Find and remove the entry from all cells that it overlaps
with.
- index_box<int> ib = get_containing_cells_clamped(entry->bound);
-
- for (int iy = ib.min.y; iy <= ib.max.y; iy++)
- {
- for (int ix = ib.min.x; ix <= ib.max.x; ix++)
- {
- std::vector<grid_entry_t*>* cell_array =
get_cell(ix, iy);
-
- int i, n;
- for (i = 0, n = cell_array->size(); i < n; i++)
- {
- // Find entry, and remove it.
- if ((*cell_array)[i] == entry)
- {
-
cell_array->erase(cell_array->begin() + i);
- break;
- }
- }
-
- assert(i < n); // Didn't find entry in this
cell! Something is wrong.
- }
- }
-
- delete entry;
- }
-
-
- iterator find(const box_t& bound, payload p)
- // Helper. Search for matching entry.
- {
- iterator it;
- for (it = begin(bound); ! it.at_end(); ++it)
- {
- if (it->bound == bound && it->value == p)
- {
- // Found it.
- return it;
- }
- }
-
- // Didn't find it.
- assert(it.at_end());
- return it;
- }
-
- grid_entry_t* find_payload_from_point(const index_point<coord_t>&
loc, payload p)
- // Helper. Search for matching payload, given any point within its
bound.
- // Should be relatively quick, assuming payload is unique.
- {
- index_point<int> ip = get_containing_cell_clamped(loc);
- std::vector<grid_entry_t*>* cell_array = get_cell(ip.x,
ip.y);
-
- for (int i = 0, n = cell_array->size(); i < n; i++)
- {
- grid_entry_t* entry = (*cell_array)[i];
- if (entry->value == p)
- {
- // Found it.
- return entry;
- }
- }
-
- // Didn't find it.
- return NULL;
- }
-
-private:
-
- std::vector<grid_entry_t*>* get_cell(int x, int y)
- {
- assert(x >= 0 && x < m_x_cells);
- assert(y >= 0 && y < m_y_cells);
-
- return &m_grid[x + y * m_x_cells];
- }
-
- index_point<int> get_containing_cell_clamped(const point_t& p)
const
- // Get the indices of the cell that contains the given point.
- {
- index_point<int> ip;
- ip.x = int(((p.x - m_bound.min.x) * coord_t(m_x_cells)) /
(m_bound.max.x - m_bound.min.x));
- ip.y = int(((p.y - m_bound.min.y) * coord_t(m_y_cells)) /
(m_bound.max.y - m_bound.min.y));
-
- // Clamp.
- if (ip.x < 0) ip.x = 0;
- if (ip.x >= m_x_cells) ip.x = m_x_cells - 1;
- if (ip.y < 0) ip.y = 0;
- if (ip.y >= m_y_cells) ip.y = m_y_cells - 1;
-
- return ip;
- }
-
- index_box<int> get_containing_cells_clamped(const box_t& p) const
- // Get the indices of the cell that contains the given point.
- {
- index_box<int> ib(get_containing_cell_clamped(p.min),
get_containing_cell_clamped(p.max));
- return ib;
- }
-
-//data:
- box_t m_bound;
- int m_x_cells;
- int m_y_cells;
- int m_query_id;
- std::vector<grid_entry_t*>* m_grid;
-};
-
-
-#endif // GRID_INDEX_H
-
-
-// Local Variables:
-// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
-// indent-tabs-mode: t
-// End:
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/Makefile.am libbase/con...,
Benjamin Wolsey <=