summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--public/assets/javascripts/rectangles/engine/rooms/grouper.js20
-rw-r--r--public/assets/javascripts/rectangles/models/rect.js3
-rw-r--r--public/assets/javascripts/rectangles/models/surface.js111
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js2
-rw-r--r--test/06-test-grouper.js4
-rw-r--r--test/07-test-bounds.js67
-rw-r--r--test/07-test-surface.js60
-rw-r--r--views/partials/scripts.ejs3
8 files changed, 190 insertions, 80 deletions
diff --git a/public/assets/javascripts/rectangles/engine/rooms/grouper.js b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
index ba081e3..4ad3bd8 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/grouper.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/grouper.js
@@ -1,9 +1,10 @@
(function(){
- var vec2, Rect, Rooms, UidGenerator, Wall, sort
+ var vec2, Rect, Rooms, UidGenerator, Wall, Surface, sort
if ('window' in this) {
vec2 = window.vec2
Rect = window.Rect
+ Surface = window.Surface
Rooms = window.Rooms
UidGenerator = window.UidGenerator
Wall = window.Wall
@@ -15,6 +16,7 @@
vec2 = require('../../models/vec2')
Rect = require('../../models/rect')
Wall = require('../../models/wall')
+ Surface = require('../../models/surface')
sort = require('../../util/sort')
FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
PI = Math.PI
@@ -115,23 +117,23 @@
if (useX && wall.vec.b == mx.rect.x.a) {
wall.vec.b = mx.rect.x.b
wall.mx.push(mx)
- wall.faces.push(mx.face)
+ wall.surface.add(mx.face)
return
}
else if (! useX && wall.vec.b == mx.rect.y.a) {
wall.vec.b = mx.rect.y.b
wall.mx.push(mx)
- wall.faces.push(mx.face)
+ wall.surface.add(mx.face)
return
}
}
wall = new Wall ({
- id: base.uid(),
- side: side,
- mx: [ mx ],
- faces: [ mx.face ],
- vec: mx.rect[ useX ? 'x' : 'y' ].clone(),
- edge: mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
+ id: base.uid(),
+ side: side,
+ mx: [ mx ],
+ surface: new Surface( mx.face ),
+ vec: mx.rect[ useX ? 'x' : 'y' ].clone(),
+ edge: mx.rect[ useX ? 'y' : 'x' ][ useA ? 'a' : 'b' ],
})
walls.push(wall)
})
diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js
index 590440a..500ee6d 100644
--- a/public/assets/javascripts/rectangles/models/rect.js
+++ b/public/assets/javascripts/rectangles/models/rect.js
@@ -107,6 +107,9 @@
Rect.prototype.eq = function(r){
return this.x.eq(r.x) && this.y.eq(r.y)
}
+ Rect.prototype.fits = function(v){
+ return this.x.length() >= v.a && this.y.length() >= v.b
+ }
Rect.prototype.nearEdge = function (x, y, r) {
var edges = 0
if (x < this.x.a+r) {
diff --git a/public/assets/javascripts/rectangles/models/surface.js b/public/assets/javascripts/rectangles/models/surface.js
new file mode 100644
index 0000000..448722b
--- /dev/null
+++ b/public/assets/javascripts/rectangles/models/surface.js
@@ -0,0 +1,111 @@
+(function(){
+
+ var vec2, Rect
+ if ('window' in this) {
+ vec2 = window.vec2
+ Rect = window.Rect
+ }
+ else {
+ vec2 = require('./vec2')
+ Rect = require('./rect')
+ }
+
+ var Surface = function (face){
+ this.width = 0
+ this.height = 0
+ this.faces = []
+ if (face) {
+ this.add(face)
+ }
+ }
+ Surface.prototype.add = function(rect){
+ this.faces.push(rect)
+ this.width += rect.width()
+ this.height = Math.max(this.height, rect.height())
+ }
+ Surface.prototype.fits_scale = function(v, scale){
+ v = v.clone().mul(scale)
+ return this.fits(v)
+ }
+ Surface.prototype.fits = function(v){
+ var faces = this.faces
+ var scratch
+ if (this.width < v.a || this.height < v.b) {
+ return null
+ }
+ for (var i = 0; i < faces.length; i++) {
+ if (faces[i].fits(v)) {
+ return faces[i]
+ }
+ }
+ scratch = new Rect (0,0,0,0)
+ for (var i = 0; i < faces.length; i++) {
+ if (faces[i].y.length() < v.b) {
+ continue
+ }
+ scratch.x.a = faces[i].x.a
+ scratch.x.b = faces[i].x.b
+ scratch.y.a = faces[i].y.a
+ scratch.y.b = faces[i].y.b
+ SEARCH: for (var j = i+1; j < faces.length; j++) {
+ if (faces[j].y.a > scratch.y.a) {
+ scratch.y.a = faces[j].y.a
+ }
+ if (faces[j].y.b < scratch.y.b) {
+ scratch.y.b = faces[j].y.b
+ }
+ if (scratch.y.b <= scratch.y.a || scratch.y.length() < v.b) {
+ break SEARCH
+ }
+ scratch.x.b = faces[j].x.b
+ if (scratch.fits(v)) {
+ return scratch
+ }
+ }
+ }
+ return null
+ }
+ Surface.prototype.place = function(v, index){
+ var face, faces = this.faces
+ }
+ Surface.prototype.bounds = function(index){
+ var bounds = faces[index].clone()
+ var height = faces[index].height()
+
+ for (var i = index-1; i > 0; i--) {
+ var face = faces[i]
+ if (face.y.length() < height) {
+ continue
+ }
+ if (face.y.a > bounds.y.a) {
+ continue
+ }
+ if (face.y.b < bounds.y.b) {
+ continue
+ }
+ bounds.x.a = bounds.x.a
+ }
+
+ for (var i = index+1; i < faces.length; i++) {
+ var face = faces[i]
+ if (face.y.length() < height) {
+ continue
+ }
+ if (face.y.a > bounds.y.a) {
+ continue
+ }
+ if (face.y.b < bounds.y.b) {
+ continue
+ }
+ bounds.x.b = bounds.x.b
+ }
+ return bounds
+ }
+
+ if ('window' in this) {
+ window.Surface = Surface
+ }
+ else {
+ module.exports = Surface
+ }
+})()
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index bbe6b97..fdc91fd 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -17,7 +17,7 @@
this.vec = opt.vec
this.edge = opt.edge
this.side = opt.side
- this.faces = opt.faces
+ this.surface = opt.surface
this.mx = opt.mx
}
diff --git a/test/06-test-grouper.js b/test/06-test-grouper.js
index 5388875..0f14217 100644
--- a/test/06-test-grouper.js
+++ b/test/06-test-grouper.js
@@ -236,7 +236,7 @@ describe('grouper(rect,corner,peninsula_taller)', function(){
})
it("right has 5 walls", function(){
assert.equal(5, right_walls.length)
- // console.log(right_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.faces+"" }))
+ // console.log(right_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.surface +"" }))
})
it("front has 3 walls", function(){
assert.equal(3, front_walls.length)
@@ -281,7 +281,7 @@ describe('grouper(room,hallway)', function(){
})
it("back has 2 walls", function(){
assert.equal(2, back_walls.length)
- // console.log(back_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.faces+"" }))
+ // console.log(back_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.surface +"" }))
})
})
})
diff --git a/test/07-test-bounds.js b/test/07-test-bounds.js
deleted file mode 100644
index 20afbfa..0000000
--- a/test/07-test-bounds.js
+++ /dev/null
@@ -1,67 +0,0 @@
-var assert = require("assert")
-var vec = require("../public/assets/javascripts/rectangles/models/vec2.js")
-var Rect = require("../public/assets/javascripts/rectangles/models/rect.js")
-var Room = require("../public/assets/javascripts/rectangles/models/room.js")
-var Rooms = require("../public/assets/javascripts/rectangles/engine/rooms/_rooms.js")
-var Clipper = require("../public/assets/javascripts/rectangles/engine/rooms/clipper.js")
-var Builder = require("../public/assets/javascripts/rectangles/engine/rooms/builder.js")
-var Grouper = require("../public/assets/javascripts/rectangles/engine/rooms/grouper.js")
-var FRONT = 0x1, BACK = 0x2, LEFT = 0x4, RIGHT = 0x8, FLOOR = 0x10, CEILING = 0x20
-var ALL = FRONT | BACK | LEFT | RIGHT
-
-var rect = new Rect( new vec(1,5), new vec(1,5) )
-var east = new Rect( new vec(2,6), new vec(1,5) )
-var corner = new Rect( new vec(3,7), new vec(3,7) )
-var peninsula = new Rect( new vec(4,6), new vec(6,8) )
-var big_rect = new Rect( new vec(1,5), new vec(1,5) )
-var hall_rect = new Rect( new vec(3,4), new vec(4,8) )
-
-var rect_room = new Room({ id: "rect", rect: rect, height: 2 })
-var east_room = new Room({ id: "east", rect: east, height: 2 })
-var corner_room = new Room({ id: "corner", rect: corner, height: 2 })
-var peninsula_room = new Room({ id: "peninsula", rect: peninsula, height: 2 })
-var peninsula_taller = new Room({ id: "peninsula", rect: peninsula, height: 3 })
-var peninsula_shorter = new Room({ id: "peninsula", rect: peninsula, height: 1 })
-
-var taller_room = new Room({ id: "taller", rect: rect, height: 3 })
-
-var big_room = new Room({ id: "big_room", rect: big_rect, height: 4 })
-var hallway = new Room({ id: "hallway", rect: hall_rect, height: 2 })
-
-function reset(){
- Rooms.forEach(function(room){
- room.reset()
- })
- Rooms.list = {}
- Rooms.regions = []
-}
-function rebuild(){
- Rooms.clipper.solve_rects()
- Rooms.builder.build()
-}
-
-describe('wall', function(){
- reset()
- Rooms.add( big_room )
- Rooms.add( hallway )
- rebuild()
-
- var collections = Rooms.grouper.collect()
- var front_walls = Rooms.grouper.group([], collections, FRONT)
- var back_walls = Rooms.grouper.group([], collections, BACK)
- var left_walls = Rooms.grouper.group([], collections, LEFT)
- var right_walls = Rooms.grouper.group([], collections, RIGHT)
-
- console.log(back_walls.map(function(m){ return m.vec + " " + m.edge + " " + m.faces+"" }))
- var u_wall = back_walls[0]
-
- describe('#fits()', function(){
- it("", function(){
- })
- })
- describe('#bounds_for()', function(){
- it("", function(){
- })
- })
-})
-
diff --git a/test/07-test-surface.js b/test/07-test-surface.js
new file mode 100644
index 0000000..8f69e77
--- /dev/null
+++ b/test/07-test-surface.js
@@ -0,0 +1,60 @@
+var assert = require("assert")
+var vec2 = require("../public/assets/javascripts/rectangles/models/vec2.js")
+var Rect = require("../public/assets/javascripts/rectangles/models/rect.js")
+var Surface = require("../public/assets/javascripts/rectangles/models/surface.js")
+
+// [[1 3] [0 4]] front back left right
+// [[3 4] [2 4]] front back left right
+// [[4 5] [0 4]] front back left right
+
+describe('basic surface', function(){
+ var surface = new Surface ()
+ surface.add( new Rect( new vec2(1, 3), new vec2(0, 4) ) )
+ surface.add( new Rect( new vec2(3, 4), new vec2(2, 4) ) )
+ surface.add( new Rect( new vec2(4, 6), new vec2(0, 4) ) )
+
+ var small = new vec2(2, 2)
+ var large = new vec2(10, 10)
+ var oblong = new vec2(4, 1)
+
+ describe('#fits()', function(){
+ it("fits something small", function(){
+ assert.equal(true, !! surface.fits(small))
+ })
+ it("doesn't fit something large", function(){
+ assert.equal(false, !! surface.fits(large))
+ })
+ it("fits something oblong", function(){
+ assert.equal(true, !! surface.fits(oblong))
+ })
+ })
+ describe('#fits_scale()', function(){
+ it("fits something large, scaled down", function(){
+ assert.equal(true, !! surface.fits_scale(large, 0.1))
+ })
+ it("doesn't fit something small, scaled up", function(){
+ assert.equal(false, !! surface.fits_scale(small, 10))
+ })
+ it("doesn't fit something oblong, scaled up", function(){
+ assert.equal(false, !! surface.fits_scale(oblong, 10))
+ })
+ })
+
+ describe('#place()', function(){
+ it("fits a small element on the top left", function(){
+ var bounds = surface.place(small, new vec2(1,3))
+ console.log(bounds)
+ })
+ it("places a small element on the right", function(){
+ var bounds = surface.place(small, new vec2(4,6))
+ console.log(bounds)
+ })
+ })
+
+ describe('#clamp()', function(){
+ it("", function(){
+ })
+ })
+
+})
+
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 915027d..acb3bff 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -31,6 +31,7 @@
<script type="text/javascript" src="/assets/javascripts/rectangles/models/vec3.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/models/mat4.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/models/rect.js"></script>
+<script type="text/javascript" src="/assets/javascripts/rectangles/models/surface.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/models/tree.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/models/room.js"></script>
<script type="text/javascript" src="/assets/javascripts/rectangles/models/wall.js"></script>
@@ -99,4 +100,4 @@
<!-- external dependencies -->
<script src="http://www.youtube.com/player_api"></script>
-<script src="http://a.vimeocdn.com/js/froogaloop2.min.js"></script> \ No newline at end of file
+<script src="http://a.vimeocdn.com/js/froogaloop2.min.js"></script>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 21:40:12 +0000