Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 07:19:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1663 from PhilipRosedale/master

Browse source 
New drumstick sounds, markers at origin, rolling voxels make no sound
This commit is contained in:
AndrewMeadows 2014-01-23 14:05:03 -08:00
commit d556581842
6 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/drumStick.js
View file

@ -18,8 +18,8 @@ function vMinus(a, b) {
// First, load two percussion sounds to be used on the sticks // First, load two percussion sounds to be used on the sticks
var drum1 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/MusicalInstruments/drums/snare.raw"); var drum1 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomHi.raw");
var drum2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/MusicalInstruments/drums/snare.raw"); var drum2 = new Sound("https://s3-us-west-1.amazonaws.com/highfidelity-public/sounds/Drums/RackTomLo.raw");
// State Machine: // State Machine:
// 0 = not triggered // 0 = not triggered

6
examples/fountain.js
View file

@ -42,7 +42,7 @@ Voxels.setVoxel(position.x, 0, position.z, 0.5, 0, 0, 255);
var totalParticles = 0; var totalParticles = 0;
function makeFountain() { function makeFountain() {
if (Math.random() < 0.06) { if (Math.random() < 0.10) {
//print("Made particle!\n"); //print("Made particle!\n");
var properties = { var properties = {
position: position, position: position,
@ -51,9 +51,9 @@ function makeFountain() {
velocity: { x: (Math.random() * 1.0 - 0.5), velocity: { x: (Math.random() * 1.0 - 0.5),
y: (1.0 + (Math.random() * 2.0)), y: (1.0 + (Math.random() * 2.0)),
z: (Math.random() * 1.0 - 0.5) }, z: (Math.random() * 1.0 - 0.5) },
gravity: { x: 0, y: -0.5, z: 0 }, gravity: { x: 0, y: -0.1, z: 0 },
damping: 0.25, damping: 0.25,
lifetime: 2 lifetime: 1
} }
Particles.addParticle(properties); Particles.addParticle(properties);

2
examples/toyball.js
View file

@ -134,7 +134,9 @@ function checkControllerSide(whichSide) {
gravity: { x: 0, y: 0, z: 0}, gravity: { x: 0, y: 0, z: 0},
inHand: true, inHand: true,
radius: 0.05, radius: 0.05,
damping: 0.999,
color: { red: 255, green: 0, blue: 0 }, color: { red: 255, green: 0, blue: 0 },
lifetime: 10 // 10 seconds - same as default, not needed but here as an example lifetime: 10 // 10 seconds - same as default, not needed but here as an example
}; };

4
interface/src/Application.cpp
View file

@ -2866,10 +2866,10 @@ void Application::displaySide(Camera& whichCamera, bool selfAvatarOnly) {
if (!selfAvatarOnly) { if (!selfAvatarOnly) {
// draw a red sphere // draw a red sphere
float sphereRadius = 0.25f; float originSphereRadius = 0.05f;
glColor3f(1,0,0); glColor3f(1,0,0);
glPushMatrix(); glPushMatrix();
glutSolidSphere(sphereRadius, 15, 15); glutSolidSphere(originSphereRadius, 15, 15);
glPopMatrix(); glPopMatrix();
// disable specular lighting for ground and voxels // disable specular lighting for ground and voxels

20
interface/src/Util.cpp
View file

@ -332,27 +332,29 @@ void renderWorldBox() {
glVertex3f(TREE_SCALE, 0, TREE_SCALE); glVertex3f(TREE_SCALE, 0, TREE_SCALE);
glVertex3f(TREE_SCALE, 0, 0); glVertex3f(TREE_SCALE, 0, 0);
glEnd(); glEnd();
// Draw marker dots at very end // Draw meter markers along the 3 axis to help with measuring things
const float MARKER_DISTANCE = 1.f;
const float MARKER_RADIUS = 0.05f;
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
glPushMatrix(); glPushMatrix();
glTranslatef(TREE_SCALE, 0, 0); glTranslatef(MARKER_DISTANCE, 0, 0);
glColor3fv(red); glColor3fv(red);
glutSolidSphere(0.125, 10, 10); glutSolidSphere(MARKER_RADIUS, 10, 10);
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
glTranslatef(0, TREE_SCALE, 0); glTranslatef(0, MARKER_DISTANCE, 0);
glColor3fv(green); glColor3fv(green);
glutSolidSphere(0.125, 10, 10); glutSolidSphere(MARKER_RADIUS, 10, 10);
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
glTranslatef(0, 0, TREE_SCALE); glTranslatef(0, 0, MARKER_DISTANCE);
glColor3fv(blue); glColor3fv(blue);
glutSolidSphere(0.125, 10, 10); glutSolidSphere(MARKER_RADIUS, 10, 10);
glPopMatrix(); glPopMatrix();
glPushMatrix(); glPushMatrix();
glColor3fv(gray); glColor3fv(gray);
glTranslatef(TREE_SCALE, 0, TREE_SCALE); glTranslatef(MARKER_DISTANCE, 0, MARKER_DISTANCE);
glutSolidSphere(0.125, 10, 10); glutSolidSphere(MARKER_RADIUS, 10, 10);
glPopMatrix(); glPopMatrix();
} }

2
libraries/particles/src/ParticleCollisionSystem.cpp
View file

@ -276,7 +276,7 @@ void ParticleCollisionSystem::applyHardCollision(Particle* particle, float elast
void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm::vec3 &penetration, float frequency) { void ParticleCollisionSystem::updateCollisionSound(Particle* particle, const glm::vec3 &penetration, float frequency) {
// consider whether to have the collision make a sound // consider whether to have the collision make a sound
const float AUDIBLE_COLLISION_THRESHOLD = 0.1f; const float AUDIBLE_COLLISION_THRESHOLD = 0.3f;
const float COLLISION_LOUDNESS = 1.f; const float COLLISION_LOUDNESS = 1.f;
const float DURATION_SCALING = 0.004f; const float DURATION_SCALING = 0.004f;
const float NOISE_SCALING = 0.1f; const float NOISE_SCALING = 0.1f;