Skip to content

Work on the ClientWallPlacement #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
memothelemo wants to merge 9 commits into
base: dev
Choose a base branch
from
Draft

Work on the ClientWallPlacement #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b897b91
Useless commit to make a pull request
memothelemo Nov 28, 2021
174e4c0
Fix toggleCharacterMovement method doesn't work
memothelemo Nov 28, 2021
7355ca0
Rework on the extraction script
memothelemo Nov 28, 2021
a6840af
Include ReplicatedStorage assets in rojo config
memothelemo Nov 28, 2021
06af49a
Partial refactor of wall placement feature
memothelemo Nov 29, 2021
ce8218f
RaycastParams support for placements
memothelemo Nov 29, 2021
319c90d
Forgot to anchor wall cursor
memothelemo Nov 29, 2021
d4305f6
Add basic wall placement on server
memothelemo Nov 29, 2021
2e3c6e2
Update lot model file
memothelemo Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 128 additions & 0 deletions assets/game/ReplicatedStorage/Assets/cursor/wall.rbxmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<roblox version="4">
<Item class="MeshPart" referent="0">
<Properties>
<string name="Name">wall</string>
<bool name="Anchored">true</bool>
<BinaryString name="AttributesSerialize">
</BinaryString>
<float name="BackParamA">-0.5</float>
<float name="BackParamB">0.5</float>
<token name="BackSurface">0</token>
<token name="BackSurfaceInput">0</token>
<float name="BottomParamA">-0.5</float>
<float name="BottomParamB">0.5</float>
<token name="BottomSurface">0</token>
<token name="BottomSurfaceInput">0</token>
<CoordinateFrame name="CFrame">
<X>-17.519405</X>
<Y>7</Y>
<Z>-2.4805942</Z>
<R00>1</R00>
<R01>0</R01>
<R02>0</R02>
<R10>0</R10>
<R11>1</R11>
<R12>0</R12>
<R20>0</R20>
<R21>0</R21>
<R22>1</R22>
</CoordinateFrame>
<bool name="CanCollide">true</bool>
<bool name="CanQuery">true</bool>
<bool name="CanTouch">true</bool>
<bool name="CastShadow">true</bool>
<int name="CollisionGroupId">0</int>
<Color3uint8 name="Color3uint8">5353139</Color3uint8>
<PhysicalProperties name="CustomPhysicalProperties">
<CustomPhysics>false</CustomPhysics>
</PhysicalProperties>
<bool name="DoubleSided">false</bool>
<float name="FrontParamA">-0.5</float>
<float name="FrontParamB">0.5</float>
<token name="FrontSurface">0</token>
<token name="FrontSurfaceInput">0</token>
<bool name="HasJointOffset">false</bool>
<bool name="HasSkinnedMesh">false</bool>
<Vector3 name="InitialSize">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
</Vector3>
<Vector3 name="JointOffset">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
</Vector3>
<BinaryString name="LODData">
</BinaryString>
<float name="LeftParamA">-0.5</float>
<float name="LeftParamB">0.5</float>
<token name="LeftSurface">0</token>
<token name="LeftSurfaceInput">0</token>
<bool name="Locked">false</bool>
<bool name="Massless">false</bool>
<token name="Material">288</token>
<Content name="MeshID">
<null>
</null>
</Content>
<Content name="MeshId">
<null>
</null>
</Content>
<SharedString name="PhysicalConfigData">rxNJufX5oaagQE3qNtzJSQ==</SharedString>
<BinaryString name="PhysicsData">
</BinaryString>
<CoordinateFrame name="PivotOffset">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
<R00>1</R00>
<R01>0</R01>
<R02>0</R02>
<R10>0</R10>
<R11>1</R11>
<R12>0</R12>
<R20>0</R20>
<R21>0</R21>
<R22>1</R22>
</CoordinateFrame>
<float name="Reflectance">0</float>
<token name="RenderFidelity">1</token>
<float name="RightParamA">-0.5</float>
<float name="RightParamB">0.5</float>
<token name="RightSurface">0</token>
<token name="RightSurfaceInput">0</token>
<int name="RootPriority">0</int>
<Vector3 name="RotVelocity">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
</Vector3>
<Vector3 name="size">
<X>1.0388119</X>
<Y>12</Y>
<Z>1.0388119</Z>
</Vector3>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
<Content name="TextureID">
<null>
</null>
</Content>
<float name="TopParamA">-0.5</float>
<float name="TopParamB">0.5</float>
<token name="TopSurface">0</token>
<token name="TopSurfaceInput">0</token>
<float name="Transparency">0</float>
<Vector3 name="Velocity">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
</Vector3>
</Properties>
</Item>
<SharedStrings>
<SharedString md5="rxNJufX5oaagQE3qNtzJSQ=="></SharedString>
</SharedStrings>
</roblox>
108 changes: 94 additions & 14 deletions assets/game/Workspace/Lot.rbxmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,6 @@
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags">TG90</BinaryString>
<OptionalCoordinateFrame name="WorldPivotData">
<CFrame>
<X>-34.5</X>
<Y>0.5</Y>
<Z>9</Z>
<R00>1</R00>
<R01>0</R01>
<R02>0</R02>
<R10>0</R10>
<R11>1</R11>
<R12>0</R12>
<R20>0</R20>
<R21>0</R21>
<R22>1</R22>
</CFrame>
</OptionalCoordinateFrame>
</Properties>
<Item class="Part" referent="1">
Expand Down Expand Up @@ -239,6 +225,100 @@
</Vector3>
</Properties>
</Item>
<Item class="Part" referent="3">
<Properties>
<string name="Name">Canvas</string>
<bool name="Anchored">true</bool>
<BinaryString name="AttributesSerialize">
</BinaryString>
<float name="BackParamA">-0.5</float>
<float name="BackParamB">0.5</float>
<token name="BackSurface">0</token>
<token name="BackSurfaceInput">0</token>
<float name="BottomParamA">-0.5</float>
<float name="BottomParamB">0.5</float>
<token name="BottomSurface">0</token>
<token name="BottomSurfaceInput">0</token>
<CoordinateFrame name="CFrame">
<X>-42</X>
<Y>0.5</Y>
<Z>9</Z>
<R00>1</R00>
<R01>0</R01>
<R02>0</R02>
<R10>0</R10>
<R11>1</R11>
<R12>0</R12>
<R20>0</R20>
<R21>0</R21>
<R22>1</R22>
</CoordinateFrame>
<bool name="CanCollide">false</bool>
<bool name="CanQuery">true</bool>
<bool name="CanTouch">true</bool>
<bool name="CastShadow">true</bool>
<int name="CollisionGroupId">0</int>
<Color3uint8 name="Color3uint8">10724005</Color3uint8>
<PhysicalProperties name="CustomPhysicalProperties">
<CustomPhysics>false</CustomPhysics>
</PhysicalProperties>
<token name="formFactorRaw">1</token>
<float name="FrontParamA">-0.5</float>
<float name="FrontParamB">0.5</float>
<token name="FrontSurface">0</token>
<token name="FrontSurfaceInput">0</token>
<float name="LeftParamA">-0.5</float>
<float name="LeftParamB">0.5</float>
<token name="LeftSurface">0</token>
<token name="LeftSurfaceInput">0</token>
<bool name="Locked">false</bool>
<bool name="Massless">false</bool>
<token name="Material">256</token>
<CoordinateFrame name="PivotOffset">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
<R00>1</R00>
<R01>0</R01>
<R02>0</R02>
<R10>0</R10>
<R11>1</R11>
<R12>0</R12>
<R20>0</R20>
<R21>0</R21>
<R22>1</R22>
</CoordinateFrame>
<float name="Reflectance">0</float>
<float name="RightParamA">-0.5</float>
<float name="RightParamB">0.5</float>
<token name="RightSurface">0</token>
<token name="RightSurfaceInput">0</token>
<int name="RootPriority">0</int>
<Vector3 name="RotVelocity">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
</Vector3>
<token name="shape">1</token>
<Vector3 name="size">
<X>64</X>
<Y>1</Y>
<Z>64</Z>
</Vector3>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
<float name="TopParamA">-0.5</float>
<float name="TopParamB">0.5</float>
<token name="TopSurface">0</token>
<token name="TopSurfaceInput">0</token>
<float name="Transparency">1</float>
<Vector3 name="Velocity">
<X>0</X>
<Y>0</Y>
<Z>0</Z>
</Vector3>
</Properties>
</Item>
</Item>
<SharedStrings>
<SharedString md5="rxNJufX5oaagQE3qNtzJSQ=="></SharedString>
Expand Down
2 changes: 2 additions & 0 deletions default.project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
},
"ReplicatedStorage": {
"$className": "ReplicatedStorage",
"$ignoreUnknownInstances": true,
"$path": "assets/game/ReplicatedStorage",
"rbxts_include": {
"$path": "include",
"node_modules": {
Expand Down
4 changes: 3 additions & 1 deletion flamework.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
"softwaretycoon:out/client/controllers/player/CharacterController@OnCharacterDied": "client/controllers/player/CharacterController@OnCharacterDied",
"softwaretycoon:out/server/services/players/PlayerService@OnPlayerJoined": "server/services/players/PlayerService@OnPlayerJoined",
"softwaretycoon:out/server/services/players/PlayerService@OnPlayerLeft": "server/services/players/PlayerService@OnPlayerLeft",
"softwaretycoon:out/server/services/game/LotService@OnLotOwned": "server/services/game/LotService@OnLotOwned"
"softwaretycoon:out/server/services/game/LotService@OnLotOwned": "server/services/game/LotService@OnLotOwned",
"softwaretycoon:out/server/services/builder/WallBuilderService@WallBuilderService": "server/services/builder/WallBuilderService@WallBuilderService",
"softwaretycoon:out/server/classes/builders/wall@WallBuilder": "server/classes/builders/wall@WallBuilder"
}
}
36 changes: 30 additions & 6 deletions scripts/remodel/extractAssets.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,31 @@ local excluded_classes = {
-- Only extract services when it needs to in the table
local services = {
"Workspace",
"Lighting"
"Lighting",
"ReplicatedStorage",
}

-- IsA method does not exists in Remodel
-- Excluded instances
local excluded_instances = {
"ReplicatedStorage.Game",
"ReplicatedStorage.rbxts_include"
}

local function log(message, ...)
print(string.format(message, ...))
end

-- Alternative to table.find
local function find(tbl, value)
for i, v in ipairs(tbl) do
if v == value then
return i, v
end
end
return nil, nil
end

-- IsA method does not exists in Remodel but I have to use base classname
local function isObjectExcluded(object)
for _, class_name in ipairs(excluded_classes) do
if object.ClassName == class_name then
Expand All @@ -30,22 +51,25 @@ end
function extractFile(object, location)
-- Make sure that object is not a BaseScript
if isObjectExcluded(object) then return end

local shouldBeDirectory = object.ClassName == "Folder"
print("Extracting " .. (shouldBeDirectory and "directory" or "file") .. ": " .. location)
local is_directory = object.ClassName == "Folder"

-- Folders should be considered as a directory
if shouldBeDirectory then
if is_directory then
return extractDirectory(object, location .. "/")
end

-- Extraction process!
log("Extracting file: %s", location)
remodel.writeModelFile(object, location .. ".rbxmx")
end

-- Extracts any folder to a directory
function extractDirectory(object, location)
-- If that object is in the excluded list, do not include it
if find(excluded_instances, object:GetFullName()) ~= nil then return end

-- Make a new directory
log("Extracting directory: %s", location)
remodel.createDirAll(location)

-- Extract object's children
Expand Down
4 changes: 4 additions & 0 deletions src/client/cameras/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ export class BaseCameraWorker<T extends BaseCameraWorkerAttributes = BaseCameraW
const camera_opt = controller.getCamera();
if (camera_opt.isSome()) {
this.camera = camera_opt.unwrap();
this.camera.CameraType = Enum.CameraType.Scriptable;
this.camera.CameraSubject = undefined;
this.setupAttributes(this.camera);
}

Expand All @@ -167,6 +169,8 @@ export class BaseCameraWorker<T extends BaseCameraWorkerAttributes = BaseCameraW
this.attributes.setInstance(cam);
}
this.camera = cam;
this.camera.CameraSubject = undefined;
this.camera.CameraType = Enum.CameraType.Scriptable;
}),
);

Expand Down
Loading