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

Developing a new NFT utiltity lib #18

Merged
merged 22 commits into from
Apr 7, 2020
Merged

Developing a new NFT utiltity lib #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d940fb2
improved nftLoader and nftLoader_light
kalwalt Apr 5, 2020
7c955e7
cleaning the code
kalwalt Apr 5, 2020
e9a2356
container div canvas and video html elements created by the app
kalwalt Apr 5, 2020
944046a
createContainer and createStats functions
kalwalt Apr 5, 2020
3274fda
adding some attributes to the video element
kalwalt Apr 5, 2020
72f5523
markerUrl setting
kalwalt Apr 5, 2020
b8f52cf
if false can not remove nothing
kalwalt Apr 5, 2020
4312d4d
containerObj to fix not passing canvas, video...
kalwalt Apr 5, 2020
fdf7fd3
loadModel works now
kalwalt Apr 5, 2020
da9bd19
basic jsonParser with a Promise
kalwalt Apr 5, 2020
0847a3a
config.json data fill all the fields, except artoolkitUrl...
kalwalt Apr 6, 2020
b7dd550
camera parameters url in the config.json
kalwalt Apr 6, 2020
70ccbec
fixed artoolkitUrl for the importScript
kalwalt Apr 6, 2020
07372bf
creating a new worker for nft, and restoring the old one
kalwalt Apr 6, 2020
1243192
createLoading() function
kalwalt Apr 6, 2020
d235172
laoding data inside the config.json file
kalwalt Apr 6, 2020
3e851e4
minified version of nftLoader
kalwalt Apr 6, 2020
0fa1572
using grunt-contrib-uglify-es solved the issue with ES6 syntax
kalwalt Apr 6, 2020
64284da
fix for travis issue
kalwalt Apr 7, 2020
0d43573
using grunt-terser instead of grunt-contrib-uglify-es as minifier
kalwalt Apr 7, 2020
afc6ce4
video examples refactoring
kalwalt Apr 7, 2020
7dedcc3
renaming video-style.css to nft-style.css
kalwalt Apr 7, 2020
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ _site
.bundle
vendor
Gemfile.lock
node_modules
20 changes: 20 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*global module,require */
module.exports = function(grunt) {
"use strict";

var pkg = grunt.file.readJSON("package.json");

grunt.initConfig({
pkg: pkg,

uglify: {
options: {},
dist: {
src: "resources/js/nftLoader/nftLoader.js",
dest: "resources/build/nftLoader/nftLoader.min.js"
}
}
});

grunt.loadNpmTasks("grunt-contrib-uglify");
};
2 changes: 1 addition & 1 deletion nft/nft_pinball_image.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</a>
<script src="../resources/three.min.js"></script>
<script src="../resources/js/libs/stats.min.js"></script>
<script src="nftLoader.js"></script>
<script src="../resources/build/nftLoader/nftLoader.min.js"></script>
<script>

var nftLoader = new NFTLoader(640, 480, 'config.json');
Expand Down
Loading