Skip to content

Commit

Permalink
Merge pull request #6861 from BabylonJS/master
Browse files Browse the repository at this point in the history
Added RandomNumberBlock #6012
  • Loading branch information
deltakosh committed Sep 17, 2019
2 parents 126cd0f + a9962f3 commit 59f037c
Show file tree
Hide file tree
Showing 54 changed files with 813 additions and 224 deletions.
219 changes: 219 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,219 @@
name: continuous-integration

on: [push]

jobs:
build:
# Job name is Greeting
name: Check if What's New was updated
# This job runs on Linux
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Set up node
uses: actions/setup-node@v1
- uses: /Tools/Gulp
- run: npm install
- run: gulp tests-whatsnew --max-old-space-size=8192

# - job: WhatsNewUpdate
# displayName: '1. What s New Update'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp tests-whatsnew --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Whats new'
# env:
# AZURE_PULLREQUESTID: $(System.PullRequest.PullRequestId)
# BROWSER_STACK_USERNAME: $(babylon.browserStack.userName)

# - job: DocumentationCheck
# displayName: '2. Documentation Check'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp typedoc-check --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Typedoc check'

# - job: Linting
# displayName: '3. Linting'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp fullLint --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Full Lint'

# - job: Build
# displayName: '4. Build and Unit Tests'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp typescript-all --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Typescript all'
# - script: 'gulp tests-babylon-unit --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Unit Tests'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/UnitTests.xml'

# - job: TestsWebGL1
# displayName: '5. Validation Tests WebGL1'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp typescript-all --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Typescript all'
# - script: |
# export DISPLAY=:99
# Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
# sleep 3 # give xvfb some time to start
# gulp tests-validation-virtualscreenWebGL1 --max-old-space-size=8192
# workingDirectory: Tools/Gulp
# displayName: 'Visual Tests'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/ValidationTests1.xml'

# - job: TestsWebGL2
# displayName: '6. Validation Tests WebGL2'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp typescript-all --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Typescript all'
# - script: |
# export DISPLAY=:99
# Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
# sleep 3 # give xvfb some time to start
# gulp tests-validation-virtualscreen --max-old-space-size=8192
# workingDirectory: Tools/Gulp
# displayName: 'Visual Tests'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/ValidationTests2.xml'
# # - script: 'gulp tests-validation-browserstack'
# # workingDirectory: Tools/Gulp
# # displayName: 'Browser Stack Tests'
# # env:
# # TRAVIS_BUILD_NUMBER: $(Build.BuildNumber)
# # BROWSER_STACK_USERNAME: $(babylon.browserStack.userName)
# # BROWSER_STACK_ACCESS_KEY: $(babylon.browserStack.userToken)

# - job: ModuleTests
# displayName: '7. Module Tests'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp typescript-all --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Typescript all'
# - script: 'gulp tests-modules'
# workingDirectory: Tools/Gulp
# displayName: 'Tests modules'
# - script: 'sudo gulp localdev-es6 --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Npm link ES6'
# - script: 'gulp tests-es6Modules --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Tests ES6'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/ModuleTestsVanilla.xml'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/ModuleTestsWebpack.xml'

# - job: ViewerTests
# displayName: '8. Viewer Tests'
# pool:
# vmImage: 'Ubuntu-16.04'
# demands: npm
# steps:
# - task: Npm@1
# displayName: 'npm install'
# inputs:
# workingDir: Tools/Gulp
# verbose: false
# - script: 'gulp typescript-all --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Typescript all'
# - script: 'gulp tests-viewer-unit --max-old-space-size=8192'
# workingDirectory: Tools/Gulp
# displayName: 'Unit Tests'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/ViewerUnitTests.xml'
# - script: |
# export DISPLAY=:99
# Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
# sleep 3 # give xvfb some time to start
# gulp tests-viewer-validation-virtualscreen --max-old-space-size=8192
# workingDirectory: Tools/Gulp
# displayName: 'Visual Tests'
# - task: PublishTestResults@2
# condition: succeededOrFailed()
# inputs:
# testRunner: JUnit
# testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'
26 changes: 26 additions & 0 deletions Playground/babylon.d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53833,6 +53833,32 @@ declare module BABYLON {
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Block used to get a random number
*/
export class RandomNumberBlock extends NodeMaterialBlock {
/**
* Creates a new RandomNumberBlock
* @param name defines the block name
*/
constructor(name: string);
/**
* Gets the current class name
* @returns the class name
*/
getClassName(): string;
/**
* Gets the seed input component
*/
readonly seed: NodeMaterialConnectionPoint;
/**
* Gets the output component
*/
readonly output: NodeMaterialConnectionPoint;
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Effect Render Options
Expand Down
26 changes: 26 additions & 0 deletions dist/preview release/babylon.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54668,6 +54668,32 @@ declare module BABYLON {
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Block used to get a random number
*/
export class RandomNumberBlock extends NodeMaterialBlock {
/**
* Creates a new RandomNumberBlock
* @param name defines the block name
*/
constructor(name: string);
/**
* Gets the current class name
* @returns the class name
*/
getClassName(): string;
/**
* Gets the seed input component
*/
readonly seed: NodeMaterialConnectionPoint;
/**
* Gets the output component
*/
readonly output: NodeMaterialConnectionPoint;
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Effect Render Options
Expand Down
2 changes: 1 addition & 1 deletion dist/preview release/babylon.js

Large diffs are not rendered by default.

196 changes: 146 additions & 50 deletions dist/preview release/babylon.max.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/preview release/babylon.max.js.map

Large diffs are not rendered by default.

57 changes: 57 additions & 0 deletions dist/preview release/babylon.module.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57352,6 +57352,36 @@ declare module "babylonjs/Materials/Node/Blocks/powBlock" {
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module "babylonjs/Materials/Node/Blocks/randomNumberBlock" {
import { NodeMaterialBlock } from "babylonjs/Materials/Node/nodeMaterialBlock";
import { NodeMaterialBuildState } from "babylonjs/Materials/Node/nodeMaterialBuildState";
import { NodeMaterialConnectionPoint } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPoint";
import "babylonjs/Shaders/ShadersInclude/helperFunctions";
/**
* Block used to get a random number
*/
export class RandomNumberBlock extends NodeMaterialBlock {
/**
* Creates a new RandomNumberBlock
* @param name defines the block name
*/
constructor(name: string);
/**
* Gets the current class name
* @returns the class name
*/
getClassName(): string;
/**
* Gets the seed input component
*/
readonly seed: NodeMaterialConnectionPoint;
/**
* Gets the output component
*/
readonly output: NodeMaterialConnectionPoint;
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module "babylonjs/Materials/Node/Blocks/index" {
export * from "babylonjs/Materials/Node/Blocks/Vertex/index";
export * from "babylonjs/Materials/Node/Blocks/Fragment/index";
Expand Down Expand Up @@ -57384,6 +57414,7 @@ declare module "babylonjs/Materials/Node/Blocks/index" {
export * from "babylonjs/Materials/Node/Blocks/lengthBlock";
export * from "babylonjs/Materials/Node/Blocks/negateBlock";
export * from "babylonjs/Materials/Node/Blocks/powBlock";
export * from "babylonjs/Materials/Node/Blocks/randomNumberBlock";
}
declare module "babylonjs/Materials/Node/Optimizers/index" {
export * from "babylonjs/Materials/Node/Optimizers/nodeMaterialOptimizer";
Expand Down Expand Up @@ -120529,6 +120560,32 @@ declare module BABYLON {
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Block used to get a random number
*/
export class RandomNumberBlock extends NodeMaterialBlock {
/**
* Creates a new RandomNumberBlock
* @param name defines the block name
*/
constructor(name: string);
/**
* Gets the current class name
* @returns the class name
*/
getClassName(): string;
/**
* Gets the seed input component
*/
readonly seed: NodeMaterialConnectionPoint;
/**
* Gets the output component
*/
readonly output: NodeMaterialConnectionPoint;
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Effect Render Options
Expand Down
26 changes: 26 additions & 0 deletions dist/preview release/documentation.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54668,6 +54668,32 @@ declare module BABYLON {
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Block used to get a random number
*/
export class RandomNumberBlock extends NodeMaterialBlock {
/**
* Creates a new RandomNumberBlock
* @param name defines the block name
*/
constructor(name: string);
/**
* Gets the current class name
* @returns the class name
*/
getClassName(): string;
/**
* Gets the seed input component
*/
readonly seed: NodeMaterialConnectionPoint;
/**
* Gets the output component
*/
readonly output: NodeMaterialConnectionPoint;
protected _buildBlock(state: NodeMaterialBuildState): this;
}
}
declare module BABYLON {
/**
* Effect Render Options
Expand Down
Loading

0 comments on commit 59f037c

Please sign in to comment.