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

Develop murat #386

Open
wants to merge 9 commits 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.DS_Store
node_modules
test/assets/benchmark.json
npm-debug.log
.vscode
.v8flags*
travis.log
bower_components
yarn-error.log
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6.10.3
22 changes: 20 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
language: node_js
node_js:
- "0.11"
- "0.10"
- 8.15.0
branches:
only:
- master
- develop-murat
jobs:
include:
- script: npm run-script build
- script: npm test
- stage: deploy
deploy:
script: skip
provider: heroku
api_key:
secure: G1VyTkoWdczm5T0E5gVqOTg6VD5oe1LRtFXmHHsZOI4Acj8VeeCtiMtzXc0GDioBB3pYFmLMNDlZeTds2RAvQqS9J9DxMVpdrWjQasyo22ZCQWoVsp2SMNF8eKq2OLs6x5IJwFq4T/Xo4UBF8s1jb/Pwqj614MD17EYMGodkTnnG2CU3MNuoIIzWgrMS9GlF4RCs7nBQRE1Wz3bnSQRHEmn2bY6T4H7VoA1nZ8ebzmiAgVfUg7pHsLiGpYSe8q6nqfzvFdIsy6cnL1s/BGKonZPf8ihQQCjhmijZLei6FbxOx1iwbN6AOoa64gDMfRYJ81MIX/zBLJF7YtQ8iCPxlzarj3KKVpmzsm0QHo8Tiw+X74P8IRxCkflHQ7ma9wcS0TcZVaAd77pKsxxgWvABd5Y4EoByyZFiM35r2+eGIF+eyQYTakjdlu+xyTxs93JEL+fTpOp275qnKnGHg3jilLQdESwJ7HKogyx3cxyD0eUts4popVV0PLgMNTrAxJ4TyYZHRjlIijXqHpoozMGtki1A24SmNLaAdDB+zhHV4+WgZDkc021ghfHrAJnSHWT+V/ETpDKgehbOJuJLZxl3yTZbCzZv8Z+8TcvRlaN3pi254QiTtrrWfiIABfH42NS8W1snTQ/ssQ31Or0In5M0ImBBL7Tb6kNpsP2/X6eValc=
app:
develop-murat: trackingjs
master: trackingjs-master


24 changes: 21 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# tracking.js

[![Build Status](http://img.shields.io/travis/eduardolundgren/tracking.js.svg?style=flat)](https://travis-ci.org/eduardolundgren/tracking.js)
[![DevDependencies Status](http://img.shields.io/david/dev/eduardolundgren/tracking.js.svg?style=flat)](https://david-dm.org/eduardolundgren/tracking.js#info=devDependencies)
[![Build Status](http://img.shields.io/travis/murat-aka/tracking.js.svg?style=flat)](https://travis-ci.org/murat-aka/tracking.js)
[![DevDependencies Status](http://img.shields.io/david/dev/murat-aka/tracking.js.svg?style=flat)](https://david-dm.org/murat-aka/tracking.js#info=devDependencies)

The tracking.js library brings different computer vision algorithms and techniques into the browser environment. By using modern HTML5 specifications, we enable you to do real-time color tracking, face detection and much more — all that with a lightweight core (~7 KB) and intuitive interface.

Expand All @@ -11,7 +11,7 @@ The tracking.js library brings different computer vision algorithms and techniqu

## Install

Install via [Bower](http://bower.io/), [npm](https://www.npmjs.com/), or [download as a zip](https://github.com/eduardolundgren/tracking.js/archive/master.zip):
Install via [Bower](http://bower.io/), [npm](https://www.npmjs.com/), or [download as a zip](https://github.com/murat-aka/tracking.js/archive/master.zip):

```
bower install tracking
Expand All @@ -23,6 +23,24 @@ npm install tracking

## Examples

[01 - Face Tracker](http://eduardolundgren.github.io/tracking.js/examples/face_hello_world.html)

[02 - Color Tracker](http://eduardolundgren.github.io/tracking.js/examples/color_hello_world.html)

[03 - Feature Matching](http://eduardolundgren.github.io/tracking.js/examples/brief.html)

[04 - Draw Something](http://eduardolundgren.github.io/tracking.js/examples/color_draw_something.html)

[05 - Face Camera](http://eduardolundgren.github.io/tracking.js/examples/face_camera.html)

[06 - Fast](http://eduardolundgren.github.io/tracking.js/examples/fast.html)

[07 - Face Fish Tank](http://eduardolundgren.github.io/tracking.js/examples/face_fish_tank.html)

[08 - Color_Video](http://eduardolundgren.github.io/tracking.js/examples/color_video.html)

## Examples

[![Demo 1](https://cloud.githubusercontent.com/assets/398893/3709347/ec72876c-1453-11e4-8450-149d06d487f2.jpg)](http://trackingjs.com/examples/face_tag_friends.html)
[![Demo 2](https://cloud.githubusercontent.com/assets/398893/3709357/1a1c2e16-1454-11e4-804d-e6ada6c65997.jpg)](http://trackingjs.com/examples/face_fish_tank.html)
[![Demo 3](https://cloud.githubusercontent.com/assets/398893/3709361/38f86e8a-1454-11e4-811d-52bd21b37e85.jpg)](http://trackingjs.com/examples/color_hexgl.html)
Expand Down
6 changes: 5 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
"license": "BSD",
"ignore": [
"**/.*",
"node_modules"
"node_modules",
"bower_components",
"../",
"test",
"tests"
],
"dependencies": {
"dat-gui": "0.5.0",
Expand Down
2 changes: 1 addition & 1 deletion build/tracking-min.js

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions build/tracking.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@
var width;
var height;


// FIXME here the video display size of the analysed size
var resizeCanvas_ = function() {
width = element.offsetWidth;
height = element.offsetHeight;
Expand All @@ -245,6 +247,11 @@
resizeCanvas_();
element.addEventListener('resize', resizeCanvas_);


// FIXME: do a process function - it is up to the caller to handle the frequency of detection
// it seems all handled in the tracking.TrackerTask..
// so in short, remove the tracking.TrackerTask from here
// if the user want to use it, it can create it himself
var requestId;
var requestAnimationFrame_ = function() {
requestId = window.requestAnimationFrame(function() {
Expand Down Expand Up @@ -2939,7 +2946,7 @@
tracking.LBF.maxNumStages
);
}

// NOTE: is this thesholding suitable ? if it is on image, why no skin-color filter ? and a adaptative threshold
pixels = tracking.Image.grayscale(pixels, width, height, false);

pixels = tracking.Image.equalizeHist(pixels, width, height);
Expand Down Expand Up @@ -3108,4 +3115,4 @@
this.leafnodes = data.id_leafnodes;
}

}());
}());
18 changes: 18 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: '3.1'

services:

nodejs:
image: node:8.15.0
#restart: always
ports:
- 8088:80
- 3001:3001
- 3000:3000
- 5000:5000
tty: true

volumes:
- ./:/var/www/html
working_dir: /var/www/html
command: npm start
24 changes: 23 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var gulp = require('gulp');
var concat = require('gulp-concat');
var header = require('gulp-header');
var jsdoc = require('gulp-jsdoc');
var jsdoc = require('gulp-jsdoc3');
var jshint = require('gulp-jshint');
var nodeunit = require('gulp-nodeunit');
var pkg = require('./package.json');
Expand All @@ -12,6 +12,7 @@ var stylish = require('jshint-stylish');
var uglify = require('gulp-uglify');
var esformatter = require('gulp-esformatter');
var runSequence = require('run-sequence');
var browserSync = require('browser-sync').create();

gulp.task('all', ['clean'], function() {
return runSequence(['build', 'build-data']);
Expand Down Expand Up @@ -99,6 +100,27 @@ gulp.task('watch', function() {
gulp.watch('src/data/*.js', ['build-data']);
});

// Static Server
gulp.task('serve', function() {

browserSync.init({
watch: true,
server: {
baseDir: "./",
routes: {
"/": "examples"
}
},
directory: true,
open: false,
port: process.env.PORT || 5000

});

gulp.watch('src/**/*.js', ['build']);

});

// Private helpers
// ===============

Expand Down
3 changes: 3 additions & 0 deletions input.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
! TRAVIS input file
! Created with TRAVIS version compiled at Jan 14 2018 01:39:14
! Input file written at Sat Aug 10 17:23:17 2019.
44 changes: 28 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"trackingjs",
"webrtc"
],
"engines": {
"node": "8.15.0",
"npm": "6.10.3",
"yarn": ">= 1.0.0"
},
"author": {
"name": "Eduardo Lundgren",
"email": "[email protected]",
Expand All @@ -21,25 +26,32 @@
},
"scripts": {
"test": "gulp test",
"build": "gulp build"
"build": "gulp build",
"start": "gulp serve",
"postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components/dat-gui'), '../dat-gui', 'junction'); require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components/threejs'), '../threejs', 'junction') } catch (e) { }\""
},
"license": "BSD",
"devDependencies": {
"gulp": "^3.9.0",
"gulp-concat": "^2.6.0",
"gulp-esformatter": "^5.0.0",
"gulp-header": "^1.7.1",
"gulp-jsdoc": "^0.1.5",
"gulp-jshint": "^2.0.0",
"gulp-nodeunit": "0.0.5",
"gulp-rename": "^1.2.2",
"gulp-rimraf": "^0.2.0",
"gulp-uglify": "^1.5.1",
"jshint": "^2.8.0",
"jshint-stylish": "^2.1.0",
"nodeunit": "^0.9.1",
"dat.gui": "^0.7.6",
"gulp-concat": "^2.6.1",
"gulp-esformatter": "^8.0.0",
"gulp-header": "^2.0.9",
"gulp-jsdoc3": "^2.0.0",
"gulp-jshint": "^2.1.0",
"gulp-nodeunit": "0.1.0",
"gulp-rename": "^1.4.0",
"gulp-rimraf": "^1.0.0",
"gulp-uglify": "^3.0.2",
"jshint": "^2.10.2",
"jshint-stylish": "^2.2.1",
"nodeunit": "^0.11.3",
"png-js": "^0.1.1",
"run-sequence": "^1.1.5",
"dat.gui": "^0.6.1"
"run-sequence": "^2.2.1"
},
"dependencies": {
"browser-sync": "^2.26.7",
"gulp": "^3.9.1",
"@bower_components/dat-gui": "dataarts/dat.gui#0.5.0",
"@bower_components/threejs": "mrdoob/three.js#r67"
}
}
Loading