mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 00:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

broken

Browse source
This commit is contained in:
Peter Cottle 2012-08-13 21:30:39 -07:00
parent 5ee115872d
commit 97d6af16e0
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arbor_src/physics/physics.js
View file

@ -317,7 +317,6 @@
var topleft = null var topleft = null
$.each(active.particles, function(i, point) { $.each(active.particles, function(i, point) {
// move the node to its new position // move the node to its new position
if (that.integrator=='euler'){ if (that.integrator=='euler'){
point.p = point.p.add(point.v.multiply(timestep)); point.p = point.p.add(point.v.multiply(timestep));

3
arbor_src/physics/system.js
View file

@ -102,10 +102,9 @@
state.names[name] = node state.names[name] = node
state.nodes[node._id] = node; state.nodes[node._id] = node;
_changes.push({t:"addNode", id:node._id, m:node.mass, x:x, y:y, f:fixed}) _changes.push({t:"addNode", id:node._id, m:node.mass, x:x, y:y, f:fixed});
that._notify(); that._notify();
return node; return node;
} }
}, },

18
src/git.js
View file

@ -33,17 +33,23 @@ GitEngine.prototype.getClosuresForCommand = function(command) {
var Commit = Backbone.Model.extend({ var Commit = Backbone.Model.extend({
initialize: function() { initialize: function() {
// validation / defaults // validation / defaults
if (!this.get('name')) { if (!this.get('id')) {
this.set('name', _.uniqueId('C')); this.set('id', _.uniqueId('C'));
} }
if (!this.get('parent') && !this.get('rootCommit')) { if (!this.get('parentCommit') && !this.get('rootCommit')) {
throw new Error('needs parent commit'); throw new Error('needs parent commit');
} }
// make a node and start drawing? this is a major TODO
},
draw: function() { this.set('node', sys.addNode(this.get('id')));
if (this.get('rootCommit')) {
// TODO
// this.get('node').fixed = true;
// this.get('node').p = {x: 0, y: 0};
} else {
var parentNode = this.get('parentCommit').get('node');
sys.addEdge(parentNode, this.get('node'));
}
} }
}); });