Skip to content

Commit

Permalink
Merge pull request #9 from oparamo/fix-floors
Browse files Browse the repository at this point in the history
Fix floor texture rendering.
  • Loading branch information
omgitsraven authored Mar 24, 2023
2 parents f9f1f90 + fa1c2ba commit 9980367
Show file tree
Hide file tree
Showing 9 changed files with 206 additions and 824 deletions.
62 changes: 61 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,61 @@
node_modules
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

.husky
.DS_Store
819 changes: 41 additions & 778 deletions dist/aframe-room-component.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/aframe-room-component.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/aframe-room-component.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>A-Frame Room Component - Basic</title>
<meta name="description" content="Basic example for Room component."></meta>
<script src="https://aframe.io/releases/1.3.0/aframe.js"></script>
<script src="../../dist/aframe-room-component.min.js"></script>
<script src="../../dist/aframe-room-component.js"></script>
</head>
<body>
<a-scene>
Expand Down
15 changes: 8 additions & 7 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ AFRAME.registerSystem('building',{
https://github.com/omgitsraven/aframe-room-component
v0.4.1
v0.4.2
Expand Down Expand Up @@ -56,13 +56,14 @@ AFRAME.registerSystem('building',{


function flipGeom(geom){
var indexCopy = geom.index;
for(var curFaceIndex=0; curFaceIndex<indexCopy.count/3; curFaceIndex++){
var bucket = indexCopy[curFaceIndex*3+2];
indexCopy[curFaceIndex*3+2] = indexCopy[curFaceIndex*3+1];
indexCopy[curFaceIndex*3+1] = bucket;
const indices = geom.getIndex().array;
for (let i = 0; i < indices.length; i += 3) {
const tempIndex = indices[i + 2];
indices[i + 2] = indices[i + 1];
indices[i + 1] = tempIndex;
}
geom.setIndex(indexCopy);

geom.getIndex().needsUpdate = true;
}

function makeUvsForGeom(geom,callback){
Expand Down
58 changes: 22 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
{
"name": "aframe-room-component",
"version": "0.4.1",
"version": "0.4.2",
"description": "An A-Frame component for quickly creating rooms connected by doors.",
"main": "index.js",
"cdn": "dist/aframe-room-component.min.js",
"main": "./index.js",
"cdn": "./dist/aframe-room-component.min.js",
"scripts": {
"dev": "budo index.js:dist/aframe-room-component.min.js --port 7000 --live --open",
"dist": "webpack index.js dist/aframe-room-component.js && webpack -p index.js dist/aframe-room-component.min.js",
"dist:dev": "webpack --config webpack.config.js",
"dist:prd": "webpack --config webpack.prod.config.js",
"dist": "npm run dist:prd && npm run dist:dev",
"ghpages": "ghpages",
"lint": "semistandard -v | snazzy",
"prepublish": "npm run dist",
"ghpages": "ghpages",
"start": "npm run dev",
"test": "karma start ./tests/karma.conf.js",
"test:firefox": "karma start ./tests/karma.conf.js --browsers Firefox",
"test:chrome": "karma start ./tests/karma.conf.js --browsers Chrome"
"start:https": "webpack serve --progress --open --server-type https",
"start": "webpack serve --progress --open"
},
"repository": {
"type": "git",
Expand All @@ -35,32 +34,19 @@
},
"homepage": "https://github.com/omgitsraven/aframe-room-component#readme",
"devDependencies": {
"aframe": "^1.3.0",
"babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.24.1",
"browserify": "^13.0.0",
"budo": "^8.2.2",
"chai": "^3.4.1",
"chai-shallow-deep-equal": "^1.3.0",
"ghpages": "^0.0.8",
"karma": "^0.13.15",
"karma-browserify": "^4.4.2",
"karma-chai-shallow-deep-equal": "0.0.4",
"karma-chrome-launcher": "2.0.0",
"karma-env-preprocessor": "^0.1.1",
"karma-firefox-launcher": "^0.1.7",
"karma-mocha": "^0.2.1",
"karma-mocha-reporter": "^1.1.3",
"karma-sinon-chai": "^1.1.0",
"mocha": "^2.3.4",
"randomcolor": "^0.4.4",
"semistandard": "^8.0.0",
"shelljs": "^0.7.0",
"shx": "^0.1.1",
"sinon": "^1.17.7",
"sinon-chai": "^2.8.0",
"snazzy": "^4.0.0",
"webpack": "^1.15.0"
"@babel/core": "7.21.3",
"@babel/preset-env": "7.20.2",
"babel-loader": "9.1.2",
"ghpages": "0.0.10",
"semistandard": "16.0.1",
"snazzy": "9.0.0",
"terser-webpack-plugin": "5.3.7",
"webpack-cli": "5.0.1",
"webpack-dev-server": "4.13.1",
"webpack": "5.76.3"
},
"peerDependencies": {
"aframe": ">=1.2.0"
},
"semistandard": {
"globals": [
Expand Down
26 changes: 26 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
'use strict';

const Path = require('path');

module.exports = [
{
entry: './index.js',
output: {
filename: 'aframe-room-component.js',
library: { type: 'umd' },
path: Path.resolve(__dirname, 'dist'),
publicPath: '/dist/'
},
mode: 'development',
devtool: 'eval-source-map',
stats: { colors: true },
devServer: {
port: process.env.PORT || 8000,
hot: false,
liveReload: true,
static: {
directory: Path.resolve(__dirname)
}
}
}
];
44 changes: 44 additions & 0 deletions webpack.prod.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
'use strict';

const Path = require('path');

const TerserPlugin = require('terser-webpack-plugin');

module.exports = [
{
entry: './index.js',
output: {
filename: 'aframe-room-component.min.js',
library: { type: 'umd' },
path: Path.resolve(__dirname, 'dist')
},
mode: 'production',
devtool: 'source-map',
stats: { colors: true },
module: {
rules: [
{
test: /\.js$/,
use: {
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env']
}
}
}
]
},
optimization: {
minimize: true,
minimizer: [
new TerserPlugin({
terserOptions: {
compress: { passes: 2 },
format: { comments: false }
},
extractComments: false
})
]
}
}
];

0 comments on commit 9980367

Please sign in to comment.