Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on case-sensitive filesystems. #68

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/floorplanner/floorplanner.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../model/floorplan.ts" />
/// <reference path="floorplanner_view.ts" />

module BP3D.Floorplanner {
/** how much will we move a corner to make a wall axis aligned (cm) */
const snapTolerance = 25;

/**
/**
* The Floorplanner implements an interactive tool for creation of floorplans.
*/
export class Floorplanner {
Expand Down
2 changes: 1 addition & 1 deletion src/floorplanner/floorplanner_view.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../core/configuration.ts" />
/// <reference path="../core/dimensioning.ts" />
/// <reference path="../core/utils.ts" />
Expand Down
14 changes: 7 additions & 7 deletions src/model/corner.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../core/utils.ts" />
/// <reference path="floorplan.ts" />
/// <reference path="wall.ts" />
Expand Down Expand Up @@ -27,7 +27,7 @@ module BP3D.Model {
/** Callbacks to be fired in case of action. */
private action_callbacks = $.Callbacks();

/** Constructs a corner.
/** Constructs a corner.
* @param floorplan The associated floorplan.
* @param x X coordinate.
* @param y Y coordinate.
Expand Down Expand Up @@ -75,7 +75,7 @@ module BP3D.Model {
}

/**
*
*
*/
public snapToAxis(tolerance: number): { x: boolean, y: boolean } {
// try to snap this corner to an axis
Expand Down Expand Up @@ -179,7 +179,7 @@ module BP3D.Model {
}

/**
*
*
*/
public distanceFrom(x: number, y: number): number {
var distance = Core.Utils.distance(x, y, this.x, this.y);
Expand Down Expand Up @@ -263,7 +263,7 @@ module BP3D.Model {
}

/**
*
*
*/
private combineWithCorner(corner: Corner) {
// update position to other corner's
Expand Down Expand Up @@ -319,7 +319,7 @@ module BP3D.Model {
var wallStartpoints = {};
for (var i = this.wallStarts.length - 1; i >= 0; i--) {
if (this.wallStarts[i].getEnd() === this) {
// remove zero length wall
// remove zero length wall
this.wallStarts[i].remove();
} else if (this.wallStarts[i].getEnd().id in wallEndpoints) {
// remove duplicated wall
Expand All @@ -330,7 +330,7 @@ module BP3D.Model {
}
for (var i = this.wallEnds.length - 1; i >= 0; i--) {
if (this.wallEnds[i].getStart() === this) {
// removed zero length wall
// removed zero length wall
this.wallEnds[i].remove();
} else if (this.wallEnds[i].getStart().id in wallStartpoints) {
// removed duplicated wall
Expand Down
14 changes: 7 additions & 7 deletions src/model/floorplan.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../core/utils.ts" />
/// <reference path="wall.ts" />
Expand All @@ -10,7 +10,7 @@ module BP3D.Model {
/** */
const defaultFloorPlanTolerance = 10.0;

/**
/**
* A Floorplan represents a number of Walls, Corners and Rooms.
*/
export class Floorplan {
Expand Down Expand Up @@ -39,8 +39,8 @@ module BP3D.Model {
/** */
public roomLoadedCallbacks = $.Callbacks();

/**
* Floor textures are owned by the floorplan, because room objects are
/**
* Floor textures are owned by the floorplan, because room objects are
* destroyed and created each time we change the floorplan.
* floorTextures is a map of room UUIDs (string) to a object with
* url and scale attributes.
Expand Down Expand Up @@ -289,7 +289,7 @@ module BP3D.Model {
this.walls = [];
}

/**
/**
* Update rooms
*/
public update() {
Expand All @@ -309,7 +309,7 @@ module BP3D.Model {
this.updated_rooms.fire();
}

/**
/**
* Returns the center of the floorplan in the y plane
*/
public getCenter() {
Expand Down Expand Up @@ -444,7 +444,7 @@ module BP3D.Model {
continue;
}

// nope, throw it on the queue
// nope, throw it on the queue
addToStack.push(nextCorner);
}

Expand Down
14 changes: 7 additions & 7 deletions src/model/half_edge.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../core/utils.ts" />

module BP3D.Model {
/**
* Half Edges are created by Room.
*
*
* Once rooms have been identified, Half Edges are created for each interior wall.
*
*
* A wall can have two half edges if it is visible from both sides.
*/
export class HalfEdge {
Expand Down Expand Up @@ -62,7 +62,7 @@ module BP3D.Model {
}

/**
*
*
*/
public getTexture() {
if (this.front) {
Expand All @@ -73,7 +73,7 @@ module BP3D.Model {
}

/**
*
*
*/
public setTexture(textureUrl: string, textureStretch: boolean, textureScale: number) {
var texture = {
Expand All @@ -89,7 +89,7 @@ module BP3D.Model {
this.redrawCallbacks.fire();
}

/**
/**
* this feels hacky, but need wall items
*/
public generatePlane = function () {
Expand Down Expand Up @@ -233,7 +233,7 @@ module BP3D.Model {
this.exteriorEnd(), this.exteriorStart()];
}

/**
/**
* Gets CCW angle from v1 to v2
*/
private halfAngleVector(v1: HalfEdge, v2: HalfEdge): { x: number, y: number } {
Expand Down
6 changes: 3 additions & 3 deletions src/model/model.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="floorplan.ts" />
/// <reference path="scene.ts" />

module BP3D.Model {
/**
* A Model connects a Floorplan and a Scene.
/**
* A Model connects a Floorplan and a Scene.
*/
export class Model {

Expand Down
10 changes: 5 additions & 5 deletions src/model/room.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../core/utils.ts" />
/// <reference path="corner.ts" />
/// <reference path="floorplan.ts" />
Expand All @@ -20,8 +20,8 @@ module BP3D.Model {
scale: 400
}

/**
* A Room is the combination of a Floorplan with a floor plane.
/**
* A Room is the combination of a Floorplan with a floor plane.
*/
export class Room {

Expand Down Expand Up @@ -67,7 +67,7 @@ module BP3D.Model {
return tex || defaultRoomTexture;
}

/**
/**
* textureStretch always true, just an argument for consistency with walls
*/
private setTexture(textureUrl: string, textureStretch, textureScale: number) {
Expand Down Expand Up @@ -115,7 +115,7 @@ module BP3D.Model {
}
}

/**
/**
* Populates each wall's half edge relating to this room
* this creates a fancy doubly connected edge list (DCEL)
*/
Expand Down
4 changes: 2 additions & 2 deletions src/model/scene.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../core/utils.ts" />
/// <reference path="../items/factory.ts" />

Expand Down Expand Up @@ -136,7 +136,7 @@ module BP3D.Model {
this.loader.load(
fileName,
loaderCallback,
undefined // TODO_Ekki
undefined // TODO_Ekki
);
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/model/wall.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../core/configuration.ts" />
/// <reference path="../core/utils.ts" />
/// <reference path="../items/item.ts" />
Expand All @@ -14,9 +14,9 @@ module BP3D.Model {
scale: 0
}

/**
/**
* A Wall is the basic element to create Rooms.
*
*
* Walls consists of two half edges.
*/
export class Wall {
Expand Down Expand Up @@ -60,7 +60,7 @@ module BP3D.Model {
/** Actions to be applied explicitly. */
private action_callbacks = $.Callbacks();

/**
/**
* Constructs a new wall.
* @param start Start corner.
* @param end End corner.
Expand Down
2 changes: 1 addition & 1 deletion src/three/controller.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../core/utils.ts" />

Expand Down
2 changes: 1 addition & 1 deletion src/three/controls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Contributors:
* @author erich666 / http://erichaines.com
*/

/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../../lib/three.d.ts" />

module BP3D.Three {
Expand Down
2 changes: 1 addition & 1 deletion src/three/edge.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../../lib/three.d.ts" />
/// <reference path="../core/utils.ts" />

Expand Down
4 changes: 2 additions & 2 deletions src/three/main.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference path="../../lib/jQuery.d.ts" />
/// <reference path="../../lib/jquery.d.ts" />
/// <reference path="../../lib/three.d.ts" />
/// <reference path="controller.ts" />
/// <reference path="floorPlan.ts" />
/// <reference path="floorplan.ts" />
/// <reference path="lights.ts" />
/// <reference path="skybox.ts" />
/// <reference path="controls.ts" />
Expand Down