Skip to content

Commit

Permalink
Merge pull request #71 from readyplayerme/feat/migrate-statics-under-cdn
Browse files Browse the repository at this point in the history
Feat/migrate statics under cdn
  • Loading branch information
blanxii authored May 2, 2024
2 parents bffa3c1 + 8270137 commit 2f02dc6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/components/Avatar/Avatar.component.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Suspense, FC, useMemo, CSSProperties, ReactNode, useEffect } from 'react';
import { Vector3 } from 'three';
import { ContactShadows } from "@react-three/drei";
import { ContactShadows } from '@react-three/drei';
import { CameraControls } from 'src/components/Scene/CameraControls.component';
import { Environment } from 'src/components/Scene/Environment.component';
import { BaseModelProps, EnvironmentProps, SpawnState, EffectConfiguration, LightingProps } from 'src/types';
Expand Down Expand Up @@ -260,7 +260,7 @@ const Avatar: FC<AvatarProps> = ({
/>
{AvatarModel}
{children}
{shadows && <ContactShadows position={[0, 0, 0]} opacity={2} scale={10} blur={1.0} far={1.0}/>}
{shadows && <ContactShadows position={[0, 0, 0]} opacity={2} scale={10} blur={1.0} far={1.0} />}
{background?.src && <Box {...background} />}
{capture && <Capture {...capture} />}
{background?.color && <BackgroundColor color={background.color} />}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Avatar/Examples.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ FloatingSparkles.args = {
speed: 0.25,
opacity: 0.6,
color: '#124cca',
position: [0, 3, 0],
position: [0, 3, 0]
};

FloatingSparkles.argTypes = {
Expand All @@ -100,7 +100,7 @@ FloatingSparkles.argTypes = {

export const SpawnEffectAndAnimation: StoryFn<typeof Avatar> = (args) => (
<Avatar {...args}>
<Sparkles color="white" count={50} opacity={0.9} scale={5} size={0.5} speed={0.35} position={[0, 3, 0]}/>
<Sparkles color="white" count={50} opacity={0.9} scale={5} size={0.5} speed={0.35} position={[0, 3, 0]} />
</Avatar>
);
SpawnEffectAndAnimation.args = {
Expand Down
10 changes: 5 additions & 5 deletions src/services/Environment.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ export const environmentPresets = {
export type EnvironmentPresets = keyof typeof environmentPresets;

export const getPresetEnvironmentMap = (preset: EnvironmentPresets) =>
`https://readyplayerme-assets.s3.amazonaws.com/environment/${preset}.hdr`;
`https://files.readyplayer.me/visage/environment/${preset}.hdr`;

export const environmentModels = {
spaceStation: 'https://readyplayerme-assets.s3.amazonaws.com/props/environment-space-station.glb',
platformDark: 'https://readyplayerme-assets.s3.amazonaws.com/props/simple-platform-dark.glb',
platformGreen: 'https://readyplayerme-assets.s3.amazonaws.com/props/simple-platform-green.glb',
platformBlue: 'https://readyplayerme-assets.s3.amazonaws.com/props/simple-platform-blue.glb'
spaceStation: 'https://files.readyplayer.me/visage/props/environment-space-station.glb',
platformDark: 'https://files.readyplayer.me/visage/props/simple-platform-dark.glb',
platformGreen: 'https://files.readyplayer.me/visage/props/simple-platform-green.glb',
platformBlue: 'https://files.readyplayer.me/visage/props/simple-platform-blue.glb'
};

export type EnvironmentModels = keyof typeof environmentModels;

0 comments on commit 2f02dc6

Please sign in to comment.