Skip to content

Commit

Permalink
renamed all 3d models according to naming convention and updated refe…
Browse files Browse the repository at this point in the history
…rences
  • Loading branch information
splican committed Jan 14, 2025
1 parent 108fd6c commit fc1eae3
Show file tree
Hide file tree
Showing 76 changed files with 69 additions and 69 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@ const LearningElementModelLookup: {
} = {
//suburbTheme
[LearningElementModelTypeEnums.H5pElementModelTypes
.Blackboard]: require("../../../../Assets/3dModels/suburbTheme/l_h5p_blackboard_1.glb"),
.Blackboard]: require("../../../../Assets/3dModels/suburbTheme/l-h5p-blackboard-1.glb"),
[LearningElementModelTypeEnums.H5pElementModelTypes
.DeskPC1]: require("../../../../Assets/3dModels/suburbTheme/l_h5p_deskpc_1.glb"),
.DeskPC1]: require("../../../../Assets/3dModels/suburbTheme/l-h5p-deskpc-1.glb"),
[LearningElementModelTypeEnums.H5pElementModelTypes
.DrawingTable]: require("../../../../Assets/3dModels/suburbTheme/l_h5p_drawingtable_1.glb"),
.DrawingTable]: require("../../../../Assets/3dModels/suburbTheme/l-h5p-drawingtable-1.glb"),
[LearningElementModelTypeEnums.H5pElementModelTypes
.SlotMachine]: require("../../../../Assets/3dModels/suburbTheme/l_h5p_slotmachine_1.glb"),
.SlotMachine]: require("../../../../Assets/3dModels/suburbTheme/l-h5p-slotmachine-1.glb"),
[LearningElementModelTypeEnums.TextElementModelTypes
.Bookshelf1]: require("../../../../Assets/3dModels/suburbTheme/l_text_bookshelf_1.glb"),
.Bookshelf1]: require("../../../../Assets/3dModels/suburbTheme/l-text-bookshelf-1.glb"),
[LearningElementModelTypeEnums.TextElementModelTypes
.Bookshelf2]: require("../../../../Assets/3dModels/suburbTheme/l_text_bookshelf_2.glb"),
.Bookshelf2]: require("../../../../Assets/3dModels/suburbTheme/l-text-bookshelf-2.glb"),
[LearningElementModelTypeEnums.ImageElementModelTypes
.Painting1]: require("../../../../Assets/3dModels/suburbTheme/l_image_painting_1.glb"),
.Painting1]: require("../../../../Assets/3dModels/suburbTheme/l-image-painting-1.glb"),
[LearningElementModelTypeEnums.ImageElementModelTypes
.Painting2]: require("../../../../Assets/3dModels/suburbTheme/l_image_painting_2.glb"),
.Painting2]: require("../../../../Assets/3dModels/suburbTheme/l-image-painting-2.glb"),
[LearningElementModelTypeEnums.ImageElementModelTypes
.PaintingEasel]: require("../../../../Assets/3dModels/suburbTheme/l_image_paintingeasel_1.glb"),
.PaintingEasel]: require("../../../../Assets/3dModels/suburbTheme/l-image-paintingeasel-1.glb"),
[LearningElementModelTypeEnums.VideoElementModelTypes
.Television]: require("../../../../Assets/3dModels/suburbTheme/l_video_television_1.glb"),
.Television]: require("../../../../Assets/3dModels/suburbTheme/l-video-television-1.glb"),
[LearningElementModelTypeEnums.QuizElementModelTypes
.DefaultNPC]: require("../../../../Assets/3dModels/suburbTheme/a_npc_defaultnpc.glb"),
.DefaultNPC]: require("../../../../Assets/3dModels/suburbTheme/a-npc-defaultnpc.glb"),

//ArcadeTheme
[LearningElementModelTypeEnums.H5pElementModelTypes
Expand Down Expand Up @@ -61,25 +61,25 @@ const LearningElementModelLookup: {

//CampusTheme
[LearningElementModelTypeEnums.H5pElementModelTypes
.Blackboard2]: require("../../../../Assets/3dModels/campusTheme/l_h5p_blackboard_2.glb"),
.Blackboard2]: require("../../../../Assets/3dModels/campusTheme/l-h5p-blackboard-2.glb"),
[LearningElementModelTypeEnums.H5pElementModelTypes
.DeskPC3]: require("../../../../Assets/3dModels/campusTheme/l_h5p_deskpc_3.glb"),
.DeskPC3]: require("../../../../Assets/3dModels/campusTheme/l-h5p-deskpc-3.glb"),
[LearningElementModelTypeEnums.H5pElementModelTypes
.DrawingTable2]: require("../../../../Assets/3dModels/campusTheme/l_h5p_drawingtable_2.glb"),
.DrawingTable2]: require("../../../../Assets/3dModels/campusTheme/l-h5p-drawingtable-2.glb"),
[LearningElementModelTypeEnums.H5pElementModelTypes
.DaylightProjector]: require("../../../../Assets/3dModels/campusTheme/l_h5p_daylightprojector_1.glb"),
.DaylightProjector]: require("../../../../Assets/3dModels/campusTheme/l-h5p-daylightprojector-1.glb"),
[LearningElementModelTypeEnums.TextElementModelTypes
.LibraryShelf]: require("../../../../Assets/3dModels/campusTheme/l_text_libraryshelf_1.glb"),
.LibraryShelf]: require("../../../../Assets/3dModels/campusTheme/l-text-libraryshelf-1.glb"),
[LearningElementModelTypeEnums.ImageElementModelTypes
.ScienceGeo1]: require("../../../../Assets/3dModels/campusTheme/l_image_sciencegeo_1.glb"),
.ScienceGeo1]: require("../../../../Assets/3dModels/campusTheme/l-image-sciencegeo-1.glb"),
[LearningElementModelTypeEnums.ImageElementModelTypes
.ScienceBio1]: require("../../../../Assets/3dModels/campusTheme/l_image_sciencebio_1.glb"),
.ScienceBio1]: require("../../../../Assets/3dModels/campusTheme/l-image-sciencebio-1.glb"),
[LearningElementModelTypeEnums.ImageElementModelTypes
.ScienceWhiteboard]: require("../../../../Assets/3dModels/campusTheme/l_image_sciencewhiteboard_1.glb"),
.ScienceWhiteboard]: require("../../../../Assets/3dModels/campusTheme/l-image-sciencewhiteboard-1.glb"),
[LearningElementModelTypeEnums.VideoElementModelTypes
.MovieProjector]: require("../../../../Assets/3dModels/campusTheme/l_video_movieprojector_1.glb"),
.MovieProjector]: require("../../../../Assets/3dModels/campusTheme/l-video-movieprojector-1.glb"),
[LearningElementModelTypeEnums.QuizElementModelTypes
.CampusNPC]: require("../../../../Assets/3dModels/campusTheme/a_npc_dozentlukas.glb"),
.CampusNPC]: require("../../../../Assets/3dModels/campusTheme/a-npc-dozentlukas.glb"),

//sharedModels
[LearningElementModelTypeEnums.QuizElementModelTypes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ export const LearningSpaceTheme_CampusAB: ILearningSpaceTheme = {
[LearningElementTypes.notAnElement]: [],
},
standinDecorationModels: [
require("../../../../Assets/3dModels/campusTheme/d_dcomp_schooldesk_1.glb"),
require("../../../../Assets/3dModels/campusTheme/d_dcomp_watertower_1.glb"),
require("../../../../Assets/3dModels/campusTheme/d_dcomp_vendingmachine_1.glb"),
require("../../../../Assets/3dModels/campusTheme/d-dcomp-schooldesk-1.glb"),
require("../../../../Assets/3dModels/campusTheme/d-dcomp-watertower-1.glb"),
require("../../../../Assets/3dModels/campusTheme/d-dcomp-vendingmachine-1.glb"),
],
entryDoorModel: require("../../../../Assets/3dModels/campusTheme/3DModel_Door.glb"),
exitDoorModel: require("../../../../Assets/3dModels/campusTheme/3DModel_ExitDoor.glb"),
windowModel: require("../../../../Assets/3dModels/campusTheme/3DModel_Window.glb"),
ambienceModel: require("../../../../Assets/3dModels/campusTheme/env_campus_ab.glb"),
entryDoorModel: require("../../../../Assets/3dModels/campusTheme/d-door-campus-entry.glb"),
exitDoorModel: require("../../../../Assets/3dModels/campusTheme/d-door-campus-exit.glb"),
windowModel: require("../../../../Assets/3dModels/campusTheme/d-door-campus-window.glb"),
ambienceModel: require("../../../../Assets/3dModels/campusTheme/env-campus-ab.glb"),
storyElementModel:
LearningElementModelTypeEnums.QuizElementModelTypes.DefaultNPC,
insideDecorationModels: {
[LearningSpaceTemplateType.L]: require("../../../../Assets/3dModels/campusTheme/d_roomcomp_L_campus_In.glb"),
[LearningSpaceTemplateType.R6]: require("../../../../Assets/3dModels/campusTheme/d_roomcomp_R6_campus_In.glb"),
[LearningSpaceTemplateType.R8]: require("../../../../Assets/3dModels/campusTheme/d_roomcomp_R8_campus_In.glb"),
[LearningSpaceTemplateType.D]: require("../../../../Assets/3dModels/campusTheme/d_roomcomp_D_campus_In.glb"),
[LearningSpaceTemplateType.T]: require("../../../../Assets/3dModels/campusTheme/d_roomcomp_T_campus_In.glb"),
[LearningSpaceTemplateType.L]: require("../../../../Assets/3dModels/campusTheme/d-roomcomp-l-campus-in.glb"),
[LearningSpaceTemplateType.R6]: require("../../../../Assets/3dModels/campusTheme/d-roomcomp-r6-campus-in.glb"),
[LearningSpaceTemplateType.R8]: require("../../../../Assets/3dModels/campusTheme/d-roomcomp-r8-campus-in.glb"),
[LearningSpaceTemplateType.D]: require("../../../../Assets/3dModels/campusTheme/d-roomcomp-d-campus-in.glb"),
[LearningSpaceTemplateType.T]: require("../../../../Assets/3dModels/campusTheme/d-roomcomp-t-campus-in.glb"),
[LearningSpaceTemplateType.None]: "",
},
outsideDecorationModels: {
Expand All @@ -75,7 +75,7 @@ export const LearningSpaceTheme_CampusKE: ILearningSpaceTheme = {
entryDoorModel: LearningSpaceTheme_CampusAB.entryDoorModel,
exitDoorModel: LearningSpaceTheme_CampusAB.exitDoorModel,
windowModel: LearningSpaceTheme_CampusAB.windowModel,
ambienceModel: require("../../../../Assets/3dModels/campusTheme/env_campus_ke.glb"),
ambienceModel: require("../../../../Assets/3dModels/campusTheme/env-campus-ke.glb"),
storyElementModel: LearningSpaceTheme_CampusAB.storyElementModel,
insideDecorationModels: LearningSpaceTheme_CampusAB.insideDecorationModels,
outsideDecorationModels: LearningSpaceTheme_CampusAB.outsideDecorationModels,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,30 +39,30 @@ const LearningSpaceTheme_Suburb: ILearningSpaceTheme = {
[LearningElementTypes.notAnElement]: [],
},
standinDecorationModels: [
require("../../../../Assets/3dModels/suburbTheme/d_dcomp_hatstand_1.glb"),
require("../../../../Assets/3dModels/suburbTheme/d_dcomp_desk_1.glb"),
require("../../../../Assets/3dModels/suburbTheme/d_dcomp_sideboardbookshelf_1.glb"),
require("../../../../Assets/3dModels/suburbTheme/d-dcomp-hatstand-1.glb"),
require("../../../../Assets/3dModels/suburbTheme/d-dcomp-desk-1.glb"),
require("../../../../Assets/3dModels/suburbTheme/d-dcomp-sideboardbookshelf-1.glb"),
],
entryDoorModel: require("../../../../Assets/3dModels/suburbTheme/3DModel_Door.glb"),
exitDoorModel: require("../../../../Assets/3dModels/suburbTheme/3DModel_ExitDoor.glb"),
windowModel: require("../../../../Assets/3dModels/suburbTheme/3DModel_Window.glb"),
ambienceModel: require("../../../../Assets/3dModels/suburbTheme/env_suburb.glb"),
entryDoorModel: require("../../../../Assets/3dModels/suburbTheme/d-door-suburb-entry.glb"),
exitDoorModel: require("../../../../Assets/3dModels/suburbTheme/d-door-suburb-exit.glb"),
windowModel: require("../../../../Assets/3dModels/suburbTheme/d-door-suburb-window.glb"),
ambienceModel: require("../../../../Assets/3dModels/suburbTheme/env-suburb.glb"),
storyElementModel:
LearningElementModelTypeEnums.QuizElementModelTypes.DefaultNPC,
insideDecorationModels: {
[LearningSpaceTemplateType.L]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_L_suburb_In.glb"),
[LearningSpaceTemplateType.R6]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_R6_suburb_In.glb"),
[LearningSpaceTemplateType.R8]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_R8_suburb_In.glb"),
[LearningSpaceTemplateType.D]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_D_suburb_In.glb"),
[LearningSpaceTemplateType.T]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_T_suburb_In.glb"),
[LearningSpaceTemplateType.L]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-l-suburb-in.glb"),
[LearningSpaceTemplateType.R6]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-r6-suburb-in.glb"),
[LearningSpaceTemplateType.R8]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-r8-suburb-in.glb"),
[LearningSpaceTemplateType.D]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-d-suburb-in.glb"),
[LearningSpaceTemplateType.T]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-t-suburb-in.glb"),
[LearningSpaceTemplateType.None]: "",
},
outsideDecorationModels: {
[LearningSpaceTemplateType.L]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_L_suburb_Out.glb"),
[LearningSpaceTemplateType.R6]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_R6_suburb_Out.glb"),
[LearningSpaceTemplateType.R8]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_R8_suburb_Out.glb"),
[LearningSpaceTemplateType.D]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_D_suburb_Out.glb"),
[LearningSpaceTemplateType.T]: require("../../../../Assets/3dModels/suburbTheme/d_roomcomp_T_suburb_Out.glb"),
[LearningSpaceTemplateType.L]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-l-suburb-out.glb"),
[LearningSpaceTemplateType.R6]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-r6-suburb-out.glb"),
[LearningSpaceTemplateType.R8]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-r8-suburb-out.glb"),
[LearningSpaceTemplateType.D]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-d-suburb-out.glb"),
[LearningSpaceTemplateType.T]: require("../../../../Assets/3dModels/suburbTheme/d-roomcomp-t-suburb-out.glb"),
[LearningSpaceTemplateType.None]: "",
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import SCENE_TYPES, {
import AvatarEditorPreviewSceneDefinition from "../AvatarEditorPreviewSceneDefinition";
import { AvatarNoneModel } from "src/Components/Core/Domain/AvatarModels/AvatarModelTypes";

const baseModelLink = require("../../../../../../Assets/3dModels/sharedModels/avatar/avatarSkeleton.glb");
const baseModelLink = require("../../../../../../Assets/3dModels/sharedModels/avatar/a-avatar-skeleton.glb");

export default class AvatarEditorPreviewModelView {
private scenePresenter: IScenePresenter;
Expand Down
4 changes: 2 additions & 2 deletions src/Components/Core/Presentation/Babylon/Door/DoorView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import { LogLevelTypes } from "src/Components/Core/Domain/Types/LogLevelTypes";
import HighlightColors from "../HighlightColors";

const soundLink = require("../../../../../Assets/Sounds/door_opening.mp3");
const iconLinkEntryDoor = require("../../../../../Assets/3dModels/sharedModels/3dIcons/d-icons-door-door-in.glb");
const iconLinkExitDoor = require("../../../../../Assets/3dModels/sharedModels/3dIcons/d-icons-door-door-out.glb");
const iconLinkEntryDoor = require("../../../../../Assets/3dModels/sharedModels/3dIcons/d-3dicons-door-in.glb");
const iconLinkExitDoor = require("../../../../../Assets/3dModels/sharedModels/3dIcons/d-3dicons-door-out.glb");

export default class DoorView extends Readyable {
private scenePresenter: IScenePresenter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ import CORE_TYPES from "~DependencyInjection/CoreTypes";
import { LogLevelTypes } from "src/Components/Core/Domain/Types/LogLevelTypes";

const iconLinks: { [key in LearningElementTypes]?: any } = {
[LearningElementTypes.h5p]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-h5p-interactive-element.glb"),
[LearningElementTypes.primitiveH5P]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-h5p-interactive-element.glb"),
[LearningElementTypes.text]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-text-papyrus.glb"),
[LearningElementTypes.pdf]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-text-papyrus.glb"),
[LearningElementTypes.image]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-image-abstract-painting.glb"),
[LearningElementTypes.video]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-video-tv.glb"),
[LearningElementTypes.adaptivity]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-adaptivity-kite.glb"),
[LearningElementTypes.h5p]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-h5p-interactive-element.glb"),
[LearningElementTypes.primitiveH5P]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-h5p-interactive-element.glb"),
[LearningElementTypes.text]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-text-papyrus.glb"),
[LearningElementTypes.pdf]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-text-papyrus.glb"),
[LearningElementTypes.image]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-image-abstract-painting.glb"),
[LearningElementTypes.video]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-video-tv.glb"),
[LearningElementTypes.adaptivity]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-adaptivity-kite.glb"),
[LearningElementTypes.notAnElement]: [],
};

const checkedIconLinks: { [key in LearningElementTypes]?: any } = {
[LearningElementTypes.h5p]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-h5p-interactive-element-checked.glb"),
[LearningElementTypes.primitiveH5P]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-h5p-interactive-element-checked.glb"),
[LearningElementTypes.text]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-text-papyrus-checked.glb"),
[LearningElementTypes.pdf]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-text-papyrus-checked.glb"),
[LearningElementTypes.h5p]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-h5p-interactive-element-checked.glb"),
[LearningElementTypes.primitiveH5P]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-h5p-interactive-element-checked.glb"),
[LearningElementTypes.text]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-text-papyrus-checked.glb"),
[LearningElementTypes.pdf]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-text-papyrus-checked.glb"),
//[LearningElementTypes.image]: require("../../../../../Assets/3dModels/sharedModels/l-icons-image-check.glb"),
[LearningElementTypes.image]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-image-abstract-painting-checked.glb"),
[LearningElementTypes.video]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-video-tv-checked.glb"),
[LearningElementTypes.adaptivity]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-adaptivity-kite-checked.glb"),
[LearningElementTypes.image]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-image-abstract-painting-checked.glb"),
[LearningElementTypes.video]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-video-tv-checked.glb"),
[LearningElementTypes.adaptivity]: require("../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-adaptivity-kite-checked.glb"),
[LearningElementTypes.notAnElement]: [],
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { StoryElementType } from "src/Components/Core/Domain/Types/StoryElementT
import bind from "bind-decorator";
import HighlightColors from "../HighlightColors";

import iconLink from "../../../../../Assets/3dModels/sharedModels/3dIcons/l-icons-story-speech-bubble-dots.glb";
import iconLink from "../../../../../Assets/3dModels/sharedModels/3dIcons/l-3dicons-story-speech-bubble-dots.glb";

export default class StoryNPCView {
private scenePresenter: IScenePresenter;
Expand Down

0 comments on commit fc1eae3

Please sign in to comment.