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.

Sign up for GitHub

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

Jump to bottom

SpriteCreator includes agent's size property #44

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SpriteCreator includes agent's size property #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f58598b
SpriteCreator includes agent's size property
Rocche Feb 12, 2021
be873dc
initSocket now takes web page's port as param
Rocche Feb 15, 2021
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
6 changes: 3 additions & 3 deletions repast.simphony.server/web/static/js/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ var runner = (function() {



function initSocket() {
function initSocket(port) {
//var socket = io.connect('http://localhost:5000');
socket = new WebSocket('ws://localhost:5000/simphony/simsocket');
socket = new WebSocket('ws://localhost:' + port + '/simphony/simsocket');

socket.onmessage = function(evt) {
if (evt.data instanceof Blob) {
Expand Down Expand Up @@ -331,7 +331,7 @@ $(document).ready(function () {
//$("#start").prop('disabled', true);
//$("#step").prop('disabled', true);

initSocket();
initSocket(location.port);

$("#init").on('click', () => {
runner.next = runner.initClicked;
Expand Down
16 changes: 12 additions & 4 deletions repast.simphony.server/web/static/js/display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,25 @@ function getElementPosition(element) {
}

class SpriteCreator {
constructor(texture_file, scale) {
//include the size property so that the display will respect agent's size, not the icon's one
constructor(texture_file, scale, size) {
this.promise = textureLoader.load('textures/' + texture_file).then(this.onLoad.bind(this)).catch( (err ) => {
console.log(err);
});
this.scale = scale;
this.size = size;
}

onLoad(texture) {
this.material = new THREE.SpriteMaterial({ map: texture });
this.img_width = texture.image.width;
this.img_height = texture.image.height;
//if size is not null, then consider it has sprite's width and height, otherwise consider the icon's ones
if(!this.size){
this.img_width = texture.image.width;
this.img_height = texture.image.height;
}
else{
this.img_width = this.img_height = this.size;
}
}

create() {
Expand Down Expand Up @@ -274,7 +282,7 @@ export class Display2D {
let lay = display_msg.layers[i];
let creator = null;
if (lay.icon != "") {
creator = new SpriteCreator(lay.icon, lay.scale);
creator = new SpriteCreator(lay.icon, lay.scale, lay.size); //include the size property
promises.push(creator.promise);
} else {
let shape_color = new THREE.Color(lay.color[0], lay.color[1], lay.color[2]);
Expand Down